[Erp5-report] r10813 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Oct 18 15:53:42 CEST 2006
Author: kevin
Date: Wed Oct 18 15:53:41 2006
New Revision: 10813
URL: http://svn.erp5.org?rev=10813&view=rev
Log:
Do not display base and rate for "forfait" services.
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
erp5/trunk/bt5/erp5_payroll/bt/change_log
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=10813&r1=10812&r2=10813&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 15:53:41 2006
@@ -201,6 +201,13 @@
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=10813&r1=10812&r2=10813&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 15:53:41 2006
@@ -52,14 +52,13 @@
\n
<document filename="report01.pdf"\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n
- 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
- boldstyle python:\'(\\\'FONT\\\', \\\'Helvetica-Bold\\\', 7)\'">\n
+ 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
+ boldstyle python: \'(\\\'FONT\\\', \\\'Helvetica-Bold\\\', 7)\'">\n
\n
\n
<title>Pay Sheet</title>\n
@@ -70,13 +69,13 @@
<tr>\n
<td colwidth="4.318cm">Nature</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.288cm">Part patronale</td>\n
<td colwidth="2.397cm">Taux part salariale</td>\n
<td colwidth="1.959cm">Part salariale</td>\n
</tr>\n
- \n
+\n
<tr tal:attributes="stylecmd boldstyle"> <!--stylecmd="(\'FONT\', \'Helvetica-Bold\', 7)"> -->\n
<td>Salaire brut</td>\n
<td> </td>\n
@@ -86,7 +85,7 @@
<td> </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
- \n
+\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
<tr tal:repeat="line no_cat_lines">\n
@@ -133,7 +132,7 @@
<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
</tr>\n
- \n
+\n
<tr tal:attributes="stylecmd boldstyle">\n
<td>Salaire Net Imposable</td>\n
<td> </td>\n
@@ -170,7 +169,7 @@
</table>\n
\n
<table rowheight="0.6cm"><tr><td> </td></tr></table>\n
- \n
+\n
<table style="cumul_conges">\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
@@ -178,7 +177,7 @@
<td colwidth="5cm"> <!-- <tal:block tal:replace="python: \'Dur\xc3\xa9e des cong\xc3\xa9s pay\xc3\xa9s : ???\'"/> --> </td>\n
</tr>\n
</table>\n
- \n
+\n
\n
<table style="cumul_conges_corps">\n
<tr>\n
@@ -200,9 +199,9 @@
<td> </td>\n
</tr>\n
</table>\n
- \n
+\n
</content>\n
- \n
+\n
</document>
]]></string> </value>
Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=10813&r1=10812&r2=10813&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Wed Oct 18 15:53:41 2006
@@ -1,5 +1,6 @@
2006-10-18 Kevin
* Add new french payroll services.
+* Do not display base and rate for "forfait" services.
2006-10-17 Kevin
* Add Pay Sheet Transaction as default sub type in Accounting Module.
More information about the Erp5-report
mailing list