From 64673b290414cfb12e4f65b1ffb96a114fda93fc Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Wed, 18 Oct 2006 15:31:05 +0000 Subject: [PATCH] Minor changes git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10815 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_payroll/PaySheetTransaction_getDetails.xml | 3 --- .../PaySheetTransaction_viewPaySheetTransactionAsPDF.xml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml index ef29a26030..2c2b425cae 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml @@ -201,13 +201,10 @@ for pay_sheet_line in object_list:\n pay_sheet_dict[\'employer_share_rate\'] = cell_price * 100\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 -\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 if not (pay_sheet_dict.has_key(key)):\n pay_sheet_dict[key] = \'\' # so that we can display nothing\n diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml index da2b119257..ee08e0c903 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml @@ -68,8 +68,8 @@ <table splitbyrow="1" rowheight=\'0.4cm\' repeatrows="1" repeatcols="0" style="decompte">\n <tr>\n <td colwidth="4.318cm">Nature</td>\n - <td colwidth="3.81cm">Assiette</td>\n - <td colwidth="1.524cm">Base</td>\n + <td colwidth="3.81cm">Base</td>\n + <td colwidth="1.524cm">Assiette</td>\n <td colwidth="2.77cm">Taux part patronale</td>\n <td colwidth="2.288cm">Part patronale</td>\n <td colwidth="2.397cm">Taux part salariale</td>\n -- 2.30.9