[Erp5-report] r31557 aurel - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jan 4 13:22:00 CET 2010
Author: aurel
Date: Mon Jan 4 13:21:58 2010
New Revision: 31557
URL: http://svn.erp5.org?rev=31557&view=rev
Log:
2010-01-04 aurel
Update the bt to use the new structure of the base amount category :
- on base application/contribution fields of paysheet line and paysheet models line, only display the subcategory payroll of the base amount
- update odt report to use new base amount category tree, factorize some variable in the report
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_application_list.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_contribution_list.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_application_list.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_application_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_application_list.xml?rev=31557&r1=31556&r2=31557&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_application_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_application_list.xml [utf8] Mon Jan 4 13:21:58 2010
@@ -271,7 +271,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: getattr(here.portal_categories.base_amount, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
+ <value> <string>python: getattr(here.portal_categories.base_amount.payroll, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_contribution_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_contribution_list.xml?rev=31557&r1=31556&r2=31557&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_contribution_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_contribution_list.xml [utf8] Mon Jan 4 13:21:58 2010
@@ -14,8 +14,8 @@
<value>
<list>
<string>description</string>
+ <string>items</string>
<string>title</string>
- <string>items</string>
</list>
</value>
</item>
@@ -58,6 +58,10 @@
<value>
<dictionary>
<item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -73,6 +77,10 @@
</item>
<item>
<key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -93,6 +101,12 @@
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>target</string> </key>
@@ -119,7 +133,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: getattr(here.portal_categories.base_amount, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
+ <value> <string>python: getattr(here.portal_categories.base_amount.payroll, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_application_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_application_list.xml?rev=31557&r1=31556&r2=31557&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_application_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_application_list.xml [utf8] Mon Jan 4 13:21:58 2010
@@ -14,8 +14,8 @@
<value>
<list>
<string>description</string>
+ <string>items</string>
<string>title</string>
- <string>items</string>
</list>
</value>
</item>
@@ -58,6 +58,10 @@
<value>
<dictionary>
<item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -73,6 +77,10 @@
</item>
<item>
<key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -93,6 +101,12 @@
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>target</string> </key>
@@ -119,7 +133,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: getattr(here.portal_categories.base_amount, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
+ <value> <string>python: getattr(here.portal_categories.base_amount.payroll, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml?rev=31557&r1=31556&r2=31557&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml [utf8] Mon Jan 4 13:21:58 2010
@@ -58,6 +58,10 @@
<value>
<dictionary>
<item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -73,6 +77,10 @@
</item>
<item>
<key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -125,7 +133,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: getattr(here.portal_categories.base_amount, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
+ <value> <string>python: getattr(here.portal_categories.base_amount.payroll, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
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=31557&r1=31556&r2=31557&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] Mon Jan 4 13:21:58 2010
@@ -55,6 +55,7 @@
tal:define="data_dict here/PaySheetTransaction_getODTDataDict;\n
set_precision python: request.set(\'precision\', here.getQuantityPrecisionFromResource(here.getPriceCurrency()));\n
quantity_renderer nocall:here/Base_viewFieldLibrary/my_money_quantity/render_pdf;\n
+ gross_category python:\'base_amount/payroll/report/salary/gross\';\n
price_renderer nocall:here/PaySheetTransaction_viewFieldLibrary/my_price/render_pdf;\n
default_language python:test(request.get(\'international_form\'), \'en\', here.Localizer.get_selected_language())">\n
<office:scripts/>\n
@@ -414,13 +415,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/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
+ <tal:block condition="python: previous_line is not None and gross_category in previous_line[\'base_contribution_list\'] and gross_category 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/payroll/earning/salary/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/%s"%gross_category))\'>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
@@ -521,8 +522,8 @@
<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/payroll/earning/salary/gross_salary\' not in line_dict[\'base_contribution_list\']">\n
+ <!-- if this line does not contribute to gross category then display employer share else don\'t display it-->\n
+ <tal:block tal:condition="python: gross_category 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_price\'] != None"\n
@@ -550,7 +551,7 @@
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
</tal:block>\n
- <tal:block tal:condition="python: \'base_amount/payroll/earning/salary/gross_salary\' in line_dict[\'base_contribution_list\']">\n
+ <tal:block tal:condition="python: gross_category 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 +616,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/payroll/earning/salary/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/report/salary/net\', 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=31557&r1=31556&r2=31557&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] Mon Jan 4 13:21:58 2010
@@ -1,3 +1,6 @@
+2010-01-04 aurel
+Update the bt to use the new structure of the base amount category
+
2009-12-5 yusei
* Fix PaySheetTransaction_getODTDataDict. Make print pay slip works without pay sheet model.
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=31557&r1=31556&r2=31557&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Mon Jan 4 13:21:58 2010
@@ -1,1 +1,1 @@
-537
+539
More information about the Erp5-report
mailing list