From 44ef42d9a06cdf2bcf10dd3b620220b53fb30089 Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Thu, 26 Oct 2006 16:28:25 +0000 Subject: [PATCH] Accounting of paysheets addendum git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10968 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../payroll_service_module/acompte.xml | 2 +- ...eplacement.xml => remboursement_frais.xml} | 6 +- .../remboursement_loyer.xml | 2 +- .../product_line/addendum.xml | 124 ++++++++ .../product_line/addendum/acompte.xml} | 22 +- .../addendum/remboursement_frais.xml | 114 +++++++ .../addendum/remboursement_loyer.xml | 114 +++++++ .../default_pay_sheet_transaction_rule.xml | 14 +- .../default_pay_sheet_transaction_rule/6.xml | 160 ++++++++++ .../default_pay_sheet_transaction_rule/7.xml | 160 ++++++++++ .../default_pay_sheet_transaction_rule/8.xml | 160 ++++++++++ .../movement_0_0.xml | 4 + .../movement_0_1.xml | 4 + .../movement_0_2.xml | 10 + .../movement_0_3.xml | 4 + .../movement_0_4.xml | 4 + .../movement_0_5.xml | 124 +------- .../movement_0_6.xml | 171 ++++++++++ .../movement_0_7.xml | 171 ++++++++++ .../movement_0_8.xml | 301 ++++++++++++++++++ .../expense.xml | 0 .../movement_1_0.xml | 4 + .../movement_1_1.xml | 4 + .../movement_1_2.xml | 4 + .../movement_1_3.xml | 4 + .../movement_1_4.xml | 4 + .../movement_1_5.xml | 42 +-- .../payable.xml => movement_1_5/1.xml} | 4 +- .../movement_1_5/expense.xml | 113 ------- .../expense.xml => movement_1_5/income.xml} | 6 +- .../movement_1_6.xml | 297 +++++++++++++++++ .../expense.xml => movement_1_6/1.xml} | 7 +- .../movement_1_6/payable.xml | 113 +++++++ .../movement_1_7.xml | 297 +++++++++++++++++ .../movement_1_7/1.xml | 113 +++++++ .../expense.xml => movement_1_7/payable.xml} | 6 +- .../movement_1_8.xml | 295 +++++++++++++++++ .../payable.xml | 0 .../PaySheetTransaction_getDetails.xml | 10 + ...ransaction_preCalculation_l10n_fr_2006.xml | 2 +- bt5/erp5_payroll/bt/change_log | 1 + bt5/erp5_payroll/bt/revision | 2 +- bt5/erp5_payroll/bt/template_path_list | 2 + bt5/erp5_payroll/bt/version | 2 +- 44 files changed, 2720 insertions(+), 283 deletions(-) rename bt5/erp5_payroll/PathTemplateItem/payroll_service_module/{frais_deplacement.xml => remboursement_frais.xml} (95%) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum.xml rename bt5/erp5_payroll/PathTemplateItem/{portal_rules/default_pay_sheet_transaction_rule/movement_1_2/expense.xml => portal_categories/product_line/addendum/acompte.xml} (83%) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/remboursement_frais.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/remboursement_loyer.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/6.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/7.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/8.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_6.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8.xml rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_0_5 => movement_0_8}/expense.xml (100%) rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_0_5/payable.xml => movement_1_5/1.xml} (96%) delete mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/expense.xml rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_1_3/expense.xml => movement_1_5/income.xml} (94%) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6.xml rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_1_1/expense.xml => movement_1_6/1.xml} (91%) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/payable.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/1.xml rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_1_4/expense.xml => movement_1_7/payable.xml} (93%) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8.xml rename bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/{movement_1_5 => movement_1_8}/payable.xml (100%) diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml index eb33cdc73d..7a40967672 100644 --- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/acompte.xml @@ -83,7 +83,7 @@ <string>salary_range/france/fixed/addendum</string> <string>tax_category/addendum/employee_share</string> <string>quantity_unit/time/month</string> - <string>product_line/salary</string> + <string>product_line/addendum/acompte</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_frais.xml similarity index 95% rename from bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml rename to bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_frais.xml index f1cb445377..7ac57f4523 100644 --- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/frais_deplacement.xml +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_frais.xml @@ -83,7 +83,7 @@ <string>salary_range/france/fixed/addendum</string> <string>tax_category/addendum/employee_share</string> <string>quantity_unit/time/month</string> - <string>product_line/salary</string> + <string>product_line/addendum/remboursement_frais</string> </tuple> </value> </item> @@ -95,7 +95,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>frais_deplacement</string> </value> + <value> <string>remboursement_frais</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -103,7 +103,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Frais de D\xc3\xa9placement</string> </value> + <value> <string>Remboursement de Frais</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml index bbfe09b3ee..a048f95a6a 100644 --- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/remboursement_loyer.xml @@ -83,7 +83,7 @@ <string>salary_range/france/fixed/addendum</string> <string>tax_category/addendum/employee_share</string> <string>quantity_unit/time/month</string> - <string>product_line/salary</string> + <string>product_line/addendum/remboursement_loyer</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum.xml new file mode 100644 index 0000000000..d8af47eaa3 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum.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>product_line/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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_2/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/acompte.xml similarity index 83% rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_2/expense.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/acompte.xml index 352f748ef5..4044544867 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_2/expense.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/acompte.xml @@ -4,8 +4,8 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.Document.AccountingTransactionLine</string> - <string>AccountingTransactionLine</string> + <string>Products.ERP5Type.Document.Category</string> + <string>Category</string> </tuple> <none/> </tuple> @@ -40,25 +40,27 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>source/account_module/cotisations_assedic</string> + <string>product_line/addendum/acompte</string> </tuple> </value> </item> <item> - <key> <string>id</string> </key> - <value> <string>expense</string> </value> + <key> <string>description</string> </key> + <value> + <none/> + </value> </item> <item> - <key> <string>portal_type</string> </key> - <value> <string>Accounting Transaction Line</string> </value> + <key> <string>id</string> </key> + <value> <string>acompte</string> </value> </item> <item> - <key> <string>quantity</string> </key> - <value> <float>0.0</float> </value> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <string>Acompte</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/remboursement_frais.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/remboursement_frais.xml new file mode 100644 index 0000000000..be3d3eb21b --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/remboursement_frais.xml @@ -0,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>product_line/addendum/remboursement_frais</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>remboursement_frais</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Remboursement Frais</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/product_line/addendum/remboursement_loyer.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/remboursement_loyer.xml new file mode 100644 index 0000000000..6f980df7cd --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/addendum/remboursement_loyer.xml @@ -0,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>product_line/addendum/remboursement_loyer</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>Category</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> + </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_rules/default_pay_sheet_transaction_rule.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule.xml index 456992fed3..83aa5ba2b8 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule.xml @@ -54,7 +54,7 @@ </item> <item> <key> <string>last_id</string> </key> - <value> <string>6</string> </value> + <value> <string>8</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -313,8 +313,20 @@ </item> <item> <key> <string>portal_rules/default_pay_sheet_transaction_rule/5</string> </key> + <value> <int>8</int> </value> + </item> + <item> + <key> <string>portal_rules/default_pay_sheet_transaction_rule/6</string> </key> + <value> <int>7</int> </value> + </item> + <item> + <key> <string>portal_rules/default_pay_sheet_transaction_rule/7</string> </key> <value> <int>5</int> </value> </item> + <item> + <key> <string>portal_rules/default_pay_sheet_transaction_rule/8</string> </key> + <value> <int>6</int> </value> + </item> <item> <key> <string>portal_rules/default_pay_sheet_transaction_rule/copy2_of_4</string> </key> <value> <int>3</int> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/6.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/6.xml new file mode 100644 index 0000000000..0d87345162 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/6.xml @@ -0,0 +1,160 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Predicate</string> + <string>Predicate</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>6</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>product_line/addendum/acompte</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Predicate</string> </value> + </item> + <item> + <key> <string>string_index</string> </key> + <value> <string>product</string> </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Acompte</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_rules/default_pay_sheet_transaction_rule/7.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/7.xml new file mode 100644 index 0000000000..89fc12f42e --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/7.xml @@ -0,0 +1,160 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Predicate</string> + <string>Predicate</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>7</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>product_line/addendum/remboursement_loyer</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Predicate</string> </value> + </item> + <item> + <key> <string>string_index</string> </key> + <value> <string>product</string> </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Loyer</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_rules/default_pay_sheet_transaction_rule/8.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/8.xml new file mode 100644 index 0000000000..11c666836d --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/8.xml @@ -0,0 +1,160 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Predicate</string> + <string>Predicate</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>8</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>product_line/addendum/remboursement_frais</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Predicate</string> </value> + </item> + <item> + <key> <string>string_index</string> </key> + <value> <string>product</string> </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Frais</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_rules/default_pay_sheet_transaction_rule/movement_0_0.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_0.xml index 6af8ce92b9..2ff8eff615 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_0.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_0.xml @@ -79,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_0_0</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_1.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_1.xml index fc982fc7c8..7a0365e8f7 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_1.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_1.xml @@ -79,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_0_1</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_2.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_2.xml index 40b6ebd454..4e9217846a 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_2.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_2.xml @@ -36,6 +36,12 @@ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>_range_criterion</string> </key> <value> @@ -73,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_0_2</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_3.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_3.xml index b9a9d60fd1..a610cb7222 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_3.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_3.xml @@ -79,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_0_3</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml index 5d9d36c41f..eaa2069a07 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_4.xml @@ -79,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_0_4</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml index c63e4b44d6..77558752b0 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5.xml @@ -54,35 +54,16 @@ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>resource/currency_module/EUR</string> - <string>source_section/organisation_module/nexedi</string> - </tuple> - </value> - </item> <item> <key> <string>criterion_property</string> </key> <value> <tuple/> </value> </item> - <item> - <key> <string>description</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>movement_0_5</string> </value> </item> - <item> - <key> <string>last_id</string> </key> - <value> <string>2</string> </value> - </item> <item> <key> <string>mapped_value_property_list</string> </key> <value> @@ -114,7 +95,7 @@ <string>tax_category/syntec_insurance/employer_share</string> <string>tax_category/taxes/employer_share</string> <string>tax_category/unemployment/employer_share</string> - <string>product_line/salary</string> + <string>product_line/addendum/remboursement_loyer</string> </tuple> </value> </item> @@ -128,107 +109,6 @@ <key> <string>portal_type</string> </key> <value> <string>Accounting Rule Cell</string> </value> </item> - <item> - <key> <string>start_date</string> </key> - <value> - <object> - <klass> - <global name="DateTime" module="DateTime.DateTime"/> - </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Wed</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Apr</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38451.9166667</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>12</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Wednesday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>April</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1144792800000</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>0.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Wed.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>12</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>Apr.</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>0.0</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1144792800.0</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT+2</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2006</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.916666666664</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> <item> <key> <string>test_method_id</string> </key> <value> @@ -237,7 +117,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Employer Share * Salary</string> </value> + <value> <string>Employer Share * Loyer</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_6.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_6.xml new file mode 100644 index 0000000000..ed939b3fdb --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_6.xml @@ -0,0 +1,171 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.AccountingRuleCell</string> + <string>AccountingRuleCell</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>movement_0_6</string> </value> + </item> + <item> + <key> <string>mapped_value_property_list</string> </key> + <value> + <tuple> + <string>title</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>tax_category</string> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>tax_category/ags/employer_share</string> + <string>tax_category/apec/employer_share</string> + <string>tax_category/argic/employer_share</string> + <string>tax_category/gross/employer_share</string> + <string>tax_category/life_insurance/employer_share</string> + <string>tax_category/social/employer_share</string> + <string>tax_category/supplementary_pension/employer_share</string> + <string>tax_category/syntec_insurance/employer_share</string> + <string>tax_category/taxes/employer_share</string> + <string>tax_category/unemployment/employer_share</string> + <string>product_line/addendum/remboursement_frais</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Accounting Rule Cell</string> </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Employer Share * Frais</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_rules/default_pay_sheet_transaction_rule/movement_0_7.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7.xml new file mode 100644 index 0000000000..161219a89f --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_7.xml @@ -0,0 +1,171 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.AccountingRuleCell</string> + <string>AccountingRuleCell</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>movement_0_7</string> </value> + </item> + <item> + <key> <string>mapped_value_property_list</string> </key> + <value> + <tuple> + <string>title</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>tax_category</string> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>tax_category/ags/employer_share</string> + <string>tax_category/apec/employer_share</string> + <string>tax_category/argic/employer_share</string> + <string>tax_category/gross/employer_share</string> + <string>tax_category/life_insurance/employer_share</string> + <string>tax_category/social/employer_share</string> + <string>tax_category/supplementary_pension/employer_share</string> + <string>tax_category/syntec_insurance/employer_share</string> + <string>tax_category/taxes/employer_share</string> + <string>tax_category/unemployment/employer_share</string> + <string>product_line/addendum/acompte</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Accounting Rule Cell</string> </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Employer Share * Acompte</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_rules/default_pay_sheet_transaction_rule/movement_0_8.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8.xml new file mode 100644 index 0000000000..3a7688cc1c --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8.xml @@ -0,0 +1,301 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.AccountingRuleCell</string> + <string>AccountingRuleCell</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </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>resource/currency_module/EUR</string> + <string>source_section/organisation_module/nexedi</string> + </tuple> + </value> + </item> + <item> + <key> <string>contributors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>movement_0_8</string> </value> + </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>2</string> </value> + </item> + <item> + <key> <string>mapped_value_property_list</string> </key> + <value> + <tuple> + <string>title</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>tax_category</string> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>tax_category/ags/employer_share</string> + <string>tax_category/apec/employer_share</string> + <string>tax_category/argic/employer_share</string> + <string>tax_category/gross/employer_share</string> + <string>tax_category/life_insurance/employer_share</string> + <string>tax_category/social/employer_share</string> + <string>tax_category/supplementary_pension/employer_share</string> + <string>tax_category/syntec_insurance/employer_share</string> + <string>tax_category/taxes/employer_share</string> + <string>tax_category/unemployment/employer_share</string> + <string>product_line/salary</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Accounting Rule Cell</string> </value> + </item> + <item> + <key> <string>start_date</string> </key> + <value> + <object> + <klass> + <global name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <dictionary> + <item> + <key> <string>_aday</string> </key> + <value> <string>Wed</string> </value> + </item> + <item> + <key> <string>_amon</string> </key> + <value> <string>Apr</string> </value> + </item> + <item> + <key> <string>_d</string> </key> + <value> <float>38451.9166667</float> </value> + </item> + <item> + <key> <string>_day</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_dayoffset</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_fday</string> </key> + <value> <string>Wednesday</string> </value> + </item> + <item> + <key> <string>_fmon</string> </key> + <value> <string>April</string> </value> + </item> + <item> + <key> <string>_hour</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_millis</string> </key> + <value> <long>1144792800000</long> </value> + </item> + <item> + <key> <string>_minute</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_month</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>_nearsec</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_pday</string> </key> + <value> <string>Wed.</string> </value> + </item> + <item> + <key> <string>_pm</string> </key> + <value> <string>am</string> </value> + </item> + <item> + <key> <string>_pmhour</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_pmon</string> </key> + <value> <string>Apr.</string> </value> + </item> + <item> + <key> <string>_second</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_t</string> </key> + <value> <float>1144792800.0</float> </value> + </item> + <item> + <key> <string>_tz</string> </key> + <value> <string>GMT+2</string> </value> + </item> + <item> + <key> <string>_year</string> </key> + <value> <int>2006</int> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> <float>0.916666666664</float> </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Employer Share * Salary</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_rules/default_pay_sheet_transaction_rule/movement_0_5/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8/expense.xml similarity index 100% rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5/expense.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8/expense.xml diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_0.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_0.xml index e3b1ae9612..f00be1c01a 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_0.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_0.xml @@ -64,6 +64,10 @@ <key> <string>id</string> </key> <value> <string>movement_1_0</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>mapped_value_property_list</string> </key> <value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_1.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_1.xml index fe0d55c7e7..fce12e7d7b 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_1.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_1.xml @@ -79,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_1_1</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_2.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_2.xml index 2480d9d15c..54692539b2 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_2.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_2.xml @@ -79,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_1_2</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_3.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_3.xml index 85fa0848cb..2ad90aa58f 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_3.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_3.xml @@ -79,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_1_3</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml index f80ce9e4e3..e4785d0d33 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4.xml @@ -79,6 +79,10 @@ <key> <string>id</string> </key> <value> <string>movement_1_4</string> </value> </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>last_id</string> </key> <value> <string>2</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml index af86e43d14..8a1cf2b2c6 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5.xml @@ -58,11 +58,17 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>resource/currency_module/EUR</string> + <string>resource/currency_module/eur</string> <string>source_section/organisation_module/nexedi</string> </tuple> </value> </item> + <item> + <key> <string>contributors</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>criterion_property</string> </key> <value> @@ -81,7 +87,7 @@ </item> <item> <key> <string>last_id</string> </key> - <value> <string>2</string> </value> + <value> <string>1</string> </value> </item> <item> <key> <string>mapped_value_property_list</string> </key> @@ -114,7 +120,7 @@ <string>tax_category/supplementary_pension/employee_share</string> <string>tax_category/syntec_insurance/employee_share</string> <string>tax_category/unemployment/employee_share</string> - <string>product_line/salary</string> + <string>product_line/addendum/remboursement_loyer</string> </tuple> </value> </item> @@ -142,31 +148,31 @@ <dictionary> <item> <key> <string>_aday</string> </key> - <value> <string>Wed</string> </value> + <value> <string>Thu</string> </value> </item> <item> <key> <string>_amon</string> </key> - <value> <string>Apr</string> </value> + <value> <string>Oct</string> </value> </item> <item> <key> <string>_d</string> </key> - <value> <float>38451.9166667</float> </value> + <value> <float>38649.1666667</float> </value> </item> <item> <key> <string>_day</string> </key> - <value> <int>12</int> </value> + <value> <int>26</int> </value> </item> <item> <key> <string>_dayoffset</string> </key> - <value> <int>3</int> </value> + <value> <int>4</int> </value> </item> <item> <key> <string>_fday</string> </key> - <value> <string>Wednesday</string> </value> + <value> <string>Thursday</string> </value> </item> <item> <key> <string>_fmon</string> </key> - <value> <string>April</string> </value> + <value> <string>October</string> </value> </item> <item> <key> <string>_hour</string> </key> @@ -174,7 +180,7 @@ </item> <item> <key> <string>_millis</string> </key> - <value> <long>1144792800000</long> </value> + <value> <long>1161835200000</long> </value> </item> <item> <key> <string>_minute</string> </key> @@ -182,7 +188,7 @@ </item> <item> <key> <string>_month</string> </key> - <value> <int>4</int> </value> + <value> <int>10</int> </value> </item> <item> <key> <string>_nearsec</string> </key> @@ -190,7 +196,7 @@ </item> <item> <key> <string>_pday</string> </key> - <value> <string>Wed.</string> </value> + <value> <string>Thu.</string> </value> </item> <item> <key> <string>_pm</string> </key> @@ -202,7 +208,7 @@ </item> <item> <key> <string>_pmon</string> </key> - <value> <string>Apr.</string> </value> + <value> <string>Oct.</string> </value> </item> <item> <key> <string>_second</string> </key> @@ -210,11 +216,11 @@ </item> <item> <key> <string>_t</string> </key> - <value> <float>1144792800.0</float> </value> + <value> <float>1161835200.0</float> </value> </item> <item> <key> <string>_tz</string> </key> - <value> <string>GMT+2</string> </value> + <value> <string>GMT-4</string> </value> </item> <item> <key> <string>_year</string> </key> @@ -222,7 +228,7 @@ </item> <item> <key> <string>time</string> </key> - <value> <float>0.916666666664</float> </value> + <value> <float>0.166666666664</float> </value> </item> </dictionary> </state> @@ -237,7 +243,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Employee Share * Salary</string> </value> + <value> <string>Employee Share * Loyer</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/1.xml similarity index 96% rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5/payable.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/1.xml index 4396eea8c2..f8f9794e8a 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_5/payable.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/1.xml @@ -47,7 +47,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>payable</string> </value> + <value> <string>1</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -55,7 +55,7 @@ </item> <item> <key> <string>quantity</string> </key> - <value> <float>0.0</float> </value> + <value> <float>-1.0</float> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/expense.xml deleted file mode 100644 index 5237d8e9b0..0000000000 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/expense.xml +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Type.Document.AccountingTransactionLine</string> - <string>AccountingTransactionLine</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>source/account_module/remuneration_personnel</string> - <string>destination/account_module/prestation_service</string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>expense</string> </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Accounting Transaction Line</string> </value> - </item> - <item> - <key> <string>quantity</string> </key> - <value> <float>0.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></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_rules/default_pay_sheet_transaction_rule/movement_1_3/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/income.xml similarity index 94% rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_3/expense.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/income.xml index c92ca6f523..d26ab1616e 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_3/expense.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/income.xml @@ -40,13 +40,13 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>source/account_module/mutuelle</string> + <string>source/account_module/61</string> </tuple> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>expense</string> </value> + <value> <string>income</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -54,7 +54,7 @@ </item> <item> <key> <string>quantity</string> </key> - <value> <float>0.0</float> </value> + <value> <float>1.0</float> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6.xml new file mode 100644 index 0000000000..80c03dae41 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6.xml @@ -0,0 +1,297 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.AccountingRuleCell</string> + <string>AccountingRuleCell</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </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>resource/currency_module/eur</string> + <string>source_section/organisation_module/nexedi</string> + </tuple> + </value> + </item> + <item> + <key> <string>contributors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>movement_1_6</string> </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>1</string> </value> + </item> + <item> + <key> <string>mapped_value_property_list</string> </key> + <value> + <tuple> + <string>title</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>tax_category</string> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>tax_category/addendum/employee_share</string> + <string>tax_category/apec/employee_share</string> + <string>tax_category/argic/employee_share</string> + <string>tax_category/crds/employee_share</string> + <string>tax_category/csg/employee_share</string> + <string>tax_category/gross/employee_share</string> + <string>tax_category/social/employee_share</string> + <string>tax_category/supplementary_pension/employee_share</string> + <string>tax_category/syntec_insurance/employee_share</string> + <string>tax_category/unemployment/employee_share</string> + <string>product_line/addendum/remboursement_frais</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Accounting Rule Cell</string> </value> + </item> + <item> + <key> <string>start_date</string> </key> + <value> + <object> + <klass> + <global name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <dictionary> + <item> + <key> <string>_aday</string> </key> + <value> <string>Thu</string> </value> + </item> + <item> + <key> <string>_amon</string> </key> + <value> <string>Oct</string> </value> + </item> + <item> + <key> <string>_d</string> </key> + <value> <float>38649.1666667</float> </value> + </item> + <item> + <key> <string>_day</string> </key> + <value> <int>26</int> </value> + </item> + <item> + <key> <string>_dayoffset</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>_fday</string> </key> + <value> <string>Thursday</string> </value> + </item> + <item> + <key> <string>_fmon</string> </key> + <value> <string>October</string> </value> + </item> + <item> + <key> <string>_hour</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_millis</string> </key> + <value> <long>1161835200000</long> </value> + </item> + <item> + <key> <string>_minute</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_month</string> </key> + <value> <int>10</int> </value> + </item> + <item> + <key> <string>_nearsec</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_pday</string> </key> + <value> <string>Thu.</string> </value> + </item> + <item> + <key> <string>_pm</string> </key> + <value> <string>am</string> </value> + </item> + <item> + <key> <string>_pmhour</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_pmon</string> </key> + <value> <string>Oct.</string> </value> + </item> + <item> + <key> <string>_second</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_t</string> </key> + <value> <float>1161835200.0</float> </value> + </item> + <item> + <key> <string>_tz</string> </key> + <value> <string>GMT-4</string> </value> + </item> + <item> + <key> <string>_year</string> </key> + <value> <int>2006</int> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> <float>0.166666666664</float> </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Employee Share * Frais</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_rules/default_pay_sheet_transaction_rule/movement_1_1/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/1.xml similarity index 91% rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_1/expense.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/1.xml index 2097512214..f8f9794e8a 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_1/expense.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/1.xml @@ -40,13 +40,14 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>source/account_module/cotisation_caisses_retraites</string> + <string>source/account_module/dettes_salaries</string> + <string>destination/account_module/creances_salaries</string> </tuple> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>expense</string> </value> + <value> <string>1</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -54,7 +55,7 @@ </item> <item> <key> <string>quantity</string> </key> - <value> <float>0.0</float> </value> + <value> <float>-1.0</float> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/payable.xml new file mode 100644 index 0000000000..b4875ef195 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_6/payable.xml @@ -0,0 +1,113 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.AccountingTransactionLine</string> + <string>AccountingTransactionLine</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>source/account_module/dette_fournisseur</string> + <string>destination/account_module/creance_client</string> + </tuple> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>payable</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Accounting Transaction Line</string> </value> + </item> + <item> + <key> <string>quantity</string> </key> + <value> <float>1.0</float> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></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_rules/default_pay_sheet_transaction_rule/movement_1_7.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7.xml new file mode 100644 index 0000000000..14460035d0 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7.xml @@ -0,0 +1,297 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.AccountingRuleCell</string> + <string>AccountingRuleCell</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </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>resource/currency_module/eur</string> + <string>source_section/organisation_module/nexedi</string> + </tuple> + </value> + </item> + <item> + <key> <string>contributors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>movement_1_7</string> </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>1</string> </value> + </item> + <item> + <key> <string>mapped_value_property_list</string> </key> + <value> + <tuple> + <string>title</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>tax_category</string> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>tax_category/addendum/employee_share</string> + <string>tax_category/apec/employee_share</string> + <string>tax_category/argic/employee_share</string> + <string>tax_category/crds/employee_share</string> + <string>tax_category/csg/employee_share</string> + <string>tax_category/gross/employee_share</string> + <string>tax_category/social/employee_share</string> + <string>tax_category/supplementary_pension/employee_share</string> + <string>tax_category/syntec_insurance/employee_share</string> + <string>tax_category/unemployment/employee_share</string> + <string>product_line/addendum/acompte</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Accounting Rule Cell</string> </value> + </item> + <item> + <key> <string>start_date</string> </key> + <value> + <object> + <klass> + <global name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <dictionary> + <item> + <key> <string>_aday</string> </key> + <value> <string>Thu</string> </value> + </item> + <item> + <key> <string>_amon</string> </key> + <value> <string>Oct</string> </value> + </item> + <item> + <key> <string>_d</string> </key> + <value> <float>38649.1666667</float> </value> + </item> + <item> + <key> <string>_day</string> </key> + <value> <int>26</int> </value> + </item> + <item> + <key> <string>_dayoffset</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>_fday</string> </key> + <value> <string>Thursday</string> </value> + </item> + <item> + <key> <string>_fmon</string> </key> + <value> <string>October</string> </value> + </item> + <item> + <key> <string>_hour</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_millis</string> </key> + <value> <long>1161835200000</long> </value> + </item> + <item> + <key> <string>_minute</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_month</string> </key> + <value> <int>10</int> </value> + </item> + <item> + <key> <string>_nearsec</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_pday</string> </key> + <value> <string>Thu.</string> </value> + </item> + <item> + <key> <string>_pm</string> </key> + <value> <string>am</string> </value> + </item> + <item> + <key> <string>_pmhour</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_pmon</string> </key> + <value> <string>Oct.</string> </value> + </item> + <item> + <key> <string>_second</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_t</string> </key> + <value> <float>1161835200.0</float> </value> + </item> + <item> + <key> <string>_tz</string> </key> + <value> <string>GMT-4</string> </value> + </item> + <item> + <key> <string>_year</string> </key> + <value> <int>2006</int> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> <float>0.166666666664</float> </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Employee Share * Acompte</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_rules/default_pay_sheet_transaction_rule/movement_1_7/1.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/1.xml new file mode 100644 index 0000000000..f8f9794e8a --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/1.xml @@ -0,0 +1,113 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.AccountingTransactionLine</string> + <string>AccountingTransactionLine</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>source/account_module/dettes_salaries</string> + <string>destination/account_module/creances_salaries</string> + </tuple> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>1</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Accounting Transaction Line</string> </value> + </item> + <item> + <key> <string>quantity</string> </key> + <value> <float>-1.0</float> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></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_rules/default_pay_sheet_transaction_rule/movement_1_4/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/payable.xml similarity index 93% rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4/expense.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/payable.xml index 3559a64e83..e6d7cbdf78 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_4/expense.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_7/payable.xml @@ -40,13 +40,13 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>source/account_module/cotisations_urssaf</string> + <string>source/account_module/104</string> </tuple> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>expense</string> </value> + <value> <string>payable</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -54,7 +54,7 @@ </item> <item> <key> <string>quantity</string> </key> - <value> <float>0.0</float> </value> + <value> <float>1.0</float> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8.xml new file mode 100644 index 0000000000..26218c56fc --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8.xml @@ -0,0 +1,295 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.AccountingRuleCell</string> + <string>AccountingRuleCell</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>_identity_criterion</string> </key> + <value> + <dictionary/> + </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>_range_criterion</string> </key> + <value> + <dictionary/> + </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>resource/currency_module/EUR</string> + <string>source_section/organisation_module/nexedi</string> + </tuple> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>movement_1_8</string> </value> + </item> + <item> + <key> <string>isIndexable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>2</string> </value> + </item> + <item> + <key> <string>mapped_value_property_list</string> </key> + <value> + <tuple> + <string>title</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple> + <string>tax_category</string> + <string>product_line</string> + </tuple> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple> + <string>tax_category/addendum/employee_share</string> + <string>tax_category/apec/employee_share</string> + <string>tax_category/argic/employee_share</string> + <string>tax_category/crds/employee_share</string> + <string>tax_category/csg/employee_share</string> + <string>tax_category/gross/employee_share</string> + <string>tax_category/social/employee_share</string> + <string>tax_category/supplementary_pension/employee_share</string> + <string>tax_category/syntec_insurance/employee_share</string> + <string>tax_category/unemployment/employee_share</string> + <string>product_line/salary</string> + </tuple> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Accounting Rule Cell</string> </value> + </item> + <item> + <key> <string>start_date</string> </key> + <value> + <object> + <klass> + <global name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <dictionary> + <item> + <key> <string>_aday</string> </key> + <value> <string>Wed</string> </value> + </item> + <item> + <key> <string>_amon</string> </key> + <value> <string>Apr</string> </value> + </item> + <item> + <key> <string>_d</string> </key> + <value> <float>38451.9166667</float> </value> + </item> + <item> + <key> <string>_day</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_dayoffset</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_fday</string> </key> + <value> <string>Wednesday</string> </value> + </item> + <item> + <key> <string>_fmon</string> </key> + <value> <string>April</string> </value> + </item> + <item> + <key> <string>_hour</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_millis</string> </key> + <value> <long>1144792800000</long> </value> + </item> + <item> + <key> <string>_minute</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_month</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>_nearsec</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_pday</string> </key> + <value> <string>Wed.</string> </value> + </item> + <item> + <key> <string>_pm</string> </key> + <value> <string>am</string> </value> + </item> + <item> + <key> <string>_pmhour</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_pmon</string> </key> + <value> <string>Apr.</string> </value> + </item> + <item> + <key> <string>_second</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_t</string> </key> + <value> <float>1144792800.0</float> </value> + </item> + <item> + <key> <string>_tz</string> </key> + <value> <string>GMT+2</string> </value> + </item> + <item> + <key> <string>_year</string> </key> + <value> <int>2006</int> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> <float>0.916666666664</float> </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Employee Share * Salary</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_rules/default_pay_sheet_transaction_rule/movement_1_5/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8/payable.xml similarity index 100% rename from bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_5/payable.xml rename to bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8/payable.xml 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 1f50300b56..85881706f1 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 @@ -243,6 +243,7 @@ r_ = lambda x: context.Base_getRoundValue(x, currency_precision)\n # Scan each pay sheet line and save it in the right place in the data structure\n for psl in context.objectValues(portal_type=\'Pay Sheet Line\'):\n line_description = psl.getDescription()\n + line_title = psl.getTitle()\n # Add each cell to the data structure\n for cell in psl.objectValues(portal_type=\'Pay Sheet Cell\'):\n # There is no getSalaryRangeList() accessor on cells, so sort categories manually\n @@ -265,6 +266,14 @@ for psl in context.objectValues(portal_type=\'Pay Sheet Line\'):\n range_type = \'/\'.join(salary_range_path.split(\'/\')[2:]) # \'fixed\', \'fixed/gross\', \'variable\'...\n share_type = tax_category_path.split(\'/\')[-1] # \'employee_share\' or \'employer_share\'\n share_type = share_type.split(\'_\')[0] # \'employee\' or \'employer\'\n +\n + # Update title\n + if line_title not in [\'\', None]:\n + updateSubLine( group_id = cell_group_id\n + , subline_id = cell_subline_id\n + , property = \'service_title\'\n + , value = line_title\n + )\n \n # Update description\n if line_description != None:\n @@ -510,6 +519,7 @@ return details\n <string>currency_precision</string> <string>r_</string> <string>line_description</string> + <string>line_title</string> <string>cell</string> <string>tax_category_path</string> <string>c</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml index 2135745b74..0111bb98c4 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml @@ -526,7 +526,7 @@ kw[\'remboursement_loyer/addendum\'] = \\\n , \'employee_share\': None\n , \'base\' : 1.0\n }\n -kw[\'frais_deplacement/addendum\'] = \\\n +kw[\'remboursement_frais/addendum\'] = \\\n { \'employer_share\': None\n , \'employee_share\': None\n , \'base\' : 1.0\n diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index e9fd23ee87..e43290f2dc 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,4 +1,5 @@ 2006-10-26 Kevin +* Accounting of paysheets addendum. * Show pay sheet line comments on PDF. * Calculate taxable grand total on printing. * Fix french employer rate. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 3fdc173dab..00c98bb3ad 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -122 \ No newline at end of file +125 \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/template_path_list b/bt5/erp5_payroll/bt/template_path_list index 27612933b4..b6bcdd4bcf 100644 --- a/bt5/erp5_payroll/bt/template_path_list +++ b/bt5/erp5_payroll/bt/template_path_list @@ -7,6 +7,8 @@ organisation_module/etat organisation_module/henner organisation_module/urssaf payroll_service_module/** +portal_categories/product_line/addendum +portal_categories/product_line/addendum/** portal_categories/product_line/salary portal_categories/product_line/social_service portal_categories/product_line/social_service/** diff --git a/bt5/erp5_payroll/bt/version b/bt5/erp5_payroll/bt/version index d81f1c3fc7..d156ab4660 100644 --- a/bt5/erp5_payroll/bt/version +++ b/bt5/erp5_payroll/bt/version @@ -1 +1 @@ -0.2.9 \ No newline at end of file +0.2.10 \ No newline at end of file -- 2.30.9