[Erp5-report] r41939 aurel - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: aurel
Date: Mon Jan  3 11:18:13 2011
New Revision: 41939

URL: http://svn.erp5.org?rev=41939&view=rev
Log:
pay sheet model lines can vary on multiple base applications and generate
cell ranges which is a combination of different base application,
update asCellRange script for this case

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml?rev=41939&r1=41938&r2=41939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml [utf8] Mon Jan  3 11:18:13 2011
@@ -57,14 +57,29 @@ cell_range = []\n
 if resource is not None:\n
   base_category_list = resource.getVariationBaseCategoryList()\n
   for base_category in base_category_list:\n
-    if matrixbox == 1:\n
-      # XXX matrixbox is right_display (not as listfield) => invert display and value in item\n
-      cell_range.append(map(lambda x: (x[1],x[0]), \n
-        context.getVariationCategoryItemList(base_category_list=\\\n
-            (base_category,) ) ) )\n
+    if base_category == "base_application":\n
+      base_application_variation_dict = {}\n
+      variation_list = context.getVariationCategoryList(base_category_list=(base_category,))\n
+      for variation in variation_list:\n
+        # We split at the sublevel of base_application/base_amount/payroll/XXX\n
+        base_variation = \'/\'.join(variation.split(\'/\')[:4])\n
+        base_application_variation_dict.setdefault(base_variation, []) \n
+        base_application_variation_dict[base_variation].append(variation)\n
+\n
+      for v in base_application_variation_dict.values():\n
+        if matrixbox == 1:\n
+          cell_range.append(map(lambda x: (x[1],x[0]), v))\n
+        else:\n
+          cell_range.append(v)\n
     else:\n
-      cell_range.append(context.getVariationCategoryList(base_category_list=\\\n
-          (base_category,)))\n
+      if matrixbox == 1:\n
+        # XXX matrixbox is right_display (not as listfield) => invert display and value in item\n
+        cell_range.append(map(lambda x: (x[1],x[0]), \n
+          context.getVariationCategoryItemList(base_category_list=\\\n
+              (base_category,) ) ) )\n
+      else:\n
+        cell_range.append(context.getVariationCategoryList(base_category_list=\\\n
+            (base_category,)))\n
 \n
   cell_range = filter(lambda x: x != [], cell_range )\n
 \n

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml?rev=41939&r1=41938&r2=41939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml [utf8] Mon Jan  3 11:18:13 2011
@@ -110,7 +110,19 @@ else:\n
   variation_base_category_list = context.getVariationBaseCategoryList()\n
   variation_base_category_list.sort()\n
   for base_category in variation_base_category_list:\n
-    list_of_category_list.append(\\\n
+    if base_category == "base_application":\n
+      base_application_variation_dict = {}\n
+      variation_list = context.getVariationCategoryList(base_category_list=(base_category,))\n
+      for variation in variation_list:\n
+        # We split at the sublevel of base_application/base_amount/payroll/XXX\n
+        base_variation = \'/\'.join(variation.split(\'/\')[:4])\n
+        base_application_variation_dict.setdefault(base_variation, []) \n
+        base_application_variation_dict[base_variation].append(variation)\n
+\n
+      for v in base_application_variation_dict.values():\n
+        list_of_category_list.append(v)\n
+    else:\n
+      list_of_category_list.append(\\\n
         context.getVariationCategoryList(base_category_list=base_category))\n
   return list_of_category_list\n
 \n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=41939&r1=41938&r2=41939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Mon Jan  3 11:18:13 2011
@@ -1 +1 @@
-574
+575