Commit 6efd6a00 authored by Kevin Deldycke's avatar Kevin Deldycke

Support multiline gross salary on printing

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10893 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9a6eab84
......@@ -195,7 +195,6 @@ num = 0\n
INT_LEN = 3\n
for (preview_line_id, preview_line_item) in pre_calculation.items():\n
num += 1\n
context.log("Kev dfsdfsdfsdff", repr((preview_line_id, preview_line_item)))\n
service = preview_line_item[\'service\']\n
salary_range = preview_line_item[\'salary_range\']\n
service_id = service.getId()\n
......@@ -316,7 +315,6 @@ return preview_line_list\n
<string>INT_LEN</string>
<string>preview_line_id</string>
<string>preview_line_item</string>
<string>repr</string>
<string>service_id</string>
<string>o</string>
</tuple>
......
......@@ -52,8 +52,6 @@
\n
<tal:block tal:define="employee python: here.getDestinationSectionValue();\n
employer python: here.getSourceSectionValue();\n
paysheet_details python: here.PaySheetTransaction_getDetails();\n
paysheet_categories python: paysheet_details[\'paysheet_categories\'];\n
urssaf python: employer.getDestinationSectionValue();\n
start_date python: here.getStartDate()">\n
\n
......@@ -66,8 +64,8 @@
allowsplitting=\'1\'\n
landscape=\'0\'\n
leftmargin=\'0.635cm\'\n
tal:define=\'portal python:here.portal_url.getPortalObject()\'>\n
\n
tal:define=\'portal python: here.portal_url.getPortalObject()\'>\n
\n
<stylesheet>\n
<tablestyle name="decompte">\n
<stylecmd expr="(\'FONTSIZE\', (0,0), (-1,-1), 7)"/>\n
......@@ -110,7 +108,7 @@
<stylecmd expr="(\'BOTTOMPADDING\', (0,0), (0,0), 0)"/>\n
<stylecmd expr="(\'ALIGNMENT\', (0,0), (0,0), \'CENTER\')"/>\n
<stylecmd expr="(\'VALIGN\', (0,0), (0,0), \'MIDDLE\')"/>\n
\n
\n
<!-- Premiere ligne de droite\n
<stylecmd expr="(\'LINEABOVE\', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>\n
<stylecmd expr="(\'LINEBEFORE\', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>\n
......@@ -132,7 +130,7 @@
<stylecmd expr="(\'LINEBEFORE\', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>\n
<stylecmd expr="(\'LINEAFTER\', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>\n
-->\n
<stylecmd expr="(\'OUTLINE\', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/> \n
<stylecmd expr="(\'OUTLINE\', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>\n
</tablestyle>\n
\n
</stylesheet>\n
......
......@@ -250,13 +250,13 @@ createPaySheetItem( title = \'Salary\' # labour_service.getTitleOrId()\n
, dest_org = context.getDestinationSection()\n
, cells = [{ "x" : labour_employee_share_category\n
, "y" : labour_salary_range\n
, "base" : 1.0\n
, "rate" : r_(total_employee_share - gross_salary)\n
, "base" : -1.0\n
, "rate" : r_(gross_salary - total_employee_share)\n
},\n
{ "x" : labour_employer_share_category\n
, "y" : labour_salary_range\n
, "base" : 1.0\n
, "rate" : -gross_salary\n
, "base" : -1.0\n
, "rate" : gross_salary\n
}]\n
)\n
\n
......
......@@ -487,27 +487,27 @@ kw[\'reduction_fillon_forfait/forfait\'] = \\\n
# Add blank lines for services which is a variable part od the gross salary.\n
# Thanks to this, the accountant has the freedom to add the missing amount of money\n
# that this script can\'t guess.\n
kw[\'retenue_maladie/base\'] = \\\n
kw[\'retenue_maladie/gross\'] = \\\n
{ \'employer_share\': None\n
, \'employee_share\': None\n
, \'base\' : 1.0\n
}\n
kw[\'primes/base\'] = \\\n
kw[\'primes/gross\'] = \\\n
{ \'employer_share\': None\n
, \'employee_share\': None\n
, \'base\' : 1.0\n
}\n
kw[\'absences/base\'] = \\\n
kw[\'absences/gross\'] = \\\n
{ \'employer_share\': None\n
, \'employee_share\': None\n
, \'base\' : 1.0\n
}\n
kw[\'iccp/base\'] = \\\n
kw[\'iccp/gross\'] = \\\n
{ \'employer_share\': None\n
, \'employee_share\': None\n
, \'base\' : 1.0\n
}\n
kw[\'precarite/base\'] = \\\n
kw[\'precarite/gross\'] = \\\n
{ \'employer_share\': None\n
, \'employee_share\': None\n
, \'base\' : 1.0\n
......
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