[Erp5-report] r10815 - /erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payr...

[nobody at svn.erp5.org]

Author: kevin
Date: Wed Oct 18 17:31:05 2006
New Revision: 10815

URL: http://svn.erp5.org?rev=10815&view=rev
Log:
Minor changes

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml?rev=10815&r1=10814&r2=10815&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml Wed Oct 18 17:31:05 2006
@@ -201,13 +201,10 @@
               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

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml?rev=10815&r1=10814&r2=10815&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml Wed Oct 18 17:31:05 2006
@@ -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