2009-09-01 yusuke

* tax_category category is renamed to contribution_share category

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28715 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml → bt5/erp5_payroll/CategoryTemplateItem/portal_categories/contribution_share.xml

@@ -66,7 +66,11 @@
         <item>
             <key> <string>categories</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>contribution_share</string>
+                <string>contribution_share</string>
+                <string>contribution_share</string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -97,7 +101,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>tax_category</string> </value>
+            <value> <string>contribution_share</string> </value>
         </item>
         <item>
             <key> <string>id_generator</string> </key>
@@ -167,7 +171,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Tax Category</string> </value>
+            <value> <string>contribution_share</string> </value>
         </item>
         <item>
             <key> <string>write_permission</string> </key>

bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/employee_share.xml → bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employee.xml

@@ -35,8 +35,12 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>tax_category/employee_share</string>
-                <string>tax_category/employee_share</string>
+                <string>contribution_share/employee</string>
+                <string>contribution_share/employee</string>
+                <string>contribution_share/employee</string>
+                <string>contribution_share/employee</string>
+                <string>contribution_share/employee</string>
+                <string>contribution_share/employee</string>
               </tuple>
             </value>
         </item>
@@ -54,7 +58,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>employee_share</string> </value>
+            <value> <string>employee</string> </value>
         </item>
         <item>
             <key> <string>int_index</string> </key>
@@ -68,7 +72,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Employee Share</string> </value>
+            <value> <string>Employee</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/employer_share.xml → bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employer.xml

@@ -35,8 +35,12 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>tax_category/employer_share</string>
-                <string>tax_category/employer_share</string>
+                <string>contribution_share/employer</string>
+                <string>contribution_share/employer</string>
+                <string>contribution_share/employer</string>
+                <string>contribution_share/employer</string>
+                <string>contribution_share/employer</string>
+                <string>contribution_share/employer</string>
               </tuple>
             </value>
         </item>
@@ -54,7 +58,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>employer_share</string> </value>
+            <value> <string>employer</string> </value>
         </item>
         <item>
             <key> <string>int_index</string> </key>
@@ -68,7 +72,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Employer Share</string> </value>
+            <value> <string>Employer</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml

 <base_category_list>
  <portal_type id="Pay Sheet Cell">
   <item>product_line</item>
-  <item>tax_category</item>
+  <item>contribution_share</item>
   <item>salary_range</item>
  </portal_type>
  <portal_type id="Pay Sheet Line">
   <item>salary_range</item>
   <item>base_amount</item>
-  <item>tax_category</item>
+  <item>contribution_share</item>
  </portal_type>
  <portal_type id="Pay Sheet Model Cell">
   <item>product_line</item>
-  <item>tax_category</item>
+  <item>contribution_share</item>
   <item>salary_range</item>
  </portal_type>
  <portal_type id="Pay Sheet Model Module">
@@ -20,7 +20,7 @@
  <portal_type id="Pay Sheet Model Slice">
   <item>salary_range</item>
   <item>product_line</item>
-  <item>tax_category</item>
+  <item>contribution_share</item>
  </portal_type>
  <portal_type id="Pay Sheet Transaction">
   <item>quantity_unit</item>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.xml

@@ -62,8 +62,8 @@ translateString = portal.Base_translateString\n
 \n
 net_salary_base_amount_uid = \\\n
               portal.portal_categories.base_amount.net_salary.getUid()\n
-employee_share_uid = \\\n
-              portal.portal_categories.tax_category.employee_share.getUid()\n
+employee_contribution_share_uid = \\\n
+              portal.portal_categories.contribution_share.employee.getUid()\n
 \n
 section_category = request[\'section_category\']\n
 section_uid = portal.Base_getSectionUidListForSectionCategory(section_category)\n
@@ -85,7 +85,7 @@ total_price = 0\n
 # FIXME: this report does not support multiple Payment Condition\n
 for inventory in portal.portal_simulation.getInventoryList(\n
                     parent_base_contribution_uid=net_salary_base_amount_uid,\n
-                    tax_category_uid=employee_share_uid,\n
+                    contribution_share_uid=employee_contribution_share_uid,\n
                     portal_type=(\'Pay Sheet Line\', \'Pay Sheet Cell\'),\n
                     section_uid=section_uid,\n
                     simulation_state=simulation_state,\n
@@ -166,7 +166,7 @@ return object_list\n
                             <string>portal</string>
                             <string>translateString</string>
                             <string>net_salary_base_amount_uid</string>
-                            <string>employee_share_uid</string>
+                            <string>employee_contribution_share_uid</string>
                             <string>_getitem_</string>
                             <string>section_category</string>
                             <string>section_uid</string>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml

@@ -81,7 +81,7 @@ employee_params = {\n
     \'group_by_node\' : 1,\n
     \'group_by_variation\': 1,\n
     \'section_uid\' : section_uid_list,\n
-    \'tax_category_uid\' : context.portal_categories.tax_category.employee_share.getUid(),\n
+    \'contribution_share_uid\' : context.portal_categories.contribution_share.employee.getUid(),\n
     \'at_date\' : at_date,\n
     \'from_date\' : from_date,\n
     \'simulation_state\' : simulation_state,\n
@@ -93,7 +93,7 @@ employer_params = {\n
     \'group_by_node\' : 1,\n
     \'group_by_variation\': 1,\n
     \'section_uid\' : section_uid_list,\n
-    \'tax_category_uid\' : context.portal_categories.tax_category.employer_share.getUid(),\n
+    \'contribution_share_uid\' : context.portal_categories.contribution_share.employer.getUid(),\n
     \'at_date\' : at_date,\n
     \'from_date\' : from_date,\n
     \'simulation_state\' : simulation_state,\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml

@@ -97,13 +97,13 @@ if matrixbox :\n
           category_cell_range.append((category_item[1],\\\n
               framing(model.getCell(category_item[1]),\n
                       category_item[0])))\n
-        elif base_category == \'tax_category\':\n
+        elif base_category == \'contribution_share\':\n
           category_cell_range.append((category_item[1],\n
-            translateString(\'${tax_category_title} (Amount or Percent)\',\n
-                            mapping=dict(tax_category_title=category_item[0]))))\n
+            translateString(\'${contribution_share_title} (Amount or Percent)\',\n
+                            mapping=dict(contribution_share_title=category_item[0]))))\n
         else:\n
           raise ValueError, "PaySheetModelLine_asCellRange: the two categories "\\\n
-                "must could be only tax_category and salary_range"\n
+                "must could be only contribution_share and salary_range"\n
       cell_range.append(category_cell_range)\n
 \n
     cell_range = filter(lambda x: x != [], cell_range)\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml

@@ -58,7 +58,7 @@
   all their usefull information that permit to display a popup\n
   to edit them.\n
   In base cases, only \'Monthly Labour\' model line is editable (without any\n
-  tax_category or slice)\n
+  contribution_share or slice)\n
 """\n
 \n
 from Products.ERP5Type.Utils import cartesianProduct\n
@@ -99,8 +99,8 @@ for model_line in model_line_list:\n
   if cartesian_product == [[]]: \n
     share_dict = {}\n
     if 0:\n
-      share_dict[cell.getTaxCategory()+\'_price\'] = 0\n
-      share_dict[cell.getTaxCategory()+\'_quantity\'] = 0\n
+      share_dict[cell.getContributionShare()+\'_share_price\'] = 0\n
+      share_dict[cell.getContributionShare()+\'_share_quantity\'] = 0\n
     continue\n
 \n
   for tuple in cartesian_product:\n
@@ -122,8 +122,8 @@ for model_line in model_line_list:\n
     price = cell.getPrice()\n
     if price is None:\n
       price = 1\n
-    share_dict[cell.getTaxCategory()+\'_price\'] = price\n
-    share_dict[cell.getTaxCategory()+\'_quantity\'] = quantity\n
+    share_dict[cell.getContributionShare()+\'_share_price\'] = price\n
+    share_dict[cell.getContributionShare()+\'_share_quantity\'] = quantity\n
 \n
     tuple_dict = {}\n
     for item in tuple:\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml

@@ -77,10 +77,10 @@ if not editable:\n
 \n
 # this following columns are add for both edibales and not\n
 for model_line in context.contentValues(portal_type=\'Pay Sheet Line\'):\n
-  for tax_category in model_line.getTaxCategoryValueList():\n
-    price = (tax_category.getId()+\'_price\', tax_category.getTitle()+\' Rate\')\n
-    quantity = (tax_category.getId()+\'_total_price\', \n
-                tax_category.getTitle()+\' Amount\')\n
+  for contribution_share in model_line.getContributionShareValueList():\n
+    price = (contribution_share.getId()+\'_share_price\', contribution_share.getTitle()+\' Share Rate\')\n
+    quantity = (contribution_share.getId()+\'_share_total_price\', \n
+                contribution_share.getTitle()+\' Share Amount\')\n
     if price not in column_list:\n
       column_list.append(price)\n
       column_list.append(quantity)\n
@@ -130,7 +130,7 @@ return column_list\n
                             <string>_getiter_</string>
                             <string>context</string>
                             <string>model_line</string>
-                            <string>tax_category</string>
+                            <string>contribution_share</string>
                             <string>price</string>
                             <string>quantity</string>
                           </tuple>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml

@@ -119,9 +119,9 @@ for paysheet_line in paysheet_line_list:\n
 \n
     base = cell.getQuantity()\n
 \n
-    share_dict[cell.getTaxCategory()+\'_price\'] = cell.getPrice()\n
-    share_dict[cell.getTaxCategory()+\'_quantity\'] = cell.getQuantity()\n
-    share_dict[cell.getTaxCategory()+\'_total_price\'] = \\\n
+    share_dict[cell.getContributionShare()+\'_price\'] = cell.getPrice()\n
+    share_dict[cell.getContributionShare()+\'_quantity\'] = cell.getQuantity()\n
+    share_dict[cell.getContributionShare()+\'_total_price\'] = \\\n
                     round(cell.getTotalPrice(), precision)\n
 \n
     tuple_dict = {}\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementTotalPriceFromCategory.xml

@@ -64,11 +64,11 @@ movement_list = context.getMovementList(portal_type=(\'Pay Sheet Line\', \'Pay S
 for movement in movement_list:\n
   if base_contribution is not None and movement.isMemberOf(base_contribution):\n
 \n
-    # base_contribution is mandatory, but not tax_category. If tax_category is\n
+    # base_contribution is mandatory, but not contribution_share. If contribution_share is\n
     # given, search with it, if not, care only about base_contribution\n
-    if tax_category is not None and movement.isMemberOf(tax_category):\n
+    if contribution_share is not None and movement.isMemberOf(contribution_share):\n
       total_price += movement.getTotalPrice()\n
-    elif tax_category is None or len(movement.getTaxCategoryList()) == 0:\n
+    elif contribution_share is None or len(movement.getContributionShareList()) == 0:\n
       total_price += movement.getTotalPrice()\n
 \n
 \n
@@ -87,7 +87,7 @@ return amount\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>base_contribution=None, tax_category=None</string> </value>
+            <value> <string>base_contribution=None, contribution_share=None</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -114,7 +114,7 @@ return amount\n
                         <value>
                           <tuple>
                             <string>base_contribution</string>
-                            <string>tax_category</string>
+                            <string>contribution_share</string>
                             <string>total_price</string>
                             <string>_getattr_</string>
                             <string>context</string>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml

@@ -84,8 +84,8 @@ params = {\n
     \'node_uid\' : paysheet.getSourceSectionUid(),\n
     \'mirror_section_uid\' : paysheet.getSourceSectionUid(),\n
     \'section_uid\' : paysheet.getDestinationSectionUid(),\n
-    \'tax_category_uid\' :\\\n
-        portal.portal_categories.tax_category.employee_share.getUid(),\n
+    \'contribution_share_uid\' :\\\n
+        portal.portal_categories.contribution_share.employee.getUid(),\n
     \'to_date\' : paysheet.getStartDate(),\n
     \'from_date\' : DateTime(paysheet.getStartDate().year(), 1, 1),\n
     \'simulation_state\'    : [\'stopped\', \'delivered\'],\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml

@@ -615,7 +615,7 @@ AAA=</string> </value>
                 <table:table-cell table:style-name=\'Tableau3.E2\'\n
                                   office:value-type=\'float\'\n
                                   tal:attributes=\'office:value data_dict/total_price_novat\'>\n
-                  <text:p text:style-name=\'Item_20_Table_20_Title_20_Right\' tal:content="python: \'%s %s\' % (quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution=\'base_contribution/base_amount/net_salary\', tax_category=\'tax_category/employee_share\')), data_dict[\'currency\'])">800.000,00</text:p>\n
+                  <text:p text:style-name=\'Item_20_Table_20_Title_20_Right\' tal:content="python: \'%s %s\' % (quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution=\'base_contribution/base_amount/net_salary\', contribution_share=\'contribution_share/employee\')), data_dict[\'currency\'])">800.000,00</text:p>\n
                 </table:table-cell>\n
               </table:table-row>\n
               <table:table-row table:style-name=\'Tableau1.4\'>\n

bt5/erp5_payroll/bt/change_log

+2009-09-01 yusuke
+* tax_category category is renamed to contribution_share category
+
 2009-06-10 fabien
 * Payroll Service is now replaced by Service
 

bt5/erp5_payroll/bt/revision

-499
+524
\ No newline at end of file

bt5/erp5_payroll/bt/template_base_category_list

 base_amount
+contribution_share
 salary_range
 source_grade
-source_marital_status
-tax_category
+source_marital_status
\ No newline at end of file
\ No newline at end of file

bt5/erp5_payroll/bt/template_path_list

@@ -9,8 +9,8 @@ portal_categories/base_amount/non_taxable_bonus
 portal_categories/base_amount/overtime
 portal_categories/base_amount/total_deductions
 portal_categories/base_amount/total_income
-portal_categories/tax_category/employee_share
-portal_categories/tax_category/employer_share
+portal_categories/contribution_share/employee
+portal_categories/contribution_share/employer
 portal_deliveries/pay_sheet_builder
 portal_deliveries/pay_sheet_builder/**
 portal_deliveries/pay_sheet_transaction_builder

bt5/erp5_payroll/bt/template_portal_type_base_category_list

+Pay Sheet Cell | contribution_share
 Pay Sheet Cell | product_line
 Pay Sheet Cell | salary_range
-Pay Sheet Cell | tax_category
 Pay Sheet Line | base_amount
+Pay Sheet Line | contribution_share
 Pay Sheet Line | salary_range
-Pay Sheet Line | tax_category
+Pay Sheet Model Cell | contribution_share
 Pay Sheet Model Cell | product_line
 Pay Sheet Model Cell | salary_range
-Pay Sheet Model Cell | tax_category
 Pay Sheet Model Module | business_application
+Pay Sheet Model Slice | contribution_share
 Pay Sheet Model Slice | product_line
 Pay Sheet Model Slice | salary_range
-Pay Sheet Model Slice | tax_category
 Pay Sheet Transaction | quantity_unit
 Pay Sheet Transaction | specialise
 Service | base_amount
\ No newline at end of file