From 22bded3993cef9ef489be0d33315dbef98074dcf Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Wed, 18 Oct 2006 13:34:10 +0000 Subject: [PATCH] Add new service. Fix some services categories. Fix payroll report dialog git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10811 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../payroll_service_module/iccp.xml | 180 +++++++++++++++++ .../indemnite_precarite.xml | 182 ++++++++++++++++++ .../payroll_service_module/primes.xml | 4 +- .../retenue_maladie.xml | 4 +- .../tax_category/absences.xml | 12 ++ .../employee_share.xml} | 8 +- .../portal_categories/tax_category/iccp.xml | 136 +++++++++++++ .../employer_share.xml | 4 +- .../tax_category/indemnite_precarite.xml | 124 ++++++++++++ .../employee_share.xml} | 6 +- .../tax_category/primes/employee_share.xml | 128 ++++++++++++ .../retenue_maladie/employee_share.xml | 127 ++++++++++++ ...nsactionModule_viewPayrollReportDialog.xml | 23 +-- .../PaySheetTransaction_getDetails.xml | 2 +- bt5/erp5_payroll/bt/change_log | 3 + bt5/erp5_payroll/bt/template_path_list | 2 + 16 files changed, 909 insertions(+), 36 deletions(-) create mode 100644 bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/payroll_service_module/indemnite_precarite.xml rename bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/{primes/employer_share.xml => absences/employee_share.xml} (91%) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/iccp.xml rename bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/{retenue_maladie => iccp}/employer_share.xml (95%) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite.xml rename bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/{absences/employer_share.xml => indemnite_precarite/employee_share.xml} (93%) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/primes/employee_share.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/retenue_maladie/employee_share.xml diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml new file mode 100644 index 0000000000..5c6fa96deb --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/iccp.xml @@ -0,0 +1,180 @@ +<?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/forfait</string> + <string>product_line/salary</string> + <string>quantity_unit/time/month</string> + <string>tax_category/iccp/employer_share</string> + </tuple> + </value> + </item> + <item> + <key> <string>contributors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string encoding="base64">SW5kZW1uaXTDqXMgQ29tcGVuc2F0b2lyZXMgZGUgQ29uZ8OpcyBQYXnDqXMu</string> </value> + </item> + <item> + <key> <string>float_index</string> </key> + <value> <float>0.1</float> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>iccp</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Service</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>ICCP</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> diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/indemnite_precarite.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/indemnite_precarite.xml new file mode 100644 index 0000000000..720f085d6e --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/indemnite_precarite.xml @@ -0,0 +1,182 @@ +<?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/forfait</string> + <string>product_line/salary</string> + <string>quantity_unit/time/month</string> + <string>tax_category/indemnite_precarite/employee_share</string> + </tuple> + </value> + </item> + <item> + <key> <string>contributors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>float_index</string> </key> + <value> <float>0.1</float> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>indemnite_precarite</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Service</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string encoding="base64">SW5kZW1uaXTDqXMgZGUgUHLDqWNhcml0w6k=</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> diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml index b720d23e91..aea356f901 100644 --- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml @@ -86,10 +86,10 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>tax_category/primes/employer_share</string> + <string>salary_range/france/forfait</string> + <string>tax_category/primes/employee_share</string> <string>product_line/salary</string> <string>quantity_unit/time/month</string> - <string>salary_range/france/forfait</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml index 22017646d1..54828f6cd1 100644 --- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/retenue_maladie.xml @@ -86,10 +86,10 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>tax_category/retenue_maladie/employer_share</string> + <string>salary_range/france/forfait</string> + <string>tax_category/retenue_maladie/employee_share</string> <string>product_line/salary</string> <string>quantity_unit/time/month</string> - <string>salary_range/france/forfait</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences.xml index 8340648542..f047a24370 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences.xml @@ -50,6 +50,12 @@ </tuple> </value> </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>description</string> </key> <value> @@ -60,6 +66,12 @@ <key> <string>id</string> </key> <value> <string>absences</string> </value> </item> + <item> + <key> <string>int_index</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>1</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/primes/employer_share.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences/employee_share.xml similarity index 91% rename from bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/primes/employer_share.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences/employee_share.xml index 561524ea8c..04e7ec5e0b 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/primes/employer_share.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences/employee_share.xml @@ -40,8 +40,8 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>tax_category/primes/employer_share</string> - <string>tax_category/primes/employer_share</string> + <string>tax_category/absences/employee_share</string> + <string>tax_category/absences/employee_share</string> </tuple> </value> </item> @@ -59,7 +59,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>employer_share</string> </value> + <value> <string>employee_share</string> </value> </item> <item> <key> <string>int_index</string> </key> @@ -73,7 +73,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Employer Share</string> </value> + <value> <string>Employee Share</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/iccp.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/iccp.xml new file mode 100644 index 0000000000..ae5616e588 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/iccp.xml @@ -0,0 +1,136 @@ +<?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/iccp</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>iccp</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> + <none/> + </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>ICCP</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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/retenue_maladie/employer_share.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/iccp/employer_share.xml similarity index 95% rename from bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/retenue_maladie/employer_share.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/iccp/employer_share.xml index 3337683f97..43c1d31d87 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/retenue_maladie/employer_share.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/iccp/employer_share.xml @@ -40,7 +40,7 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>tax_category/retenue_maladie/employer_share</string> + <string>tax_category/iccp/employer_share</string> </tuple> </value> </item> @@ -72,7 +72,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Employer Share</string> </value> + <value> <string>Employee Share</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite.xml new file mode 100644 index 0000000000..b320e137f5 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite.xml @@ -0,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/indemnite_precarite</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>indemnite_precarite</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 encoding="base64">SW5kZW1uaXTDqXMgZGUgUHLDqWNhcml0w6k=</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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences/employer_share.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite/employee_share.xml similarity index 93% rename from bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences/employer_share.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite/employee_share.xml index ba48001fdc..5e60a7d633 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences/employer_share.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite/employee_share.xml @@ -40,7 +40,7 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>tax_category/absences/employer_share</string> + <string>tax_category/indemnite_precarite/employee_share</string> </tuple> </value> </item> @@ -52,7 +52,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>employer_share</string> </value> + <value> <string>employee_share</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -60,7 +60,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Employer Share</string> </value> + <value> <string>Employee Share</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/primes/employee_share.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/primes/employee_share.xml new file mode 100644 index 0000000000..c45404d541 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/primes/employee_share.xml @@ -0,0 +1,128 @@ +<?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/primes/employee_share</string> + <string>tax_category/primes/employee_share</string> + <string>tax_category/primes/employee_share</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </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>int_index</string> </key> + <value> + <none/> + </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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/retenue_maladie/employee_share.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/retenue_maladie/employee_share.xml new file mode 100644 index 0000000000..578187f769 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/retenue_maladie/employee_share.xml @@ -0,0 +1,127 @@ +<?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/retenue_maladie/employee_share</string> + <string>tax_category/retenue_maladie/employee_share</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </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>int_index</string> </key> + <value> + <none/> + </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> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml index 0cfecf7a68..62a6632df8 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml @@ -61,10 +61,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> <string>left</string> - <string>bottom</string> - <string>diabled</string> </list> </value> </item> @@ -73,7 +70,7 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>left</string> </key> <value> <list> <string>my_report_year</string> @@ -81,24 +78,6 @@ </list> </value> </item> - <item> - <key> <string>bottom</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>diabled</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>left</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml index 4218d354a1..502517aa7e 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml @@ -177,7 +177,7 @@ for pay_sheet_line in object_list:\n cell_price = cell.getPrice()\n cell_quantity = cell.getQuantity()\n cell_total_price = r_(cell_price * cell_quantity)\n - # Hack not to display prime and ser\n + # Hack to not display things added to the gross salary\n if cell_total_price != 0 or cell.getResourceId() not in (\'primes\', \'retenue_maladie\'):\n if category.find(\'employee_share\') >= 0:\n pay_sheet_dict[\'base\'] = -cell_quantity # change the sign to beautify\n diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index ef5aaac71a..770c2d9922 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,3 +1,6 @@ +2006-10-18 Kevin +* Add new french payroll services. + 2006-10-17 Kevin * Add Pay Sheet Transaction as default sub type in Accounting Module. * Use new InvoiceTransaction_something scripts instead of SaleInvoiceTransaction_something. diff --git a/bt5/erp5_payroll/bt/template_path_list b/bt5/erp5_payroll/bt/template_path_list index ced04d65c2..103844f009 100644 --- a/bt5/erp5_payroll/bt/template_path_list +++ b/bt5/erp5_payroll/bt/template_path_list @@ -23,6 +23,8 @@ payroll_service_module/csg_deductible payroll_service_module/csg_non_deductible payroll_service_module/family_benefits payroll_service_module/fngs +payroll_service_module/iccp +payroll_service_module/indemnite_precarite payroll_service_module/industrial_accident payroll_service_module/labour payroll_service_module/life_insurance -- 2.30.9