[Erp5-report] r29072 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 16 16:59:28 CEST 2009
Author: fabien
Date: Wed Sep 16 16:59:26 2009
New Revision: 29072
URL: http://svn.erp5.org?rev=29072&view=rev
Log:
- fix problems related to category change (tax_category -> contribution_share)
- fix some bugs
- use business process to take the social security address in a generic way
Added:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employee.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employer.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_price.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_total_price.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_price.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_total_price.xml
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.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_getODTDataDict.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_view.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsText.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
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=29072&r1=29071&r2=29072&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] Wed Sep 16 16:59:26 2009
@@ -131,7 +131,7 @@
employee_career_function=employee.getCareerFunctionTitle(),\n
salary_range=salary_range,\n
salary_range_title=salary_range_title,\n
- employee_share=price,\n
+ employee=price,\n
base=inventory.quantity, )\n
employee_total += price\n
base_total += inventory.quantity\n
@@ -150,7 +150,7 @@
employee_career_reference=employee.getCareerReference(),\n
employee_title=employee.getTitle(),\n
employee_career_function=employee.getCareerFunctionTitle(),\n
- employee_share=0,\n
+ employee=0,\n
salary_range=salary_range,\n
salary_range_title=salary_range_title,\n
base=inventory.quantity, )\n
@@ -158,8 +158,8 @@
i = i + 1\n
\n
employee = inventory.getDestinationValue()\n
- inventory_list[key].employer_share = price\n
- inventory_list[key].total = inventory_list[key].employee_share + price\n
+ inventory_list[key].employer = price\n
+ inventory_list[key].total = inventory_list[key].employee + price\n
employer_total += price\n
\n
total = employee_total + employer_total\n
@@ -208,8 +208,8 @@
employee_title=translateString(\'Total ${salary_range_title}\',\n
mapping=dict(salary_range_title=current_salary_range_title)),\n
base=intermediate_base_total,\n
- employee_share=intermediate_employee_total,\n
- employer_share=intermediate_employer_total))\n
+ employee=intermediate_employee_total,\n
+ employer=intermediate_employer_total))\n
\n
intermediate_base_total = 0\n
intermediate_employee_total = 0\n
@@ -219,8 +219,8 @@
current_salary_range_title = inventory[\'salary_range_title\']\n
\n
intermediate_base_total += inventory[\'base\']\n
- intermediate_employee_total += inventory.get(\'employee_share\', 0)\n
- intermediate_employer_total += inventory.get(\'employer_share\', 0)\n
+ intermediate_employee_total += inventory.get(\'employee\', 0)\n
+ intermediate_employer_total += inventory.get(\'employer\', 0)\n
new_inventory_list.append(inventory)\n
\n
if multiple_salary_range:\n
@@ -228,8 +228,8 @@
employee_title=translateString(\'Total ${salary_range_title}\',\n
mapping=dict(salary_range_title=current_salary_range_title)),\n
base=intermediate_base_total,\n
- employee_share=intermediate_employee_total,\n
- employer_share=intermediate_employer_total))\n
+ employee=intermediate_employee_total,\n
+ employer=intermediate_employer_total))\n
\n
return new_inventory_list\n
\n
@@ -312,7 +312,7 @@
<string>salary_range_title</string>
<string>_inplacevar_</string>
<string>key</string>
- <string>employer_share</string>
+ <string>employer</string>
<string>total</string>
<string>sorted_inventory_list</string>
<string>sort_method</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -57,8 +57,8 @@
\n
request = context.REQUEST\n
\n
-return [Object(employee_share= request[\'employee_total\'],\n
- employer_share=request[\'employer_total\'],\n
+return [Object(employee= request[\'employee_total\'],\n
+ employer=request[\'employer_total\'],\n
base=request[\'base_total\'],\n
total= request[\'total\']\n
)\n
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection.xml?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -82,8 +82,8 @@
<key> <string>hidden</string> </key>
<value>
<list>
- <string>listbox_employee_share</string>
- <string>listbox_employer_share</string>
+ <string>listbox_employee</string>
+ <string>listbox_employer</string>
<string>listbox_total</string>
<string>listbox_base</string>
</list>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -13,15 +13,15 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>columns</string>
+ <string>count_method</string>
+ <string>editable_columns</string>
<string>list_method</string>
- <string>count_method</string>
- <string>stat_method</string>
- <string>selection_name</string>
<string>search</string>
<string>select</string>
- <string>editable_columns</string>
+ <string>selection_name</string>
+ <string>stat_method</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -107,11 +107,11 @@
<string>Base</string>
</tuple>
<tuple>
- <string>employee_share</string>
+ <string>employee</string>
<string>Employee Share</string>
</tuple>
<tuple>
- <string>employer_share</string>
+ <string>employer</string>
<string>Employer Share</string>
</tuple>
<tuple>
@@ -134,11 +134,11 @@
<string>Base</string>
</tuple>
<tuple>
- <string>employee_share</string>
+ <string>employee</string>
<string>Employee Share</string>
</tuple>
<tuple>
- <string>employer_share</string>
+ <string>employer</string>
<string>Employer Share</string>
</tuple>
<tuple>
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employee.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employee.xml?rev=29072&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employee.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employee.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -1,0 +1,99 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>editable</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_employee</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_money_quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employer.xml?rev=29072&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employer.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox_employer.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -1,0 +1,99 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>editable</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_employer</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_money_quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -70,10 +70,10 @@
\'base_application_list\',\n
\'base_name\',\n
\'base\',\n
- \'employer_share_price\',\n
- \'employer_share_quantity\',\n
- \'employee_share_price\',\n
- \'employee_share_quantity\',\n
+ \'employer_price\',\n
+ \'employer_quantity\',\n
+ \'employee_price\',\n
+ \'employee_quantity\',\n
\'causality\',\n
]\n
for line in line_list:\n
@@ -84,8 +84,8 @@
\'source_section_title\': line.getSourceSectionTitle(),\n
\'title\' : line.getTitle(),\n
\'service\' : getattr(line, \'service\', None),\n
- \'employer_share_total_price\' : getattr(line, \'employer_share_total_price\', None),\n
- \'employee_share_total_price\' : getattr(line, \'employee_share_total_price\', None),\n
+ \'employer_total_price\' : getattr(line, \'employer_total_price\', None),\n
+ \'employee_total_price\' : getattr(line, \'employee_total_price\', None),\n
}\n
\n
addProperties(line=line, line_dict=line_dict, property_list=property_list)\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=29072&r1=29071&r2=29072&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] Wed Sep 16 16:59:26 2009
@@ -78,8 +78,8 @@
# this following columns are add for both edibales and not\n
for model_line in context.contentValues(portal_type=\'Pay Sheet Line\'):\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
+ price = (contribution_share.getId()+\'_price\', contribution_share.getTitle()+\' Share Rate\')\n
+ quantity = (contribution_share.getId()+\'_total_price\', \n
contribution_share.getTitle()+\' Share Amount\')\n
if price not in column_list:\n
column_list.append(price)\n
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=29072&r1=29071&r2=29072&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] Wed Sep 16 16:59:26 2009
@@ -119,9 +119,9 @@
\n
base = cell.getQuantity()\n
\n
- share_dict[cell.getContributionShare()+\'_share_price\'] = cell.getPrice()\n
- share_dict[cell.getContributionShare()+\'_share_quantity\'] = cell.getQuantity()\n
- share_dict[cell.getContributionShare()+\'_share_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_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -53,7 +53,9 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>translateString = context.Base_translateString\n
+ <value> <string encoding="cdata"><![CDATA[
+
+translateString = context.Base_translateString\n
model = context.getSpecialiseValue().getEffectiveModel(\\\n
start_date=context.getStartDate(), stop_date=context.getStopDate())\n
\n
@@ -143,6 +145,28 @@
if days:\n
return \'%s %s\' % (days, translateString(\'Days\'))\n
return \'\'\n
+\n
+def getSocialOrganisationValue():\n
+ model = context.getSpecialiseValue()\n
+ business_process_list = model.findSpecialiseValueList(\\\n
+ context=context, portal_type_list=[\'Business Process\'])\n
+ business_process = None\n
+ if len(business_process_list):\n
+ # XXX currently, is too complicated to use more than\n
+ # one Business Process, so the first (which is the nearest from the\n
+ # delivery) is took\n
+ business_process = business_process_list[0]\n
+ business_path_list = business_process.getPathValueList(trade_phase=\\\n
+ \'payroll/invoicing/social_security\')\n
+ if len(business_path_list) > 1:\n
+ raise NotImplementedError, \'For now, it can not support more \'\\\n
+ \'than one business_path with same trade_phase. \'\\\n
+ \'%s have same trade_phase\' % repr(business_path_list)\n
+ if len(business_path_list) == 1:\n
+ business_path = business_path_list[0]\n
+ return business_path.getSourceSectionValue()\n
+\n
+ return None\n
\n
\n
line_list = []\n
@@ -329,16 +353,10 @@
context.getDestinationSectionValue().getProperty(\'activity_code\') or \'\'),\n
\'destination_section_social_codeid\': getSocialCodeId(context.getDestinationSection() and\n
context.getDestinationSectionValue().getProperty(\'social_code\') or \'\'),\n
- \'destination_section_social_company_title\' : context.getSocialInsuranceAnnotationLineValue() is not None and \\\n
- context.getSocialInsuranceAnnotationLineValue().getSourceTitle() or \'\',\n
- \'destination_section_social_address\': getOneLineAddress(\n
- context.getSocialInsuranceAnnotationLineValue() is not None and \\\n
- context.getSocialInsuranceAnnotationLineValue().getSource() and \\\n
- context.getSocialInsuranceAnnotationLineValue().getSourceValue().getDefaultAddressText() or \'\',\n
- context.getSocialInsuranceAnnotationLineValue() is not None and \\\n
- context.getSocialInsuranceAnnotationLineValue().getSource() and \\\n
- context.getSocialInsuranceAnnotationLineValue().getSourceValue().getDefaultAddressRegionTitle() or \'\'),\n
-\n
+ \'destination_section_social_company_title\' : getSocialOrganisationValue() is not None and getSocialOrganisationValue().getTitle() or \'\',\n
+ \'destination_section_social_address\': getSocialOrganisationValue() is not None and getOneLineAddress(\\\n
+ getSocialOrganisationValue().getDefaultAddressText(),\n
+ getSocialOrganisationValue().getDefaultAddressRegionTitle()) or \'\',\n
\'destination_administration_title\':\\\n
destination_administration.getProperty(\'corporate_name\') or \\\n
destination_administration.getTitle(),\n
@@ -370,7 +388,9 @@
}\n
\n
return unicodeDict(data_dict)\n
-</string> </value>
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -425,6 +445,7 @@
<string>separator</string>
<string>getOrderedDate</string>
<string>getPaymentConditionText</string>
+ <string>getSocialOrganisationValue</string>
<string>line_list</string>
<string>total_price</string>
<string>total_vat</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=29072&r1=29071&r2=29072&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] Wed Sep 16 16:59:26 2009
@@ -74,11 +74,12 @@
\n
base_amount = portal.portal_categories.base_amount\n
\n
+base_contribution_uid_list = []\n
for category in base_contribution_list:\n
- category_value = getattr(base_amount, category, None)\n
+ category_value = base_amount.restrictedTraverse(category)\n
if category_value is None:\n
raise ValueError, \'Category "%s/%s" not found.\' % (base_amount.getPath(), category)\n
- base_contribution_uid_list = category_value.getUid()\n
+ base_contribution_uid_list.append(category_value.getUid())\n
\n
params = {\n
\'node_uid\' : paysheet.getSourceSectionUid(),\n
@@ -140,12 +141,11 @@
<string>portal</string>
<string>portal_simulation</string>
<string>base_amount</string>
+ <string>base_contribution_uid_list</string>
<string>_getiter_</string>
<string>category</string>
- <string>getattr</string>
<string>category_value</string>
<string>ValueError</string>
- <string>base_contribution_uid_list</string>
<string>DateTime</string>
<string>params</string>
<string>_apply_</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -85,10 +85,10 @@
<value>
<list>
<string>listbox_base</string>
- <string>listbox_employee_share_price</string>
- <string>listbox_employer_share_price</string>
- <string>listbox_employee_share_total_price</string>
- <string>listbox_employer_share_total_price</string>
+ <string>listbox_employee_price</string>
+ <string>listbox_employer_price</string>
+ <string>listbox_employee_total_price</string>
+ <string>listbox_employer_total_price</string>
<string>listbox_int_index</string>
<string>listbox_title</string>
</list>
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_price.xml?rev=29072&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_price.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_price.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -1,0 +1,99 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>editable</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_employee_price</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_percent</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_total_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_total_price.xml?rev=29072&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_total_price.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_total_price.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -1,0 +1,168 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>css_class</string>
+ <string>display_width</string>
+ <string>editable</string>
+ <string>input_style</string>
+ <string>precision</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_employee_total_price</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string>figure</string> </value>
+ </item>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value> <int>20</int> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_float_field</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1 234.5</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Money Quantity</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: preferences.getPreference(\'preferred_money_quantity_field_width\', 10)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getQuantityPrecisionFromResource(here.getPriceCurrency())</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_price.xml?rev=29072&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_price.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_price.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -1,0 +1,99 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>editable</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_employer_price</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_percent</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_total_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_total_price.xml?rev=29072&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_total_price.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_total_price.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -1,0 +1,168 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>css_class</string>
+ <string>display_width</string>
+ <string>editable</string>
+ <string>input_style</string>
+ <string>precision</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_employer_total_price</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string>figure</string> </value>
+ </item>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value> <int>20</int> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_float_field</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1 234.5</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Money Quantity</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: preferences.getPreference(\'preferred_money_quantity_field_width\', 10)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getQuantityPrecisionFromResource(here.getPriceCurrency())</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
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=29072&r1=29071&r2=29072&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] Wed Sep 16 16:59:26 2009
@@ -414,13 +414,13 @@
<!-- If previous line has \'base_salary\' category in its\n
base_contribution list and the next one don\'t have, display the total\n
gross_salary -->\n
- <tal:block condition="python: previous_line is not None and \'base_amount/gross_salary\' in previous_line[\'base_contribution_list\'] and \'base_amount/gross_salary\' not in line_dict[\'base_contribution_list\']">\n
+ <tal:block condition="python: previous_line is not None and \'base_amount/payroll/earning/salary/gross_salary\' in previous_line[\'base_contribution_list\'] and \'base_amount/payroll/earning/salary/gross_salary\' not in line_dict[\'base_contribution_list\']">\n
<table:table-row table:style-name=\'Tableau1.3\'>\n
<table:table-cell table:style-name=\'Tableau1.A8\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Left\' tal:content=\'python: here.Base_translateString("Gross Salary")\'>1</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A8\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents_20_Right\' tal:content=\'python:quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution="base_contribution/base_amount/gross_salary"))\'>400 000</text:p>\n
+ <text:p text:style-name=\'Table_20_Contents_20_Right\' tal:content=\'python:quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution="base_contribution/base_amount/payroll/earning/salary/gross_salary"))\'>400 000</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A8\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
@@ -495,62 +495,62 @@
\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'float\'\n
- tal:condition="python: line_dict[\'employee_share_price\'] != None"\n
- tal:attributes=\'office:value line_dict/employee_share_price\'> \n
+ tal:condition="python: line_dict[\'employee_price\'] != None"\n
+ tal:attributes=\'office:value line_dict/employee_price\'> \n
<text:p text:style-name=\'Table_20_Contents\'\n
- tal:content="python: price_renderer(line_dict[\'employee_share_price\'])"\n
+ tal:content="python: price_renderer(line_dict[\'employee_price\'])"\n
tal:attributes=\'text:style-name right_style_name\'>employee price</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'string\'\n
- tal:condition="python: line_dict[\'employee_share_price\'] == None"> \n
+ tal:condition="python: line_dict[\'employee_price\'] == None"> \n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'float\'\n
- tal:condition="python: line_dict[\'employee_share_total_price\'] != None"\n
- tal:attributes=\'office:value line_dict/employee_share_total_price\'> \n
+ tal:condition="python: line_dict[\'employee_total_price\'] != None"\n
+ tal:attributes=\'office:value line_dict/employee_total_price\'> \n
<text:p text:style-name=\'Table_20_Contents\'\n
- tal:content="python: quantity_renderer(line_dict[\'employee_share_total_price\'])"\n
+ tal:content="python: quantity_renderer(line_dict[\'employee_total_price\'])"\n
tal:attributes=\'text:style-name right_style_name\'>employee total price</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'string\'\n
- tal:condition="python: line_dict[\'employee_share_total_price\'] == None"> \n
+ tal:condition="python: line_dict[\'employee_total_price\'] == None"> \n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
\n
<!-- if this line not contribute to gross_salary base amount display employer share else don\'t display it-->\n
- <tal:block tal:condition="python: \'base_amount/gross_salary\' not in line_dict[\'base_contribution_list\']">\n
+ <tal:block tal:condition="python: \'base_amount/payroll/earning/salary/gross_salary\' not in line_dict[\'base_contribution_list\']">\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'float\'\n
- tal:condition="python: line_dict[\'employer_share_price\'] != None"\n
- tal:attributes=\'office:value line_dict/employer_share_price\'> \n
+ tal:condition="python: line_dict[\'employer_price\'] != None"\n
+ tal:attributes=\'office:value line_dict/employer_price\'> \n
<text:p text:style-name=\'Table_20_Contents\'\n
- tal:content="python: price_renderer(line_dict[\'employer_share_price\'])"\n
+ tal:content="python: price_renderer(line_dict[\'employer_price\'])"\n
tal:attributes=\'text:style-name right_style_name\'>employer price</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'string\'\n
- tal:condition="python: line_dict[\'employer_share_price\'] == None"> \n
+ tal:condition="python: line_dict[\'employer_price\'] == None"> \n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'float\'\n
- tal:condition="python: line_dict[\'employer_share_total_price\'] != None"\n
- tal:attributes=\'office:value line_dict/employer_share_total_price\'> \n
+ tal:condition="python: line_dict[\'employer_total_price\'] != None"\n
+ tal:attributes=\'office:value line_dict/employer_total_price\'> \n
<text:p text:style-name=\'Table_20_Contents\'\n
- tal:content="python: quantity_renderer(line_dict[\'employer_share_total_price\'])"\n
+ tal:content="python: quantity_renderer(line_dict[\'employer_total_price\'])"\n
tal:attributes=\'text:style-name right_style_name\'>employer total price</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'string\'\n
- tal:condition="python: line_dict[\'employer_share_total_price\'] == None"> \n
+ tal:condition="python: line_dict[\'employer_total_price\'] == None"> \n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
</tal:block>\n
- <tal:block tal:condition="python: \'base_amount/gross_salary\' in line_dict[\'base_contribution_list\']">\n
+ <tal:block tal:condition="python: \'base_amount/payroll/earning/salary/gross_salary\' in line_dict[\'base_contribution_list\']">\n
<table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
@@ -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\', contribution_share=\'contribution_share/employee\')), 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/payroll/earning/salary/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/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsText.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsText.xml?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsText.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsText.xml [utf8] Wed Sep 16 16:59:26 2009
@@ -79,16 +79,16 @@
string_to_display.append(rightPad(line[\'title\'], 40))\n
string_to_display.append(rightPad(line[\'base\'], 16))\n
\n
- if line.has_key(\'employer_share_quantity\'):\n
- string_to_display.append(rightPad(str(line[\'employer_share_price\']), 24))\n
- string_to_display.append(rightPad(str(line[\'employer_share_quantity\']), 24))\n
+ if line.has_key(\'employer_quantity\'):\n
+ string_to_display.append(rightPad(str(line[\'employer_price\']), 24))\n
+ string_to_display.append(rightPad(str(line[\'employer_quantity\']), 24))\n
else:\n
string_to_display.append(rightPad(\' \', 24))\n
string_to_display.append(rightPad(\' \', 24))\n
\n
- if line.has_key(\'employee_share_quantity\'):\n
- string_to_display.append(rightPad(str(line[\'employee_share_price\']), 24))\n
- string_to_display.append(rightPad(str(line[\'employee_share_quantity\']), 24))\n
+ if line.has_key(\'employee_quantity\'):\n
+ string_to_display.append(rightPad(str(line[\'employee_price\']), 24))\n
+ string_to_display.append(rightPad(str(line[\'employee_quantity\']), 24))\n
else:\n
string_to_display.append(rightPad(\' \', 24))\n
string_to_display.append(rightPad(\' \', 24))\n
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Wed Sep 16 16:59:26 2009
@@ -1,1 +1,1 @@
-531
+530
More information about the Erp5-report
mailing list