[Erp5-report] r28714 - in /erp5/trunk/bt5/erp5_payroll: CategoryTemplateItem/portal_categor...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 1 12:17:50 CEST 2009
Author: yusuke
Date: Tue Sep 1 12:17:48 2009
New Revision: 28714
URL: http://svn.erp5.org?rev=28714&view=rev
Log:
2009-09-01 yusuke
* tax_category category is renamed to contribution_share category
Added:
erp5/trunk/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/contribution_share.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employee.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employer.xml
Modified:
erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementTotalPriceFromCategory.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml
erp5/trunk/bt5/erp5_payroll/bt/change_log
erp5/trunk/bt5/erp5_payroll/bt/revision
erp5/trunk/bt5/erp5_payroll/bt/template_base_category_list
erp5/trunk/bt5/erp5_payroll/bt/template_path_list
erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_base_category_list
Added: erp5/trunk/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/contribution_share.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/contribution_share.xml?rev=28714&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/contribution_share.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/contribution_share.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -1,0 +1,207 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_folder_handler</string> </key>
+ <value> <string>CMFBTreeFolderHandler</string> </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>acquisition_append_value</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>acquisition_base_category</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>acquisition_copy_value</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>acquisition_mask_value</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>acquisition_object_id</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>acquisition_portal_type</string> </key>
+ <value> <string>python: []</string> </value>
+ </item>
+ <item>
+ <key> <string>acquisition_sync_value</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>contribution_share</string>
+ <string>contribution_share</string>
+ <string>contribution_share</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>category_type</string> </key>
+ <value>
+ <tuple>
+ <string>variation</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>criterion_property</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>fallback_base_category</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>contribution_share</string> </value>
+ </item>
+ <item>
+ <key> <string>id_generator</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id_group</string> </key>
+ <value> <string>None</string> </value>
+ </item>
+ <item>
+ <key> <string>last_id</string> </key>
+ <value> <string>4</string> </value>
+ </item>
+ <item>
+ <key> <string>membership_criterion_base_category</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>membership_criterion_category</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>multimembership_criterion_base_category</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Base Category</string> </value>
+ </item>
+ <item>
+ <key> <string>read_permission</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>rid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>sid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>test_method_id</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>contribution_share</string> </value>
+ </item>
+ <item>
+ <key> <string>write_permission</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Length" module="BTrees.Length"/>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employee.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employee.xml?rev=28714&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employee.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employee.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -1,0 +1,120 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="Category" module="Products.ERP5Type.Document.Category"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_folder_handler</string> </key>
+ <value> <string>CMFBTreeFolderHandler</string> </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <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>
+ <item>
+ <key> <string>codification</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>employee</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Employee</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employer.xml?rev=28714&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employer.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/contribution_share/employer.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -1,0 +1,120 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="Category" module="Products.ERP5Type.Document.Category"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_folder_handler</string> </key>
+ <value> <string>CMFBTreeFolderHandler</string> </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <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>
+ <item>
+ <key> <string>codification</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>employer</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Employer</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -1,17 +1,17 @@
<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>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -62,8 +62,8 @@
\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 @@
# 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 @@
<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>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -81,7 +81,7 @@
\'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 @@
\'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
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=28714&r1=28713&r2=28714&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] Tue Sep 1 12:17:48 2009
@@ -97,13 +97,13 @@
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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -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 @@
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 @@
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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -77,10 +77,10 @@
\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 @@
<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>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -119,9 +119,9 @@
\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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementTotalPriceFromCategory.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementTotalPriceFromCategory.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementTotalPriceFromCategory.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementTotalPriceFromCategory.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -64,11 +64,11 @@
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 @@
</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 @@
<value>
<tuple>
<string>base_contribution</string>
- <string>tax_category</string>
+ <string>contribution_share</string>
<string>total_price</string>
<string>_getattr_</string>
<string>context</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -84,8 +84,8 @@
\'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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml [utf8] Tue Sep 1 12:17:48 2009
@@ -615,7 +615,7 @@
<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
Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] Tue Sep 1 12:17:48 2009
@@ -1,3 +1,6 @@
+2009-09-01 yusuke
+* tax_category category is renamed to contribution_share category
+
2009-06-10 fabien
* Payroll Service is now replaced by Service
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Tue Sep 1 12:17:48 2009
@@ -1,1 +1,1 @@
-499
+524
Modified: erp5/trunk/bt5/erp5_payroll/bt/template_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/template_base_category_list?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/template_base_category_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/template_base_category_list [utf8] Tue Sep 1 12:17:48 2009
@@ -1,5 +1,5 @@
base_amount
+contribution_share
salary_range
source_grade
-source_marital_status
-tax_category
+source_marital_status
Modified: erp5/trunk/bt5/erp5_payroll/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/template_path_list?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/template_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/template_path_list [utf8] Tue Sep 1 12:17:48 2009
@@ -9,8 +9,8 @@
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
Modified: erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_base_category_list?rev=28714&r1=28713&r2=28714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_base_category_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_base_category_list [utf8] Tue Sep 1 12:17:48 2009
@@ -1,16 +1,16 @@
+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
More information about the Erp5-report
mailing list