diff --git a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/destination_region.xml b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/destination_region.xml index 0f30dfc404c6419b1ebe2012122438b69eb038ad..e885f22d29dd4d4cf65981c48a9fcaa4e74a0868 100644 --- a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/destination_region.xml +++ b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/destination_region.xml @@ -30,18 +30,16 @@ <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>acquisition_append_value</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>acquisition_base_category</string> </key> <value> @@ -52,6 +50,14 @@ </tuple> </value> </item> + <item> + <key> <string>acquisition_copy_value</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>acquisition_mask_value</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>acquisition_object_id</string> </key> <value> @@ -64,6 +70,10 @@ <key> <string>acquisition_portal_type</string> </key> <value> <string>python:()</string> </value> </item> + <item> + <key> <string>acquisition_sync_value</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>categories</string> </key> <value> @@ -73,11 +83,21 @@ </value> </item> <item> - <key> <string>description</string> </key> + <key> <string>category_type</string> </key> <value> - <none/> + <tuple/> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> </value> </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>fallback_base_category</string> </key> <value> @@ -90,10 +110,74 @@ <key> <string>id</string> </key> <value> <string>destination_region</string> </value> </item> + <item> + <key> <string>id_generator</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id_group</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>1</string> </value> + </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <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>Base Category</string> </value> </item> + <item> + <key> <string>read_permission</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>rid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>short_title</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>sid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Destination Region</string> </value> @@ -104,6 +188,12 @@ <none/> </value> </item> + <item> + <key> <string>write_permission</string> </key> + <value> + <none/> + </value> + </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_payroll/ModuleTemplateItem/payroll_service_module.xml b/bt5/erp5_payroll/ModuleTemplateItem/payroll_service_module.xml index 2de107c0535b4d7840e56b5e427dbb6e76869be8..726e1378524ee620a08a2b95ba5d2b341bfef314 100644 --- a/bt5/erp5_payroll/ModuleTemplateItem/payroll_service_module.xml +++ b/bt5/erp5_payroll/ModuleTemplateItem/payroll_service_module.xml @@ -389,10 +389,10 @@ <name>Manage Groups</name> </permission> <permission type='list'> - <name>Manage Selenium test cases</name> + <name>Manage Transient Object Container</name> </permission> <permission type='list'> - <name>Manage Transient Object Container</name> + <name>Manage Translation Services</name> </permission> <permission type='list'> <name>Manage Vocabulary</name> diff --git a/bt5/erp5_payroll/PathTemplateItem/organisation_module/483.xml b/bt5/erp5_payroll/PathTemplateItem/organisation_module/483.xml index faccd2ff6b2905b9f0b9fd40170fda76ed2a0801..3fd3442b90e0bcb26d57cf2c301f83b2d4a0e6d6 100644 --- a/bt5/erp5_payroll/PathTemplateItem/organisation_module/483.xml +++ b/bt5/erp5_payroll/PathTemplateItem/organisation_module/483.xml @@ -82,12 +82,6 @@ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> - <item> - <key> <string>description</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>483</string> </value> diff --git a/bt5/erp5_payroll/PathTemplateItem/organisation_module/agff.xml b/bt5/erp5_payroll/PathTemplateItem/organisation_module/agff.xml index 92e035c4b18909023f37efe04e02ef90051db8eb..6c1f21781ad4763f57003629b1836ca12981bf92 100644 --- a/bt5/erp5_payroll/PathTemplateItem/organisation_module/agff.xml +++ b/bt5/erp5_payroll/PathTemplateItem/organisation_module/agff.xml @@ -92,7 +92,9 @@ </item> <item> <key> <string>corporate_name</string> </key> - <value> <string></string> </value> + <value> + <none/> + </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/organisation_module/agirc.xml b/bt5/erp5_payroll/PathTemplateItem/organisation_module/agirc.xml index 322fd1ca226428337c9fa2bc94907ef2be46c6d1..49162b8338da42b79821567c0a93a17b8bd65e42 100644 --- a/bt5/erp5_payroll/PathTemplateItem/organisation_module/agirc.xml +++ b/bt5/erp5_payroll/PathTemplateItem/organisation_module/agirc.xml @@ -92,7 +92,9 @@ </item> <item> <key> <string>corporate_name</string> </key> - <value> <string></string> </value> + <value> + <none/> + </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/organisation_module/etat.xml b/bt5/erp5_payroll/PathTemplateItem/organisation_module/etat.xml index c42be22ce938d22572d99b360dde763b32cb2887..81d1f2e332ed7e6888337debf7a62042845b73a8 100644 --- a/bt5/erp5_payroll/PathTemplateItem/organisation_module/etat.xml +++ b/bt5/erp5_payroll/PathTemplateItem/organisation_module/etat.xml @@ -92,7 +92,9 @@ </item> <item> <key> <string>corporate_name</string> </key> - <value> <string></string> </value> + <value> + <none/> + </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/mutual_insurance.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/mutual_insurance.xml index e7b98c6b6cf4442ca5a14069b88d7525c333a14a..1558b05f08ac04c3c4437b663a7a6d86cbb08936 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/mutual_insurance.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/mutual_insurance.xml @@ -30,12 +30,6 @@ <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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/retirement_plan.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/retirement_plan.xml index 1d99452e40805abcad75a1b498071a860a1997c3..d923f8f6e02a1acfdefad132cef1b8aa4a99400b 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/retirement_plan.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/retirement_plan.xml @@ -30,12 +30,6 @@ <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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/state_insurance.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/state_insurance.xml index 4060f3455d62f759a4a45bdb290aefbbc5efd1cc..02be1f6229612e6d94dcae0625dd339a2c801603 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/state_insurance.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/state_insurance.xml @@ -30,12 +30,6 @@ <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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/unemployment_insurance.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/unemployment_insurance.xml index c0478e651ef613f05ab284d56860b2d45afc589a..8d8b3455824bf8edf90056ef6a1b57eb1337fd9c 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/unemployment_insurance.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/product_line/social_service/unemployment_insurance.xml @@ -30,12 +30,6 @@ <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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/quantity_unit/time.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/quantity_unit/time.xml index 0cbdac194a260aca90b4beed3b47ce7186974fe6..84b0cf4fedc989745be4aa9d13d34bab9c9551f9 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/quantity_unit/time.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/quantity_unit/time.xml @@ -30,12 +30,6 @@ <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> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france.xml index 069fd517a6b7e9d875fc0f255a1af8553793007e..e421adc67cf6ec163887616d0e34035bed26287e 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range/france.xml @@ -30,12 +30,6 @@ <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> 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 33725185ba63dd491d05f5742db98155514be49f..6d08c22c37806a94d7ed3bf9214def21c99a23f2 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 @@ -103,11 +103,11 @@ <string>tax_category/unemployment/employer_share</string> <string>tax_category/syntec_insurance/employer_share</string> <string>tax_category/taxes/employer_share</string> - <string>product_line/tax</string> <string>tax_category/social/employer_share</string> <string>tax_category/argic/employer_share</string> <string>tax_category/supplementary_pension/employer_share</string> <string>tax_category/apec/employer_share</string> + <string>product_line/tax</string> </tuple> </value> </item> 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 16451b629cf88a38a6ae638362cf1452471099e6..d5cf8c426552c52a918d51b48b59975dca08438b 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 @@ -104,10 +104,10 @@ <string>tax_category/syntec_insurance/employer_share</string> <string>tax_category/taxes/employer_share</string> <string>tax_category/social/employer_share</string> - <string>product_line/social_service/retirement_plan</string> <string>tax_category/argic/employer_share</string> <string>tax_category/supplementary_pension/employer_share</string> <string>tax_category/apec/employer_share</string> + <string>product_line/social_service/retirement_plan</string> </tuple> </value> </item> 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 1d5d2b2d8e5d0d4fc05a9f6e281b6aac215a2e30..c70a2aa1047615a2b12216aeac52476b67e5e421 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 @@ -106,8 +106,8 @@ <string>tax_category/social/employer_share</string> <string>tax_category/argic/employer_share</string> <string>tax_category/supplementary_pension/employer_share</string> - <string>product_line/social_service/mutual_insurance</string> <string>tax_category/apec/employer_share</string> + <string>product_line/social_service/mutual_insurance</string> </tuple> </value> </item> 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 0569f330c8e515479442d6246eced237b00d744a..fb3f140ed44757dc4e2ed4a63a251cfac335dfa7 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 @@ -100,7 +100,6 @@ <tuple> <string>tax_category/ags/employer_share</string> <string>tax_category/life_insurance/employer_share</string> - <string>product_line/social_service/state_insurance</string> <string>tax_category/unemployment/employer_share</string> <string>tax_category/syntec_insurance/employer_share</string> <string>tax_category/taxes/employer_share</string> @@ -108,6 +107,7 @@ <string>tax_category/argic/employer_share</string> <string>tax_category/supplementary_pension/employer_share</string> <string>tax_category/apec/employer_share</string> + <string>product_line/social_service/state_insurance</string> </tuple> </value> </item> 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 25c9c7427cb26f378f67b9e37fba9e3a4ec5f2fb..98350fee0bb0a055412a22957efabeb1793bf305 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 @@ -100,7 +100,6 @@ <tuple> <string>tax_category/ags/employer_share</string> <string>tax_category/life_insurance/employer_share</string> - <string>product_line/salary</string> <string>tax_category/unemployment/employer_share</string> <string>tax_category/syntec_insurance/employer_share</string> <string>tax_category/taxes/employer_share</string> @@ -108,6 +107,7 @@ <string>tax_category/argic/employer_share</string> <string>tax_category/supplementary_pension/employer_share</string> <string>tax_category/apec/employer_share</string> + <string>product_line/salary</string> </tuple> </value> </item> 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 da1cef42162b570d2918a6cc212b086f31375960..3b337b3deed3c0ea65c0c9b126c74c6e80300829 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 @@ -85,9 +85,9 @@ <string>tax_category/argic/employee_share</string> <string>tax_category/syntec_insurance/employee_share</string> <string>tax_category/social/employee_share</string> - <string>product_line/tax</string> <string>tax_category/supplementary_pension/employee_share</string> <string>tax_category/unemployment/employee_share</string> + <string>product_line/tax</string> </tuple> </value> </item> 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 d9adaaaffa0d72e461306e70dfa0b948213078ee..28d9747e9905f3debcd0d275219f8026e4264c0c 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 @@ -103,10 +103,10 @@ <string>tax_category/csg/employee_share</string> <string>tax_category/argic/employee_share</string> <string>tax_category/syntec_insurance/employee_share</string> - <string>product_line/social_service/retirement_plan</string> <string>tax_category/social/employee_share</string> <string>tax_category/supplementary_pension/employee_share</string> <string>tax_category/unemployment/employee_share</string> + <string>product_line/social_service/retirement_plan</string> </tuple> </value> </item> 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 ebe0cf914e39d6ae9ae22d99a8a9417996af1d2b..dcccb64406e6afe779c243dcc970927ed39e6dd5 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 @@ -104,9 +104,9 @@ <string>tax_category/argic/employee_share</string> <string>tax_category/syntec_insurance/employee_share</string> <string>tax_category/social/employee_share</string> - <string>product_line/social_service/unemployment_insurance</string> <string>tax_category/supplementary_pension/employee_share</string> <string>tax_category/unemployment/employee_share</string> + <string>product_line/social_service/unemployment_insurance</string> </tuple> </value> </item> 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 c87d4280ea9a949f90774c7462642d391145c6a6..6a7922e3c991dadee07fc22cc18903cf8f78d385 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 @@ -104,9 +104,9 @@ <string>tax_category/argic/employee_share</string> <string>tax_category/syntec_insurance/employee_share</string> <string>tax_category/social/employee_share</string> - <string>product_line/social_service/mutual_insurance</string> <string>tax_category/supplementary_pension/employee_share</string> <string>tax_category/unemployment/employee_share</string> + <string>product_line/social_service/mutual_insurance</string> </tuple> </value> </item> 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 42ee275e9174c1faeccd900a08aa2935d28cc914..6b36625c1f45bc4ce9af45f3bd72ec634d74db17 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 @@ -100,13 +100,13 @@ <tuple> <string>tax_category/apec/employee_share</string> <string>tax_category/crds/employee_share</string> - <string>product_line/social_service/state_insurance</string> <string>tax_category/csg/employee_share</string> <string>tax_category/argic/employee_share</string> <string>tax_category/syntec_insurance/employee_share</string> <string>tax_category/social/employee_share</string> <string>tax_category/supplementary_pension/employee_share</string> <string>tax_category/unemployment/employee_share</string> + <string>product_line/social_service/state_insurance</string> </tuple> </value> </item> 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 95b67d76396520b6a21d13348f404767b09c9f4b..66556499772e797e3eb35e52d4e671825884b21f 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 @@ -100,13 +100,13 @@ <tuple> <string>tax_category/apec/employee_share</string> <string>tax_category/crds/employee_share</string> - <string>product_line/salary</string> <string>tax_category/csg/employee_share</string> <string>tax_category/argic/employee_share</string> <string>tax_category/syntec_insurance/employee_share</string> <string>tax_category/social/employee_share</string> <string>tax_category/supplementary_pension/employee_share</string> <string>tax_category/unemployment/employee_share</string> + <string>product_line/salary</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml index e53937252f38a812915ea056eeb4c681e79d5aa7..63455cb0abf915154517b1d9fd06e7c18004bb1c 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml @@ -103,12 +103,6 @@ return translated_type_list\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml index 6a1ea92846201a7bca116075f27b726d318ab30d..fb8c9a26a0cd6cd4bde556a046f7245897c7ec7f 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml @@ -224,12 +224,6 @@ return printed\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>year, salary_type="gross_salary"</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReport.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReport.xml index 804ec737ff3933ed5c12c94f56d84aa05c8813ac..1c772057c5c60219448d449b16d265e7ca99c2b1 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReport.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReport.xml @@ -98,12 +98,6 @@ context.REQUEST.RESPONSE.redirect("%s/%s?year=%s&salary_type=%s" % ( context.get <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml index 89cdae6b8fd656ce08e19e2165f12824502e3173..0cfecf7a68e7db5ac5da4ed8fc1064f2e199feac 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog.xml @@ -45,12 +45,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>action</string> </key> <value> <string>AccountingTransactionModule_viewPayrollReport</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml index de6963a6a0f2d659658979909c3579337daa6df2..898d2a697175f022f553c640cf1fac5edaa025cb 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml @@ -145,12 +145,6 @@ return employees\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>start_date=None, stop_date=None</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml index f6279b5856e8b7a1b52d4fd29a7a58147b4034fd..84a3d230cc1dba2eecfc35538f7e70ad5490624c 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.xml @@ -100,12 +100,6 @@ return cell_range\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>matrixbox=0, **kw</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml index 92abd3cf1845d7166db24c5e49174ad2b837a7ea..95f59b6d988c8ebc2d1fa59a1b18f94a121f1672 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml @@ -45,12 +45,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>action</string> </key> <value> <string>Base_edit</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity.xml index 075c3fc431e581c12fc72bb4a7cb602db24c2e4a..dee9eed4b698bc3e23d65bee626436a17b58023d 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity.xml @@ -45,12 +45,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>action</string> </key> <value> <string>Base_edit</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransactionFastInput_getEmployeeList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransactionFastInput_getEmployeeList.xml index a05e9d5faa65ec1e4dd9d880f794f6064f5a373d..10ae235a8d20078d302d649c680c62a6df2659db 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransactionFastInput_getEmployeeList.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransactionFastInput_getEmployeeList.xml @@ -115,12 +115,6 @@ return listbox\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>**kw</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayroll.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayroll.xml index 8df359b892ee624e4f731c14a1ec964ebdc430ec..9c8e4b60dd8b59ffe931e0477c6bd0c053275755 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayroll.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayroll.xml @@ -141,12 +141,6 @@ context.REQUEST.RESPONSE.redirect("%s?portal_status_message=%s" % ( context.getP <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>listbox=[], **kw</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayrollFastInput.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayrollFastInput.xml index 5d9a0422294e54f8aeafd51c34dc5a005628987c..54856ad64d1bbd2ecf39bb26f07f69ab91ad5ad6 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayrollFastInput.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayrollFastInput.xml @@ -45,12 +45,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>action</string> </key> <value> <string>PaySheetTransaction_createPayroll</string> </value> 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 a52364418adc65818eadea9196b3e1f23971bd2c..4218d354a11b035c23919d7a247754f3b8c2e96a 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 @@ -335,12 +335,6 @@ return details\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml index 0f6297264b7995e79b369a0fd3fcc72c1f6c2c0f..6c16a4eb83a8dbf62686112eec882828c1aaaf20 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml @@ -195,12 +195,6 @@ return l\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>**kw</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_pdf_template.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_pdf_template.xml index 6d3306eb381c11541a2e0d0cf92356ea765b1b39..12a7dfa13eceec6f7292ae80a8daf4844b6102ef 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_pdf_template.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_pdf_template.xml @@ -44,12 +44,6 @@ </object> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml index 05eb008fcd7e5d2a968a6cb9f23eeac75d87eccd..93e929716ea08dc6ef5c43f00b9f73ec173966f8 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_postCalculation.xml @@ -258,12 +258,6 @@ if not(kw.has_key(\'skip_redirect\') and kw[\'skip_redirect\'] == True):\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>listbox=[], **kw</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2005.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2005.xml index 36066e1a8f7d1a6fc659aefee652631bdbb253ff..c11eb427a3bc8dfce3de898f6fd365835c957007 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2005.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2005.xml @@ -543,12 +543,6 @@ return default\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>ags_rate=None, industrial_accident_rate=None, transport_payment_rate=None</string> </value> 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 39883ae373884df5ebc1dc71fa59b8e4f3ab3456..02ab8f82ce23d68b8b2b323b9116bc43834eb764 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 @@ -524,12 +524,6 @@ return default\n <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml index 048d046e7e7fb54e19355be28e441228e99f094b..2b4dbcd1ae5bc2e3c3c520d6c71c9c6907a1579f 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml @@ -45,12 +45,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>action</string> </key> <value> <string>Base_edit</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml index b7ec5651e8cf05c788133bf138c59e92bc7b63ba..9fb422d98969164896cdad85921160099b5be76d 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml @@ -478,10 +478,6 @@ <key> <string>not_viewable</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>page_template</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>portal_types</string> </key> <value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml index 94ac5cd0f559f9e7b8a0ad250d15f37c1431fbeb..8701cc08dce04e1e436540990b4b906849109fbf 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml @@ -44,12 +44,6 @@ </object> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml index 88c6c71a42dc551356722d839e4fe4b6f1669f8a..0fddf836285ba3056180c7555be51880a06e0756 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml @@ -45,12 +45,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>action</string> </key> <value> <string>PaySheetTransaction_postCalculation</string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewTotalDestinationList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewTotalDestinationList.xml index 098af73fe80d8d0796662903736494770c9252c8..74db2eaabff1a2fdeef70c160b7fdbb7037f62b2 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewTotalDestinationList.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewTotalDestinationList.xml @@ -45,12 +45,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>action</string> </key> <value> <string>Base_edit</string> </value> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index a5c750feac4168f62cfd29aa62b4624f0a430cd5..e440e5c842586965a7fb77deda2eca68612b1f53 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -27 \ No newline at end of file +3 \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/short_title b/bt5/erp5_payroll/bt/short_title new file mode 100644 index 0000000000000000000000000000000000000000..4af18322e32f3dd19579c80e26e4a306ad11e049 --- /dev/null +++ b/bt5/erp5_payroll/bt/short_title @@ -0,0 +1 @@ +None \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/version b/bt5/erp5_payroll/bt/version index 345f8cc0391bff8037eee5caeeff124f0f4de824..a34eaa5d03b782b7b4da8c514113cdf88af3e6ba 100644 --- a/bt5/erp5_payroll/bt/version +++ b/bt5/erp5_payroll/bt/version @@ -1 +1 @@ -0.1.10 \ No newline at end of file +0.1.11 \ No newline at end of file