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 184512397086e110156b1ad7eea2a93ad60864dd..5f78d691cca9d3fe44ed63ae9f1cea6a997e6c08 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 @@ -162,24 +162,26 @@ <td><tal:block replace="python: details[\'totals\'][\'taxable_net_salary\']"\n condition="python: details[\'totals\'].has_key(\'taxable_net_salary\')"/> </td>\n </tr>\n -\n -<!--\n - <tal:block repeat="category paysheet_categories">\n - <tal:block define="paysheet_lines python: paysheet_categories[category][\'lines\']">\n - <tal:block repeat="line paysheet_lines">\n - <tr tal:condition="python: line.has_key(\'taxable\') and line[\'taxable\']==\'yes\'">\n - <td> <tal:block content="python: line[\'title\']"/></td>\n - <td> <tal:block content="python: line[\'base_name\']"/></td>\n - <td> <tal:block replace="python: \'%.2f\' % line[\'base\']" tal:condition="python: line[\'base\'] not in (\'\', None)"></tal:block></td>\n - <td> </td>\n - <td> </td>\n - <td> <tal:block replace="python: \'%.3f %%\' % line[\'employee_share_rate\']" tal:condition="python: line[\'employee_share_rate\'] not in (\'\', None)"></tal:block></td>\n - <td> <tal:block replace="python: \'%.2f\' % abs(float(line[\'employee_share\']))" tal:condition="python: line[\'employee_share\'] not in (\'\', None)"></tal:block></td>\n - </tr>\n - </tal:block>\n + <tal:block repeat="group python: details[\'groups\']">\n + <tal:block condition="python: group[\'id\'] not in [GROSS_SALARY_GROUP_ID, ADDENDUM_GROUP_ID]"\n + repeat="line python: group[\'sublines\']">\n + <tr tal:condition="python: line[\'taxable\'] == True" stylecmd="(\'LEFTPADDING\',8)">\n + <td><tal:block content="python: \' \' + line[\'service_title\']"/> </td>\n + <td><tal:block content="python: line[\'salary_range_title\']"/> </td>\n + <td><tal:block content="python: line[\'base\']"\n + condition="python: line[\'base\'] != None"/> </td>\n + <td><tal:block content="python: line[\'employer_rate\']"\n + condition="python: line[\'employer_rate\'] != None"/> </td>\n + <td><tal:block content="python: line[\'employer_share\']"\n + condition="python: line[\'employer_share\'] != None"/> </td>\n + <td><tal:block content="python: line[\'employee_rate\']"\n + condition="python: line[\'employee_rate\'] != None"/> </td>\n + <td><tal:block content="python: line[\'employee_share\']"\n + condition="python: line[\'employee_share\'] != None"/> </td>\n + </tr>\n </tal:block>\n </tal:block>\n --->\n +\n <tr tal:attributes="stylecmd boldstyle">\n <td>Salaire Net</td>\n <td> </td>\n diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index f8d82e0adf1bf95ad13b5ca8cd5b861a8e42824b..c2eb120e2b2a467b9d8030cc8708f93929a34b10 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,5 +1,7 @@ 2006-10-26 Kevin +* Calculate taxable grand total on printing. * Fix french employer rate. +* Fix some UI and fields name. * Print total payment on PDF. * Format PDF values according currency. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 2702ba3d439a353c3f748180065944feb28b8b87..1bda760653e918fc4fca9a02b046236b0aa02843 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -115 \ No newline at end of file +117 \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/version b/bt5/erp5_payroll/bt/version index 967b33ffb25bbfdfce6fc81f85cfba13a751d089..08456a479f92c0a26f1024a2b1615afd38676962 100644 --- a/bt5/erp5_payroll/bt/version +++ b/bt5/erp5_payroll/bt/version @@ -1 +1 @@ -0.2.7 \ No newline at end of file +0.2.8 \ No newline at end of file