[Erp5-report] r18156 - in /erp5/trunk/bt5/erp5_payroll: PathTemplateItem/payroll_service_mo...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Dec 10 09:49:30 CET 2007
Author: fabien
Date: Mon Dec 10 09:49:29 2007
New Revision: 18156
URL: http://svn.erp5.org?rev=18156&view=rev
Log:
- invert salary_range and tax_category order in the PayrollService_view. This permit to display the matrix box with salary_range on the right column and tax_category on the top line, and this is more confortable.
- add the base_application to the getMovementList method, this permit to display the base application if there is no slices used.
Added:
erp5/trunk/bt5/erp5_payroll/bt/template_catalog_datetime_key_list
Modified:
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/total_employee_contributions.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.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_getMovementList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_variation_base_category_list.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/total_employee_contributions.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/total_employee_contributions.xml?rev=18156&r1=18155&r2=18156&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/total_employee_contributions.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/total_employee_contributions.xml Mon Dec 10 09:49:29 2007
@@ -108,8 +108,8 @@
<key> <string>variation_base_category_list</string> </key>
<value>
<tuple>
+ <string>salary_range</string>
<string>tax_category</string>
- <string>salary_range</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml?rev=18156&r1=18155&r2=18156&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml Mon Dec 10 09:49:29 2007
@@ -99,7 +99,7 @@
for slice in pay_sheet_line.getSalaryRangeList(base=1):\n
for category in category_list:\n
if category in pay_sheet_line.getVariationCategoryList():\n
- cell = pay_sheet_line.getCell(category, slice)\n
+ cell = pay_sheet_line.getCell(slice, category)\n
total_price = cell.getQuantity() * cell.getPrice()\n
amount += round(total_price, precision)\n
else:\n
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=18156&r1=18155&r2=18156&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml Mon Dec 10 09:49:29 2007
@@ -89,6 +89,8 @@
#line_dict[\'title\'] = \'%s (%s)\' % (line_dict[\'title\'], line_dict[\'slice\'])\n
line_dict[\'base_participation_list\'] = getattr(line, \n
\'base_participation_list\', None)\n
+ line_dict[\'base_application_list\'] = getattr(line, \n
+ \'base_application_list\', None)\n
\n
line_dict[\'base_name\'] = getattr(line, \'base_name\', None)\n
\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=18156&r1=18155&r2=18156&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml Mon Dec 10 09:49:29 2007
@@ -90,6 +90,11 @@
\n
for paysheet_line in paysheet_line_list:\n
base_category_list = paysheet_line.getVariationBaseCategoryList()\n
+ base_application_list = paysheet_line.getBaseAmountTitleList()\n
+ translated_base_application_list = [str(N_(x)) for x in base_application_list]\n
+ context.log(\'translated_base_application_list :%s\' %\n
+ translated_base_application_list)\n
+ base_application_list = \', \'.join(translated_base_application_list)\n
list_of_list = []\n
for base_category in base_category_list:\n
list = paysheet_line.getVariationCategoryList(base_category_list=\\\n
@@ -143,6 +148,7 @@
\'base_name\':base_name,\n
\'base\':base,\n
\'base_participation_list\':base_participation_list,\n
+ \'base_application_list\': base_application_list,\n
\'payroll_service\':payroll_service.getId()}\n
object_dict[slice].update(share_dict)\n
else:\n
@@ -247,6 +253,12 @@
<string>_getiter_</string>
<string>paysheet_line</string>
<string>base_category_list</string>
+ <string>base_application_list</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>x</string>
+ <string>str</string>
+ <string>translated_base_application_list</string>
<string>list_of_list</string>
<string>base_category</string>
<string>list</string>
@@ -262,10 +274,7 @@
<string>cell</string>
<string>quantity</string>
<string>base</string>
- <string>append</string>
- <string>$append0</string>
<string>base_application</string>
- <string>str</string>
<string>base_list</string>
<string>base_name</string>
<string>payroll_service</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_variation_base_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_variation_base_category_list.xml?rev=18156&r1=18155&r2=18156&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_variation_base_category_list.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_variation_base_category_list.xml Mon Dec 10 09:49:29 2007
@@ -241,12 +241,12 @@
<value>
<list>
<tuple>
+ <string>salary_range</string>
+ <string>salary_range</string>
+ </tuple>
+ <tuple>
<string>tax_category</string>
<string>tax_category</string>
- </tuple>
- <tuple>
- <string>salary_range</string>
- <string>salary_range</string>
</tuple>
<tuple>
<string>grade</string>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=18156&r1=18155&r2=18156&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Mon Dec 10 09:49:29 2007
@@ -1,1 +1,1 @@
-179
+181
Added: erp5/trunk/bt5/erp5_payroll/bt/template_catalog_datetime_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/template_catalog_datetime_key_list?rev=18156&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list