Commit 64673b29 authored by Kevin Deldycke's avatar Kevin Deldycke

Minor changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10815 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9672109c
...@@ -201,13 +201,10 @@ for pay_sheet_line in object_list:\n ...@@ -201,13 +201,10 @@ 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 if range.endswith(\'forfait\'):\n
pay_sheet_dict[\'base\'] = \'\'\n pay_sheet_dict[\'base\'] = \'\'\n
pay_sheet_dict[\'employer_share_rate\'] = \'\'\n pay_sheet_dict[\'employer_share_rate\'] = \'\'\n
pay_sheet_dict[\'employee_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
......
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
<table splitbyrow="1" rowheight=\'0.4cm\' repeatrows="1" repeatcols="0" style="decompte">\n <table splitbyrow="1" rowheight=\'0.4cm\' repeatrows="1" repeatcols="0" style="decompte">\n
<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">Base</td>\n
<td colwidth="1.524cm">Base</td>\n <td colwidth="1.524cm">Assiette</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
......
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