[Erp5-report] r10918 - in /erp5/trunk/bt5/erp5_payroll: PathTemplateItem/payroll_service_mo...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Oct 24 18:34:21 CEST 2006
Author: kevin
Date: Tue Oct 24 18:34:19 2006
New Revision: 10918
URL: http://svn.erp5.org?rev=10918&view=rev
Log:
Support addendum on paysheets.
Added:
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum/
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum/employee_share.xml
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml?rev=10918&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml Tue Oct 24 18:34:19 2006
@@ -1,0 +1,171 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ERP5Type.Document.Resource</string>
+ <string>Resource</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_Access_contents_information_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_Modify_portal_content_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_View_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>salary_range/france/fixed/addendum</string>
+ <string>quantity_unit/time/month</string>
+ <string>tax_category/addendum/employee_share</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>acompte</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Service</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Acompte</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>variation_base_category_list</string> </key>
+ <value>
+ <tuple>
+ <string>tax_category</string>
+ <string>salary_range</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml?rev=10918&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml Tue Oct 24 18:34:19 2006
@@ -1,0 +1,171 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ERP5Type.Document.Resource</string>
+ <string>Resource</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_Access_contents_information_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_Modify_portal_content_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_View_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>quantity_unit/time/month</string>
+ <string>salary_range/france/fixed/addendum</string>
+ <string>tax_category/addendum/employee_share</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>frais_deplacement</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Service</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Frais de D\xc3\xa9placement</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>variation_base_category_list</string> </key>
+ <value>
+ <tuple>
+ <string>tax_category</string>
+ <string>salary_range</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml?rev=10918&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml Tue Oct 24 18:34:19 2006
@@ -1,0 +1,171 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ERP5Type.Document.Resource</string>
+ <string>Resource</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_Access_contents_information_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_Modify_portal_content_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_View_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Author</string>
+ <string>Manager</string>
+ <string>Owner</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>quantity_unit/time/month</string>
+ <string>salary_range/france/fixed/addendum</string>
+ <string>tax_category/addendum/employee_share</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>remboursement_loyer</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Service</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Remboursement Loyer</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>variation_base_category_list</string> </key>
+ <value>
+ <tuple>
+ <string>tax_category</string>
+ <string>salary_range</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum.xml?rev=10918&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum.xml Tue Oct 24 18:34:19 2006
@@ -1,0 +1,124 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ERP5Type.Document.Category</string>
+ <string>Category</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>tax_category/addendum</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>addendum</string> </value>
+ </item>
+ <item>
+ <key> <string>last_id</string> </key>
+ <value> <string>1</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Addendum</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum/employee_share.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum/employee_share.xml?rev=10918&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum/employee_share.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/addendum/employee_share.xml Tue Oct 24 18:34:19 2006
@@ -1,0 +1,114 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.ERP5Type.Document.Category</string>
+ <string>Category</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>tax_category/addendum/employee_share</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>employee_share</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Employee Share</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml?rev=10918&r1=10917&r2=10918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml Tue Oct 24 18:34:19 2006
@@ -209,8 +209,9 @@
, "base" : -base\n
, "rate" : share\n
}\n
- # Update the total employee share\n
- total_employee_share = r_(total_employee_share + r_(base * float(share)))\n
+ # Update the total employee share but ignore addendum\n
+ if not salary_range.endswith(\'/fixed/addendum\'):\n
+ total_employee_share = r_(total_employee_share + r_(base * float(share)))\n
# Add the cell to the conresponding paysheet item\n
if new_cell != None:\n
paysheet_items[service_id][\'cells\'].append(new_cell)\n
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml?rev=10918&r1=10917&r2=10918&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml Tue Oct 24 18:34:19 2006
@@ -512,6 +512,21 @@
, \'base\' : 1.0\n
}\n
kw[\'precarite/gross\'] = \\\n
+{ \'employer_share\': None\n
+, \'employee_share\': None\n
+, \'base\' : 1.0\n
+}\n
+kw[\'acompte/addendum\'] = \\\n
+{ \'employer_share\': None\n
+, \'employee_share\': None\n
+, \'base\' : 1.0\n
+}\n
+kw[\'remboursement_loyer/addendum\'] = \\\n
+{ \'employer_share\': None\n
+, \'employee_share\': None\n
+, \'base\' : 1.0\n
+}\n
+kw[\'frais_deplacement/addendum\'] = \\\n
{ \'employer_share\': None\n
, \'employee_share\': None\n
, \'base\' : 1.0\n
More information about the Erp5-report
mailing list