From b23b4194fa9225d6944715c3014aa544f7915274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 3 Mar 2008 12:59:12 +0000 Subject: [PATCH] Add more standard categories for base amounts. Add description on existing ones git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19648 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../base_amount/base_salary.xml | 6 +- .../portal_categories/base_amount/bonus.xml | 6 +- .../base_amount/deductible_tax.xml | 6 +- .../base_amount/gross_salary.xml | 6 +- .../base_amount/net_salary.xml | 62 +++++++++++++++++ .../base_amount/non_deductible_tax.xml | 6 +- .../base_amount/non_tax_withholding.xml | 61 +++++++++++++++++ .../base_amount/non_taxable_bonus.xml | 63 ++++++++++++++++++ .../base_amount/overtime.xml | 66 +++++++++++++++++++ .../base_amount/total_deductions.xml | 61 +++++++++++++++++ .../base_amount/total_income.xml | 62 +++++++++++++++++ bt5/erp5_payroll/bt/revision | 2 +- bt5/erp5_payroll/bt/template_path_list | 6 ++ 13 files changed, 392 insertions(+), 21 deletions(-) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml index 6935c74020..2256e5e316 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml @@ -58,9 +58,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string>The base salary contains the gross salary and other bonus on which we\'ll calculate taxes</string> </value> </item> <item> <key> <string>id</string> </key> @@ -68,7 +66,7 @@ </item> <item> <key> <string>int_index</string> </key> - <value> <int>1</int> </value> + <value> <int>101</int> </value> </item> <item> <key> <string>portal_type</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml index 246e8a9338..3b03b6042e 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml @@ -58,9 +58,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string>Bonuses on which tax will be calculated</string> </value> </item> <item> <key> <string>id</string> </key> @@ -68,7 +66,7 @@ </item> <item> <key> <string>int_index</string> </key> - <value> <int>3</int> </value> + <value> <int>110</int> </value> </item> <item> <key> <string>portal_type</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml index 2b551a9a3d..9afbca4788 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml @@ -58,9 +58,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string>Standard Payroll Tax</string> </value> </item> <item> <key> <string>id</string> </key> @@ -68,7 +66,7 @@ </item> <item> <key> <string>int_index</string> </key> - <value> <int>5</int> </value> + <value> <int>201</int> </value> </item> <item> <key> <string>portal_type</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml index 8c1ce2702d..f4350a47ed 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml @@ -31,9 +31,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string>The gross salary is the base salary without bonus</string> </value> </item> <item> <key> <string>id</string> </key> @@ -41,7 +39,7 @@ </item> <item> <key> <string>int_index</string> </key> - <value> <int>2</int> </value> + <value> <int>102</int> </value> </item> <item> <key> <string>portal_type</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml new file mode 100644 index 0000000000..0ebe4331bf --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="Category" module="Products.ERP5Type.Document.Category"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>base_amount/net_salary</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>The salary that will be paid to the employee.\n +All contributions and incomes are in this category.</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>net_salary</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>301</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Net Salary</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml index b086b70dc5..64e1018370 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml @@ -31,9 +31,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string>This contains taxes that are not part of the net fiscal income. This is probably french specific and might be changed.</string> </value> </item> <item> <key> <string>id</string> </key> @@ -41,7 +39,7 @@ </item> <item> <key> <string>int_index</string> </key> - <value> <int>4</int> </value> + <value> <int>202</int> </value> </item> <item> <key> <string>portal_type</string> </key> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml new file mode 100644 index 0000000000..e9f3308ed2 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml @@ -0,0 +1,61 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="Category" module="Products.ERP5Type.Document.Category"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>base_amount/non_tax_withholding</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Withholding for everything else than tax related deductions, such as loan refunds</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>non_tax_withholding</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>203</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Non Tax Withholding</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml new file mode 100644 index 0000000000..8d492a7236 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml @@ -0,0 +1,63 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="Category" module="Products.ERP5Type.Document.Category"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>base_amount/non_taxable_bonus</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>non_taxable_bonus</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>111</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Non Taxable Bonus</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml new file mode 100644 index 0000000000..ca864e25e3 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="Category" module="Products.ERP5Type.Document.Category"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>base_amount/overtime</string> + <string>base_amount/overtime</string> + <string>base_amount/overtime</string> + <string>base_amount/overtime</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>overtime</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>103</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Overtime</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml new file mode 100644 index 0000000000..13a9851831 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml @@ -0,0 +1,61 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="Category" module="Products.ERP5Type.Document.Category"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>base_amount/total_deductions</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Sum of all deductions and withholdings from the employee gross salary.</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>total_deductions</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>299</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Total Deductions</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml new file mode 100644 index 0000000000..cd5daa9f43 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="Category" module="Products.ERP5Type.Document.Category"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>base_amount/total_income</string> + <string>base_amount/total_income</string> + </tuple> + </value> + </item> + <item> + <key> <string>codification</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>The total of the income in the form of salary / wages and various bonuses.</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>total_income</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>199</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Total Income</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 6e16ebf9e9..55596b29f7 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -208 \ No newline at end of file +210 \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/template_path_list b/bt5/erp5_payroll/bt/template_path_list index 1efde3e713..cef8708473 100644 --- a/bt5/erp5_payroll/bt/template_path_list +++ b/bt5/erp5_payroll/bt/template_path_list @@ -3,6 +3,12 @@ portal_categories/base_amount/base_salary portal_categories/base_amount/bonus portal_categories/base_amount/deductible_tax portal_categories/base_amount/gross_salary +portal_categories/base_amount/net_salary portal_categories/base_amount/non_deductible_tax +portal_categories/base_amount/non_tax_withholding +portal_categories/base_amount/non_taxable_bonus +portal_categories/base_amount/overtime +portal_categories/base_amount/total_deductions +portal_categories/base_amount/total_income portal_categories/tax_category/employee_share portal_categories/tax_category/employer_share \ No newline at end of file -- 2.30.9