Skip to content

erp5
erp5
Commit d27fe335 authored by Aurel's avatar Aurel
Browse files
Options

2010-01-04 aurel 

Update the bt to use the new structure of the base amount category :

- update local part of the base amount category

- update odt reports to use the new category structure

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31559 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6dd1ab34
Hide whitespace changes
Inline Side-by-side
Showing with 766 additions and 186 deletions
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_application_list.xml
View file @ d27fe335
......@@ -271,7 +271,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: getattr(here.portal_categories.base_amount, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
<value> <string>python: getattr(here.portal_categories.base_amount.payroll, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_base_contribution_list.xml
View file @ d27fe335
......@@ -14,8 +14,8 @@
<value>
<list>
<string>description</string>
<string>title</string>
<string>items</string>
<string>title</string>
</list>
</value>
</item>
......@@ -57,6 +57,10 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -75,6 +79,10 @@
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
......@@ -94,6 +102,12 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
......@@ -119,7 +133,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: getattr(here.portal_categories.base_amount, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
<value> <string>python: getattr(here.portal_categories.base_amount.payroll, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_application_list.xml
View file @ d27fe335
......@@ -14,8 +14,8 @@
<value>
<list>
<string>description</string>
<string>title</string>
<string>items</string>
<string>title</string>
</list>
</value>
</item>
......@@ -57,6 +57,10 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -75,6 +79,10 @@
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
......@@ -94,6 +102,12 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
......@@ -119,7 +133,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: getattr(here.portal_categories.base_amount, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
<value> <string>python: getattr(here.portal_categories.base_amount.payroll, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml
View file @ d27fe335
......@@ -57,6 +57,10 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -75,6 +79,10 @@
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
......@@ -125,7 +133,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: getattr(here.portal_categories.base_amount, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
<value> <string>python: getattr(here.portal_categories.base_amount.payroll, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=1, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml
View file @ d27fe335
......@@ -55,6 +55,7 @@ AAA=</string> </value>
tal:define="data_dict here/PaySheetTransaction_getODTDataDict;\n
set_precision python: request.set(\'precision\', here.getQuantityPrecisionFromResource(here.getPriceCurrency()));\n
quantity_renderer nocall:here/Base_viewFieldLibrary/my_money_quantity/render_pdf;\n
gross_category python:\'base_amount/payroll/report/salary/gross\';\n
price_renderer nocall:here/PaySheetTransaction_viewFieldLibrary/my_price/render_pdf;\n
default_language python:test(request.get(\'international_form\'), \'en\', here.Localizer.get_selected_language())">\n
<office:scripts/>\n
......@@ -414,13 +415,13 @@ AAA=</string> </value>
<!-- If previous line has \'base_salary\' category in its\n
base_contribution list and the next one don\'t have, display the total\n
gross_salary -->\n
<tal:block condition="python: previous_line is not None and \'base_amount/payroll/earning/salary/gross_salary\' in previous_line[\'base_contribution_list\'] and \'base_amount/payroll/earning/salary/gross_salary\' not in line_dict[\'base_contribution_list\']">\n
<tal:block condition="python: previous_line is not None and gross_category in previous_line[\'base_contribution_list\'] and gross_category not in line_dict[\'base_contribution_list\']">\n
<table:table-row table:style-name=\'Tableau1.3\'>\n
<table:table-cell table:style-name=\'Tableau1.A8\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Left\' tal:content=\'python: here.Base_translateString("Gross Salary")\'>1</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A8\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents_20_Right\' tal:content=\'python:quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution="base_contribution/base_amount/payroll/earning/salary/gross_salary"))\'>400 000</text:p>\n
<text:p text:style-name=\'Table_20_Contents_20_Right\' tal:content=\'python:quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution="base_contribution/%s"%gross_category))\'>400 000</text:p>\n
</table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A8\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
......@@ -521,8 +522,8 @@ AAA=</string> </value>
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
\n
<!-- if this line not contribute to gross_salary base amount display employer share else don\'t display it-->\n
<tal:block tal:condition="python: \'base_amount/payroll/earning/salary/gross_salary\' not in line_dict[\'base_contribution_list\']">\n
<!-- if this line does not contribute to gross category then display employer share else don\'t display it-->\n
<tal:block tal:condition="python: gross_category not in line_dict[\'base_contribution_list\']">\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'float\'\n
tal:condition="python: line_dict[\'employer_price\'] != None"\n
......@@ -550,7 +551,7 @@ AAA=</string> </value>
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
</tal:block>\n
<tal:block tal:condition="python: \'base_amount/payroll/earning/salary/gross_salary\' in line_dict[\'base_contribution_list\']">\n
<tal:block tal:condition="python: gross_category in line_dict[\'base_contribution_list\']">\n
<table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
......@@ -615,7 +616,7 @@ AAA=</string> </value>
<table:table-cell table:style-name=\'Tableau3.E2\'\n
office:value-type=\'float\'\n
tal:attributes=\'office:value data_dict/total_price_novat\'>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Right\' tal:content="python: \'%s %s\' % (quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution=\'base_contribution/base_amount/payroll/earning/salary/net_salary\', contribution_share=\'contribution_share/employee\')), data_dict[\'currency\'])">800.000,00</text:p>\n
<text:p text:style-name=\'Item_20_Table_20_Title_20_Right\' tal:content="python: \'%s %s\' % (quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution=\'base_contribution/base_amount/payroll/report/salary/net\', contribution_share=\'contribution_share/employee\')), data_dict[\'currency\'])">800.000,00</text:p>\n
</table:table-cell>\n
</table:table-row>\n
<table:table-row table:style-name=\'Tableau1.4\'>\n
......
bt5/erp5_payroll/bt/change_log
View file @ d27fe335
2010-01-04 aurel
Update the bt to use the new structure of the base amount category
2009-12-5 yusei
* Fix PaySheetTransaction_getODTDataDict. Make print pay slip works without pay sheet model.
......
bt5/erp5_payroll/bt/revision
View file @ d27fe335
537
\ No newline at end of file
539
\ No newline at end of file
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_forfait_social.xml deleted 100644 → 0
View file @ 6dd1ab34
<?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>categories</string> </key>
<value>
<tuple>
<string>base_amount/base_forfait_social</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>base_forfait_social</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>Base forfait social</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr.xml 0 → 100644
View file @ d27fe335
<?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>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</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>effective_date</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>fr</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>sort_index</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>French Specific Payroll Amounts</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml → bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base.xml
View file @ d27fe335
......@@ -10,50 +10,98 @@
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<string>base_amount/salaire_net_imposable</string>
<string>base_amount/salaire_net_imposable</string>
<string>base_amount/salaire_net_imposable</string>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<key> <string>_mt_index</string> </key>
<value>
<none/>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<key> <string>_tree</string> </key>
<value>
<none/>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>salaire_net_imposable</string> </value>
<key> <string>effective_date</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>int_index</string> </key>
<value> <int>102</int> </value>
<key> <string>id</string> </key>
<value> <string>base</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
<key> <string>sort_index</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Salaire net imposable</string> </value>
<value> <string>Base</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg.xml → bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible.xml
View file @ d27fe335
......@@ -10,37 +10,53 @@
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<string>base_amount/base_csg</string>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<key> <string>effective_date</string> </key>
<value>
<none/>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>base de la CSG (= taxe prévoyance + salaire brut * 0.97)</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>base_csg</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
<value> <string>csg_deductible</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>sort_index</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Base CSG déductible</string> </value>
......
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_deductible_heures_supp.xml 0 → 100644
View file @ d27fe335
<?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>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>effective_date</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>csg_deductible_heures_supp</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>sort_index</string> </key>
<value> <string>2</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Base CSG déductible heures supplémentaires</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_non_deductible.xml → bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible.xml
View file @ d27fe335
......@@ -10,39 +10,53 @@
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<string>base_amount/base_csg_non_deductible</string>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<key> <string>effective_date</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>base_csg_non_deductible</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
<value> <string>csg_non_deductible</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>sort_index</string> </key>
<value> <string>4</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Base CSG non déductible</string> </value>
......
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/csg_non_deductible_pee.xml 0 → 100644
View file @ d27fe335
<?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>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>effective_date</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>csg_non_deductible_pee</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>sort_index</string> </key>
<value> <string>3</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Base CSG non déductible PEE</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_deductible_heure_supp.xml → bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/prevoyance.xml
View file @ d27fe335
......@@ -10,43 +10,56 @@
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<string>base_amount/base_csg_deductible_heure_supp</string>
<string>base_amount/base_csg_deductible_heure_supp</string>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<key> <string>effective_date</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>base_csg_deductible_heure_supp</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
<value> <string>prevoyance</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>sort_index</string> </key>
<value> <string>7</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Base CSG déductibe heures supp.</string> </value>
<value> <string>Base prévoyance</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/base_csg_non_deductible_pee.xml → bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_patronales.xml
View file @ d27fe335
......@@ -10,43 +10,56 @@
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<string>base_amount/base_csg_non_deductible_pee</string>
<string>base_amount/base_csg_non_deductible_pee</string>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>codification</string> </key>
<key> <string>effective_date</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>base_csg_non_deductible_pee</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
<value> <string>reduc_patronales</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>sort_index</string> </key>
<value> <string>6</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Base CSG non déductibe PEE</string> </value>
<value> <string>Base réduction patronales</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/payroll/l10n/fr/base/reduc_salariales.xml 0 → 100644
View file @ d27fe335
<?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>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>sort_index</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>effective_date</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1261004400.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>reduc_salariales</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>sort_index</string> </key>
<value> <string>5</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Base réduction salariales</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_1.xml
View file @ d27fe335
......@@ -64,25 +64,13 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
<global name="Length" module="BTrees.Length"/>
</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>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......@@ -90,13 +78,7 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_2.xml
View file @ d27fe335
......@@ -64,25 +64,13 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
<global name="Length" module="BTrees.Length"/>
</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>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......@@ -90,13 +78,7 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_a.xml
View file @ d27fe335
......@@ -56,25 +56,13 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
<global name="Length" module="BTrees.Length"/>
</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>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......@@ -82,13 +70,7 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_b.xml
View file @ d27fe335
......@@ -64,25 +64,13 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
<global name="Length" module="BTrees.Length"/>
</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>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......@@ -90,13 +78,7 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......
bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/salary_range/france/tranche_c.xml
View file @ d27fe335
......@@ -64,25 +64,13 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
<global name="Length" module="BTrees.Length"/>
</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>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......@@ -90,13 +78,7 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
<global name="OOBTree" module="BTrees._OOBTree"/>
</pickle>
<pickle>
<none/>
......
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
View file @ d27fe335
......@@ -114,8 +114,9 @@ def getPriceCurrencyId(currency):\n
return s\n
\n
salaire_net_imposable = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/payroll/earning/salary/taxable_net_salary\',\n
base_contribution=\'base_contribution/base_amount/payroll/base/income_tax\',\n
contribution_share=\'contribution_share/employee\')\n
\n
def getTaxableNetPayId(salaire_net_imposable):\n
s = \'\'\n
if salaire_net_imposable:\n
......@@ -176,10 +177,10 @@ def getPaymentConditionText(paysheet):\n
return \'\'\n
\n
gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/payroll/earning/salary/gross_salary\',\n
base_contribution=\'base_contribution/base_amount/payroll/report/salary/gross\',\n
contribution_share=\'contribution_share/employee\')\n
year_to_date_gross_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
paysheet=context, base_contribution_list=\'payroll/earning/salary/gross_salary\') + gross_salary\n
paysheet=context, base_contribution_list=\'payroll/report/salary/gross\') + gross_salary\n
\n
year_to_date_slice_a = context.PaySheetTransaction_getYearToDateSlice(\'salary_range/france/tranche_a\')\n
\n
......@@ -196,13 +197,13 @@ year_to_date_bonus_worked_hour_count = bonus_worked_hour_count + \\\n
context.PaySheetTransaction_getYearToDateOvertimeHours() or 0\n
\n
year_to_date_bonus_worked_hour_amount = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
paysheet=context, base_contribution_list=\'payroll/earning/salary/overtime\') + \\\n
paysheet=context, base_contribution_list=\'payroll/report/overtime\') + \\\n
context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/payroll/earning/salary/overtime\', \\\n
base_contribution=\'base_contribution/base_amount/payroll/report/overtime\', \\\n
contribution_share=\'contribution_share/employee\') or 0\n
\n
year_to_date_taxable_net_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
paysheet=context, base_contribution_list=\'payroll/earning/salary/net_salary\') + salaire_net_imposable\n
paysheet=context, base_contribution_list=\'payroll/report/salary/net\') + salaire_net_imposable\n
\n
def unicodeDict(d):\n
for k, v in d.items():\n
......
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
View file @ d27fe335
......@@ -88,7 +88,7 @@ plafond_max = slice.getQuantityRangeMax()\n
plafond_min = slice.getQuantityRangeMin()\n
\n
gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/gross_salary\',\n
base_contribution=\'base_contribution/base_amount/payroll/report/salary/gross\',\n
contribution_share=\'contribution_share/employee\')\n
\n
if gross_salary < plafond_max:\n
......@@ -106,7 +106,7 @@ for paysheet in paysheet_list :\n
plafond_max = slice.getQuantityRangeMax()\n
plafond_min = slice.getQuantityRangeMin()\n
gross_salary=paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/gross_salary\',\n
base_contribution=\'base_contribution/base_amount/payroll/report/salary/gross\',\n
contribution_share=\'contribution_share/employee\')\n
slice_amount = 0\n
if gross_salary < plafond_max:\n
......
bt5/erp5_payroll_l10n_fr/bt/change_log
View file @ d27fe335
2010-01-04 aurel
Update the bt to use the new structure of the base amount category
2009-09-01 yusuke
* tax_category category is renamed to contribution_share category
......
bt5/erp5_payroll_l10n_fr/bt/revision
View file @ d27fe335
113
\ No newline at end of file
116
\ No newline at end of file
bt5/erp5_payroll_l10n_fr/bt/template_path_list
View file @ d27fe335
portal_categories/base_amount/base_csg
portal_categories/base_amount/base_csg_deductible_heure_supp
portal_categories/base_amount/base_csg_non_deductible
portal_categories/base_amount/base_csg_non_deductible_pee
portal_categories/base_amount/base_forfait_social
portal_categories/base_amount/salaire_net_imposable
portal_categories/base_amount/payroll/l10n/fr
portal_categories/base_amount/payroll/l10n/fr/**
portal_categories/salary_range/france
portal_categories/salary_range/france/tranche_1
portal_categories/salary_range/france/tranche_2
......
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