Skip to content

erp5
erp5
Commit 0d6843bd authored by Kevin Deldycke's avatar Kevin Deldycke
Browse files
Options

Add new categories, new services and fix relations between both. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10851 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 70651100
Show whitespace changes
Inline Side-by-side
Showing with 661 additions and 12 deletions
bt5/erp5_payroll/PathTemplateItem/payroll_service_module/absences.xml 0 → 100644
View file @ 0d6843bd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.Document.Resource</string>
<string>Resource</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>salary_range/france/forfait</string>
<string>product_line/salary</string>
<string>quantity_unit/time/month</string>
<string>tax_category/absences/employer_share</string>
</tuple>
</value>
</item>
<item>
<key> <string>contributors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>float_index</string> </key>
<value> <float>0.1</float> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>absences</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Service</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Absences</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>variation_base_category_list</string> </key>
<value>
<tuple>
<string>tax_category</string>
<string>salary_range</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/PathTemplateItem/payroll_service_module/indemnite_precarite.xml
View file @ 0d6843bd
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<string>salary_range/france/forfait</string> <string>salary_range/france/forfait</string>
<string>product_line/salary</string> <string>product_line/salary</string>
<string>quantity_unit/time/month</string> <string>quantity_unit/time/month</string>
<string>tax_category/indemnite_precarite/employee_share</string> <string>tax_category/indemnite_precarite/employer_share</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/PathTemplateItem/payroll_service_module/precarite.xml 0 → 100644
View file @ 0d6843bd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.Document.Resource</string>
<string>Resource</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>salary_range/france/forfait</string>
<string>product_line/salary</string>
<string>quantity_unit/time/month</string>
<string>tax_category/indemnite_precarite/employer_share</string>
</tuple>
</value>
</item>
<item>
<key> <string>contributors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>float_index</string> </key>
<value> <float>0.1</float> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>precarite</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Service</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string encoding="base64">SW5kZW1pbml0w6kgZGUgUHLDqWNhcml0w6k=</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>variation_base_category_list</string> </key>
<value>
<tuple>
<string>tax_category</string>
<string>salary_range</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/PathTemplateItem/payroll_service_module/primes.xml
View file @ 0d6843bd
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<value> <value>
<tuple> <tuple>
<string>salary_range/france/forfait</string> <string>salary_range/france/forfait</string>
<string>tax_category/primes/employee_share</string> <string>tax_category/primes/employer_share</string>
<string>product_line/salary</string> <string>product_line/salary</string>
<string>quantity_unit/time/month</string> <string>quantity_unit/time/month</string>
</tuple> </tuple>
......
bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/absences/employer_share.xml 0 → 100644
View file @ 0d6843bd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.Document.Category</string>
<string>Category</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>tax_category/absences/employer_share</string>
<string>tax_category/absences/employer_share</string>
<string>tax_category/absences/employer_share</string>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>employer_share</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Employer Share</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite.xml
View file @ 0d6843bd
...@@ -50,6 +50,12 @@ ...@@ -50,6 +50,12 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>codification</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <value>
...@@ -60,6 +66,12 @@ ...@@ -60,6 +66,12 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>indemnite_precarite</string> </value> <value> <string>indemnite_precarite</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>last_id</string> </key> <key> <string>last_id</string> </key>
<value> <string>1</string> </value> <value> <string>1</string> </value>
......
bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite/employee_share.xml → bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/indemnite_precarite/employer_share.xml
View file @ 0d6843bd
...@@ -40,10 +40,17 @@ ...@@ -40,10 +40,17 @@
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple>
<string>tax_category/indemnite_precarite/employee_share</string> <string>tax_category/indemnite_precarite/employer_share</string>
<string>tax_category/indemnite_precarite/employer_share</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>codification</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <value>
...@@ -52,7 +59,13 @@ ...@@ -52,7 +59,13 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>employee_share</string> </value> <value> <string>employer_share</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
...@@ -60,7 +73,7 @@ ...@@ -60,7 +73,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Employee Share</string> </value> <value> <string>Employer Share</string> </value>
</item> </item>
<item> <item>
<key> <string>uid</string> </key> <key> <string>uid</string> </key>
......
bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category/primes/employer_share.xml 0 → 100644
View file @ 0d6843bd
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.Document.Category</string>
<string>Category</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>tax_category/primes/employer_share</string>
<string>tax_category/primes/employer_share</string>
<string>tax_category/primes/employer_share</string>
<string>tax_category/primes/employer_share</string>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>employer_share</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Employer Share</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
View file @ 0d6843bd
...@@ -130,6 +130,9 @@ company_size = len(employee_list)\n ...@@ -130,6 +130,9 @@ company_size = len(employee_list)\n
salary_slices = {}\n salary_slices = {}\n
\n \n
# "Char" slice type\n # "Char" slice type\n
# TODO: Slices should be calculated based on the total gross salary over the year divided by 12 month.\n
# This is why there is a problem for people who have changing gross salary over the year.\n
# That\'s why accountants must do manual regulations in those cases.\n
slice_a_value = ceiling_salary\n slice_a_value = ceiling_salary\n
slice_b_value = ceiling_salary * 4\n slice_b_value = ceiling_salary * 4\n
slice_c_value = ceiling_salary * 8\n slice_c_value = ceiling_salary * 8\n
...@@ -422,7 +425,7 @@ if executive and start_date <= comp_date <= stop_date:\n ...@@ -422,7 +425,7 @@ if executive and start_date <= comp_date <= stop_date:\n
}\n }\n
\n \n
# Retirement = Retraite Cadre forfaitaire\n # Retirement = Retraite Cadre forfaitaire\n
if executive:\n if executive and not salary_slices.has_key(\'B\') and not salary_slices.has_key(\'C\'):\n
kw[\'cavcic/forfait\'] = \\\n kw[\'cavcic/forfait\'] = \\\n
{ \'employer_share\': 35.62\n { \'employer_share\': 35.62\n
, \'employee_share\': 21.21\n , \'employee_share\': 21.21\n
...@@ -481,11 +484,7 @@ kw[\'reduction_fillon_forfait/forfait\'] = \\\n ...@@ -481,11 +484,7 @@ kw[\'reduction_fillon_forfait/forfait\'] = \\\n
, \'base\' : 1.0\n , \'base\' : 1.0\n
}\n }\n
\n \n
# Add blank lines for:\n # Add blank lines for services which is a variable part od the gross salary.\n
# * wickness holding (= retenue maladie)\n
# * pay bonus (= primes)\n
# * non-working days (= absences)\n
# * vacation compensation (= ICCP)\n
# Thanks to this, the accountant has the freedom to add the missing amount of money\n # Thanks to this, the accountant has the freedom to add the missing amount of money\n
# that this script can\'t guess.\n # that this script can\'t guess.\n
kw[\'retenue_maladie/forfait\'] = \\\n kw[\'retenue_maladie/forfait\'] = \\\n
...@@ -508,7 +507,11 @@ kw[\'iccp/forfait\'] = \\\n ...@@ -508,7 +507,11 @@ kw[\'iccp/forfait\'] = \\\n
, \'employee_share\': None\n , \'employee_share\': None\n
, \'base\' : 1.0\n , \'base\' : 1.0\n
}\n }\n
\n kw[\'precarite/forfait\'] = \\\n
{ \'employer_share\': None\n
, \'employee_share\': None\n
, \'base\' : 1.0\n
}\n
\n \n
return kw\n return kw\n
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7