[Erp5-report] r19648 - in /erp5/trunk/bt5/erp5_payroll: PathTemplateItem/portal_categories/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Mar 3 13:59:13 CET 2008
Author: jerome
Date: Mon Mar 3 13:59:12 2008
New Revision: 19648
URL: http://svn.erp5.org?rev=19648&view=rev
Log:
Add more standard categories for base amounts.
Add description on existing ones
Added:
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml
Modified:
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
erp5/trunk/bt5/erp5_payroll/bt/template_path_list
Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml?rev=19648&r1=19647&r2=19648&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/base_salary.xml Mon Mar 3 13:59:12 2008
@@ -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>
Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml?rev=19648&r1=19647&r2=19648&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/bonus.xml Mon Mar 3 13:59:12 2008
@@ -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>
Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml?rev=19648&r1=19647&r2=19648&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/deductible_tax.xml Mon Mar 3 13:59:12 2008
@@ -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>
Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml?rev=19648&r1=19647&r2=19648&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/gross_salary.xml Mon Mar 3 13:59:12 2008
@@ -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>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml?rev=19648&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/net_salary.xml Mon Mar 3 13:59:12 2008
@@ -1,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>
Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml?rev=19648&r1=19647&r2=19648&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_deductible_tax.xml Mon Mar 3 13:59:12 2008
@@ -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>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml?rev=19648&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_tax_withholding.xml Mon Mar 3 13:59:12 2008
@@ -1,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>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml?rev=19648&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/non_taxable_bonus.xml Mon Mar 3 13:59:12 2008
@@ -1,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>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml?rev=19648&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/overtime.xml Mon Mar 3 13:59:12 2008
@@ -1,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>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml?rev=19648&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_deductions.xml Mon Mar 3 13:59:12 2008
@@ -1,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>
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml?rev=19648&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_categories/base_amount/total_income.xml Mon Mar 3 13:59:12 2008
@@ -1,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>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=19648&r1=19647&r2=19648&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Mon Mar 3 13:59:12 2008
@@ -1,1 +1,1 @@
-208
+210
Modified: erp5/trunk/bt5/erp5_payroll/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/template_path_list?rev=19648&r1=19647&r2=19648&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/template_path_list (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/template_path_list Mon Mar 3 13:59:12 2008
@@ -3,6 +3,12 @@
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
More information about the Erp5-report
mailing list