Commit 19884721 authored by Kevin Deldycke's avatar Kevin Deldycke

Do not display base and rate for "forfait" services.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10813 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d2292a3d
...@@ -201,6 +201,13 @@ for pay_sheet_line in object_list:\n ...@@ -201,6 +201,13 @@ for pay_sheet_line in object_list:\n
pay_sheet_dict[\'employer_share_rate\'] = cell_price * 100\n pay_sheet_dict[\'employer_share_rate\'] = cell_price * 100\n
if pay_sheet_dict[\'employer_share\'] not in (\'\', None):\n if pay_sheet_dict[\'employer_share\'] not in (\'\', None):\n
total_employer_share = r_(total_employer_share + r_(pay_sheet_dict[\'employer_share\']))\n total_employer_share = r_(total_employer_share + r_(pay_sheet_dict[\'employer_share\']))\n
\n
if range.endswith(\'forfait\'):\n
pay_sheet_dict[\'base\'] = \'\'\n
pay_sheet_dict[\'employer_share_rate\'] = \'\'\n
pay_sheet_dict[\'employee_share_rate\'] = \'\'\n
\n
\n
for key in [\'employee_share\',\'employee_share_rate\',\'employer_share\',\'employer_share_rate\']:\n for key in [\'employee_share\',\'employee_share_rate\',\'employer_share\',\'employer_share_rate\']:\n
if not (pay_sheet_dict.has_key(key)):\n if not (pay_sheet_dict.has_key(key)):\n
pay_sheet_dict[key] = \'\' # so that we can display nothing\n pay_sheet_dict[key] = \'\' # so that we can display nothing\n
......
...@@ -58,8 +58,7 @@ ...@@ -58,8 +58,7 @@
paysheet_categories python: paysheet_details[\'paysheet_categories\'];\n paysheet_categories python: paysheet_details[\'paysheet_categories\'];\n
urssaf python: employer.getDestinationSectionValue();\n urssaf python: employer.getDestinationSectionValue();\n
start_date python: here.getStartDate();\n start_date python: here.getStartDate();\n
\n boldstyle python: \'(\\\'FONT\\\', \\\'Helvetica-Bold\\\', 7)\'">\n
boldstyle python:\'(\\\'FONT\\\', \\\'Helvetica-Bold\\\', 7)\'">\n
\n \n
\n \n
<title>Pay Sheet</title>\n <title>Pay Sheet</title>\n
...@@ -70,13 +69,13 @@ ...@@ -70,13 +69,13 @@
<tr>\n <tr>\n
<td colwidth="4.318cm">Nature</td>\n <td colwidth="4.318cm">Nature</td>\n
<td colwidth="3.81cm">Assiette</td>\n <td colwidth="3.81cm">Assiette</td>\n
<td colwidth="1.524cm">Montant</td>\n <td colwidth="1.524cm">Base</td>\n
<td colwidth="2.77cm">Taux part patronale</td>\n <td colwidth="2.77cm">Taux part patronale</td>\n
<td colwidth="2.288cm">Part patronale</td>\n <td colwidth="2.288cm">Part patronale</td>\n
<td colwidth="2.397cm">Taux part salariale</td>\n <td colwidth="2.397cm">Taux part salariale</td>\n
<td colwidth="1.959cm">Part salariale</td>\n <td colwidth="1.959cm">Part salariale</td>\n
</tr>\n </tr>\n
\n \n
<tr tal:attributes="stylecmd boldstyle"> <!--stylecmd="(\'FONT\', \'Helvetica-Bold\', 7)"> -->\n <tr tal:attributes="stylecmd boldstyle"> <!--stylecmd="(\'FONT\', \'Helvetica-Bold\', 7)"> -->\n
<td>Salaire brut</td>\n <td>Salaire brut</td>\n
<td> </td>\n <td> </td>\n
...@@ -86,7 +85,7 @@ ...@@ -86,7 +85,7 @@
<td> </td>\n <td> </td>\n
<td tal:content="python: \'%.2f\' % paysheet_details[\'gross_salary\']" tal:condition="python: paysheet_details[\'gross_salary\'] not in (None, \'\')">???</td>\n <td tal:content="python: \'%.2f\' % paysheet_details[\'gross_salary\']" tal:condition="python: paysheet_details[\'gross_salary\'] not in (None, \'\')">???</td>\n
</tr>\n </tr>\n
\n \n
<tal:block tal:condition="python: paysheet_categories.has_key(\'no_cat\')">\n <tal:block tal:condition="python: paysheet_categories.has_key(\'no_cat\')">\n
<tal:block define="no_cat_lines python: paysheet_categories[\'no_cat\'][\'lines\']">\n <tal:block define="no_cat_lines python: paysheet_categories[\'no_cat\'][\'lines\']">\n
<tr tal:repeat="line no_cat_lines">\n <tr tal:repeat="line no_cat_lines">\n
...@@ -133,7 +132,7 @@ ...@@ -133,7 +132,7 @@
<td> </td>\n <td> </td>\n
<td> <tal:block replace="python: \'%.2f\' % paysheet_details[\'total_employee_share\']" tal:condition="python: paysheet_details[\'total_employee_share\'] not in (\'\', None)"> </tal:block></td>\n <td> <tal:block replace="python: \'%.2f\' % paysheet_details[\'total_employee_share\']" tal:condition="python: paysheet_details[\'total_employee_share\'] not in (\'\', None)"> </tal:block></td>\n
</tr>\n </tr>\n
\n \n
<tr tal:attributes="stylecmd boldstyle">\n <tr tal:attributes="stylecmd boldstyle">\n
<td>Salaire Net Imposable</td>\n <td>Salaire Net Imposable</td>\n
<td> </td>\n <td> </td>\n
...@@ -170,7 +169,7 @@ ...@@ -170,7 +169,7 @@
</table>\n </table>\n
\n \n
<table rowheight="0.6cm"><tr><td> </td></tr></table>\n <table rowheight="0.6cm"><tr><td> </td></tr></table>\n
\n \n
<table style="cumul_conges">\n <table style="cumul_conges">\n
<tr>\n <tr>\n
<td colwidth="11cm"> <tal:block tal:replace="python: \'Cumuls annuels (%s)\' % start_date.year()" tal:condition="python: start_date not in (\'\', None)"/></td>\n <td colwidth="11cm"> <tal:block tal:replace="python: \'Cumuls annuels (%s)\' % start_date.year()" tal:condition="python: start_date not in (\'\', None)"/></td>\n
...@@ -178,7 +177,7 @@ ...@@ -178,7 +177,7 @@
<td colwidth="5cm"> <!-- <tal:block tal:replace="python: \'Dur\xc3\xa9e des cong\xc3\xa9s pay\xc3\xa9s : ???\'"/> --> </td>\n <td colwidth="5cm"> <!-- <tal:block tal:replace="python: \'Dur\xc3\xa9e des cong\xc3\xa9s pay\xc3\xa9s : ???\'"/> --> </td>\n
</tr>\n </tr>\n
</table>\n </table>\n
\n \n
\n \n
<table style="cumul_conges_corps">\n <table style="cumul_conges_corps">\n
<tr>\n <tr>\n
...@@ -200,9 +199,9 @@ ...@@ -200,9 +199,9 @@
<td> </td>\n <td> </td>\n
</tr>\n </tr>\n
</table>\n </table>\n
\n \n
</content>\n </content>\n
\n \n
</document> </document>
]]></string> </value> ]]></string> </value>
......
2006-10-18 Kevin 2006-10-18 Kevin
* Add new french payroll services. * Add new french payroll services.
* Do not display base and rate for "forfait" services.
2006-10-17 Kevin 2006-10-17 Kevin
* Add Pay Sheet Transaction as default sub type in Accounting Module. * Add Pay Sheet Transaction as default sub type in Accounting Module.
......
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