Commit da8fa2f0 authored by Fabien Morin's avatar Fabien Morin

- invert salary_range and tax_category order in the PayrollService_view. This ...

- 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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18156 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c2a756fa
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
<key> <string>variation_base_category_list</string> </key> <key> <string>variation_base_category_list</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category</string>
<string>salary_range</string> <string>salary_range</string>
<string>tax_category</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -99,7 +99,7 @@ for pay_sheet_line in paysheet.contentValues(portal_type=\'Pay Sheet Line\'):\n ...@@ -99,7 +99,7 @@ for pay_sheet_line in paysheet.contentValues(portal_type=\'Pay Sheet Line\'):\n
for slice in pay_sheet_line.getSalaryRangeList(base=1):\n for slice in pay_sheet_line.getSalaryRangeList(base=1):\n
for category in category_list:\n for category in category_list:\n
if category in pay_sheet_line.getVariationCategoryList():\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 total_price = cell.getQuantity() * cell.getPrice()\n
amount += round(total_price, precision)\n amount += round(total_price, precision)\n
else:\n else:\n
......
...@@ -89,6 +89,8 @@ for line in line_list: \n ...@@ -89,6 +89,8 @@ for line in line_list: \n
#line_dict[\'title\'] = \'%s (%s)\' % (line_dict[\'title\'], line_dict[\'slice\'])\n #line_dict[\'title\'] = \'%s (%s)\' % (line_dict[\'title\'], line_dict[\'slice\'])\n
line_dict[\'base_participation_list\'] = getattr(line, \n line_dict[\'base_participation_list\'] = getattr(line, \n
\'base_participation_list\', None)\n \'base_participation_list\', None)\n
line_dict[\'base_application_list\'] = getattr(line, \n
\'base_application_list\', None)\n
\n \n
line_dict[\'base_name\'] = getattr(line, \'base_name\', None)\n line_dict[\'base_name\'] = getattr(line, \'base_name\', None)\n
\n \n
......
...@@ -90,6 +90,11 @@ line_list = []\n ...@@ -90,6 +90,11 @@ line_list = []\n
\n \n
for paysheet_line in paysheet_line_list:\n for paysheet_line in paysheet_line_list:\n
base_category_list = paysheet_line.getVariationBaseCategoryList()\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 list_of_list = []\n
for base_category in base_category_list:\n for base_category in base_category_list:\n
list = paysheet_line.getVariationCategoryList(base_category_list=\\\n list = paysheet_line.getVariationCategoryList(base_category_list=\\\n
...@@ -143,6 +148,7 @@ for paysheet_line in paysheet_line_list:\n ...@@ -143,6 +148,7 @@ for paysheet_line in paysheet_line_list:\n
\'base_name\':base_name,\n \'base_name\':base_name,\n
\'base\':base,\n \'base\':base,\n
\'base_participation_list\':base_participation_list,\n \'base_participation_list\':base_participation_list,\n
\'base_application_list\': base_application_list,\n
\'payroll_service\':payroll_service.getId()}\n \'payroll_service\':payroll_service.getId()}\n
object_dict[slice].update(share_dict)\n object_dict[slice].update(share_dict)\n
else:\n else:\n
...@@ -247,6 +253,12 @@ return line_list\n ...@@ -247,6 +253,12 @@ return line_list\n
<string>_getiter_</string> <string>_getiter_</string>
<string>paysheet_line</string> <string>paysheet_line</string>
<string>base_category_list</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>list_of_list</string>
<string>base_category</string> <string>base_category</string>
<string>list</string> <string>list</string>
...@@ -262,10 +274,7 @@ return line_list\n ...@@ -262,10 +274,7 @@ return line_list\n
<string>cell</string> <string>cell</string>
<string>quantity</string> <string>quantity</string>
<string>base</string> <string>base</string>
<string>append</string>
<string>$append0</string>
<string>base_application</string> <string>base_application</string>
<string>str</string>
<string>base_list</string> <string>base_list</string>
<string>base_name</string> <string>base_name</string>
<string>payroll_service</string> <string>payroll_service</string>
......
...@@ -240,14 +240,14 @@ ...@@ -240,14 +240,14 @@
<key> <string>items</string> </key> <key> <string>items</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>tax_category</string>
<string>tax_category</string>
</tuple>
<tuple> <tuple>
<string>salary_range</string> <string>salary_range</string>
<string>salary_range</string> <string>salary_range</string>
</tuple> </tuple>
<tuple>
<string>tax_category</string>
<string>tax_category</string>
</tuple>
<tuple> <tuple>
<string>grade</string> <string>grade</string>
<string>grade</string> <string>grade</string>
......
179 181
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment