diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/prevoyance.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/prevoyance.xml index 123258276462f042e29078fb00411488b03436cd..981bdd2677f1c6585659d426f80e51819b9a9876 100644 --- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/prevoyance.xml +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/prevoyance.xml @@ -82,9 +82,9 @@ <tuple> <string>salary_range/france/variable/tranche_a</string> <string>tax_category/syntec_insurance/employee_share</string> - <string>product_line/social_service/mutual_insurance</string> <string>quantity_unit/time/month</string> <string>source/organisation_module/generali</string> + <string>product_line/social_service/prevoyance</string> <string>salary_range/france/variable/tranche_b</string> <string>tax_category/syntec_insurance/employer_share</string> </tuple> diff --git a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/taxe_prevoyance.xml b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/taxe_prevoyance.xml index e4dfff4d86a635d6675a0a2df3a574ff8a380175..663a0e7228672f1465552edcba64bdfb0123def6 100644 --- a/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/taxe_prevoyance.xml +++ b/bt5/erp5_payroll/PathTemplateItem/payroll_service_module/taxe_prevoyance.xml @@ -80,11 +80,11 @@ <key> <string>categories</string> </key> <value> <tuple> + <string>salary_range/france/variable</string> <string>tax_category/social/employer_share</string> - <string>product_line/social_service</string> <string>quantity_unit/time/month</string> <string>source/organisation_module/urssaf</string> - <string>salary_range/france/variable</string> + <string>product_line/social_service/state_insurance</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/prevoyance.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/prevoyance.xml new file mode 100644 index 0000000000000000000000000000000000000000..632d0161b723afe41f88ae82c83b6af3d07058f6 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/prevoyance.xml @@ -0,0 +1,120 @@ +<?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/social_service/prevoyance</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>prevoyance</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Prevoyance</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 f4ba461496da45ba78db68beb6f2415427a51021..2a6436b53653f2e6a2e391c558896a4cec09af9c 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>8</string> </value> + <value> <string>9</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -313,7 +313,7 @@ </item> <item> <key> <string>portal_rules/default_pay_sheet_transaction_rule/5</string> </key> - <value> <int>8</int> </value> + <value> <int>9</int> </value> </item> <item> <key> <string>portal_rules/default_pay_sheet_transaction_rule/6</string> </key> @@ -327,6 +327,10 @@ <key> <string>portal_rules/default_pay_sheet_transaction_rule/8</string> </key> <value> <int>4</int> </value> </item> + <item> + <key> <string>portal_rules/default_pay_sheet_transaction_rule/9</string> </key> + <value> <int>8</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/9.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/9.xml new file mode 100644 index 0000000000000000000000000000000000000000..4681c7d0f783846b5dcddf876dd32cc7566eef1d --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/9.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>9</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/social_service/prevoyance</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>Prevoyances</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 index 3a7688cc1cdd60faae63a621476d36f536d70961..01fa51da90e00167b509623ae01b02f80bdce26c 100644 --- 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 @@ -85,14 +85,6 @@ <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> @@ -124,7 +116,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/social_service/prevoyance</string> </tuple> </value> </item> @@ -152,31 +144,31 @@ <dictionary> <item> <key> <string>_aday</string> </key> - <value> <string>Wed</string> </value> + <value> <string>Mon</string> </value> </item> <item> <key> <string>_amon</string> </key> - <value> <string>Apr</string> </value> + <value> <string>Nov</string> </value> </item> <item> <key> <string>_d</string> </key> - <value> <float>38451.9166667</float> </value> + <value> <float>38681.2083333</float> </value> </item> <item> <key> <string>_day</string> </key> - <value> <int>12</int> </value> + <value> <int>27</int> </value> </item> <item> <key> <string>_dayoffset</string> </key> - <value> <int>3</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>_fday</string> </key> - <value> <string>Wednesday</string> </value> + <value> <string>Monday</string> </value> </item> <item> <key> <string>_fmon</string> </key> - <value> <string>April</string> </value> + <value> <string>November</string> </value> </item> <item> <key> <string>_hour</string> </key> @@ -184,7 +176,7 @@ </item> <item> <key> <string>_millis</string> </key> - <value> <long>1144792800000</long> </value> + <value> <long>1164603600000</long> </value> </item> <item> <key> <string>_minute</string> </key> @@ -192,7 +184,7 @@ </item> <item> <key> <string>_month</string> </key> - <value> <int>4</int> </value> + <value> <int>11</int> </value> </item> <item> <key> <string>_nearsec</string> </key> @@ -200,7 +192,7 @@ </item> <item> <key> <string>_pday</string> </key> - <value> <string>Wed.</string> </value> + <value> <string>Mon.</string> </value> </item> <item> <key> <string>_pm</string> </key> @@ -212,7 +204,7 @@ </item> <item> <key> <string>_pmon</string> </key> - <value> <string>Apr.</string> </value> + <value> <string>Nov.</string> </value> </item> <item> <key> <string>_second</string> </key> @@ -220,11 +212,11 @@ </item> <item> <key> <string>_t</string> </key> - <value> <float>1144792800.0</float> </value> + <value> <float>1164603600.0</float> </value> </item> <item> <key> <string>_tz</string> </key> - <value> <string>GMT+2</string> </value> + <value> <string>US/Eastern</string> </value> </item> <item> <key> <string>_year</string> </key> @@ -232,7 +224,7 @@ </item> <item> <key> <string>time</string> </key> - <value> <float>0.916666666664</float> </value> + <value> <float>0.208333333336</float> </value> </item> </dictionary> </state> @@ -247,7 +239,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Employer Share * Salary</string> </value> + <value> <string>Employer Share * Prevoyances</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_8/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8/expense.xml index 0d7deeedf798fb30b14ba043ad7020dec49447d1..1975fbc98cdad2888f9433f024db1f25d7c8781d 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8/expense.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8/expense.xml @@ -40,8 +40,7 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>source/account_module/remuneration_personnel</string> - <string>destination/account_module/prestation_service</string> + <string>source/account_module/prevoyance</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8/payable.xml new file mode 100644 index 0000000000000000000000000000000000000000..d4a7d02066ad4cc881ffd748d8dfd41b6409b95f --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_8/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/dettes_sociales</string> + <string>destination/account_module/creances_sociales</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_0_9.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_9.xml new file mode 100644 index 0000000000000000000000000000000000000000..cc49b22020abe8874d5f840d50b57458cc34c352 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_9.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_9</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_9/expense.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_9/expense.xml new file mode 100644 index 0000000000000000000000000000000000000000..0d7deeedf798fb30b14ba043ad7020dec49447d1 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_0_9/expense.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/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>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_8.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8.xml index 26218c56fc3b478ce239f3a3aaeb2c59d37f3906..6026a10a3690615484982abe8214f89a0dab966a 100644 --- 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 @@ -63,6 +63,12 @@ </tuple> </value> </item> + <item> + <key> <string>contributors</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>criterion_property</string> </key> <value> @@ -79,14 +85,6 @@ <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> @@ -118,7 +116,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/social_service/prevoyance</string> </tuple> </value> </item> @@ -132,107 +130,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> @@ -241,7 +138,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Employee Share * Salary</string> </value> + <value> <string>Employee Share * Prevoyances</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8/payable.xml index 24c0844dd04e67c6cbb182d1233bff401d0008aa..d4a7d02066ad4cc881ffd748d8dfd41b6409b95f 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8/payable.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_8/payable.xml @@ -40,8 +40,8 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>source/account_module/dettes_salaries</string> - <string>destination/account_module/creances_salaries</string> + <string>source/account_module/dettes_sociales</string> + <string>destination/account_module/creances_sociales</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_9.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_9.xml new file mode 100644 index 0000000000000000000000000000000000000000..d9638f622de1204b6a3c6ffa98e11fd27f6d9cab --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_9.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_9</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_9/payable.xml b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_9/payable.xml new file mode 100644 index 0000000000000000000000000000000000000000..24c0844dd04e67c6cbb182d1233bff401d0008aa --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_rules/default_pay_sheet_transaction_rule/movement_1_9/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/dettes_salaries</string> + <string>destination/account_module/creances_salaries</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/SkinTemplateItem/portal_skins/erp5_payroll/PayrollServiceModule_viewPayrollServiceList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollServiceModule_viewPayrollServiceList/listbox.xml index fee37e8fad29af478a53b3c0ec1b692d9bedfcf2..aae7e17ec14db8cf04df5b6341ca015bfe52b98e 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollServiceModule_viewPayrollServiceList/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollServiceModule_viewPayrollServiceList/listbox.xml @@ -341,6 +341,10 @@ <string>title</string> <string>Title</string> </tuple> + <tuple> + <string>source_title</string> + <string>Supplier</string> + </tuple> <tuple> <string>description</string> <string>Description</string> diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index fa4f436ddb7a3192be11058bdb59621d5a5e7905..dd59f29b7ccf80000e276d7d3260fa50bf72cddd 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,3 +1,6 @@ +2006-11-27 Kevin +* Make "prevoyance" payroll service accountable. + 2006-11-24 Kevin * Add "prevoyance" payroll service and related organisation. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index d55f9f7457c480079465ca51b679ee672016af1a..eafdfb06c55856bbcc9bb2b69ed9d055f6ae0557 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -136 \ No newline at end of file +138 \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/version b/bt5/erp5_payroll/bt/version index 25cd22b69c1daed05d14909da4307f1d94c01af3..f21e5a1f2ef1479fd78d50859891b08fe3dec7e7 100644 --- a/bt5/erp5_payroll/bt/version +++ b/bt5/erp5_payroll/bt/version @@ -1 +1 @@ -0.2.12 \ No newline at end of file +0.2.13 \ No newline at end of file