From a056536aec3278c8a81d7a0bb48a90db534e9d15 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@nexedi.com>
Date: Thu, 26 Oct 2006 11:20:42 +0000
Subject: [PATCH] Show taxable net salary details on paysheet PDF.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10958 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...ansaction_viewPaySheetTransactionAsPDF.xml | 34 ++++++++++---------
bt5/erp5_payroll/bt/change_log | 2 ++
bt5/erp5_payroll/bt/revision | 2 +-
bt5/erp5_payroll/bt/version | 2 +-
4 files changed, 22 insertions(+), 18 deletions(-)
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 1845123970..5f78d691cc 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 f8d82e0adf..c2eb120e2b 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 2702ba3d43..1bda760653 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 967b33ffb2..08456a479f 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
--
2.30.9