Skip to content

erp5
erp5
Commit 4d0f5b50 authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

2009-06-10 fabien 

* Payroll Service is now replaced by Service
* add system preference view for payroll

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27484 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 212d0fed
Hide whitespace changes
Inline Side-by-side
Showing with 522 additions and 293 deletions
bt5/erp5_payroll/ActionTemplateItem/portal_types/System%20Preference/payroll_preference.xml 0 → 100644
View file @ 4d0f5b50
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>payroll_preference</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>8.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/SystemPreference_viewPayroll</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ 4d0f5b50
......@@ -32,9 +32,6 @@
<item>Pay Sheet Model Ratio Line</item>
<item>Payment Condition</item>
</portal_type>
<portal_type id="Payroll Service Module">
<item>Payroll Service</item>
</portal_type>
<portal_type id="Preference">
<item>Pay Sheet Transaction</item>
</portal_type>
......
bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @ 4d0f5b50
......@@ -26,10 +26,7 @@
<item>quantity_unit</item>
<item>specialise</item>
</portal_type>
<portal_type id="Payroll Service">
<portal_type id="Service">
<item>base_amount</item>
</portal_type>
<portal_type id="Payroll Service Module">
<item>business_application</item>
</portal_type>
</base_category_list>
\ No newline at end of file
bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Employment%20Contract%20Module.xml
View file @ 4d0f5b50
......@@ -92,7 +92,7 @@
An ERP5 Binder document class will eventually be defined\n
in order to implement a binder of documents which can itself\n
be categorized.\n
</string> </value>
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
......
bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ 4d0f5b50
......@@ -5,15 +5,15 @@
</chain>
<chain>
<type>Pay Sheet Cell</type>
<workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow>
<workflow>edit_workflow, delivery_movement_simulation_interaction_workflow, delivery_movement_causality_interaction_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Line</type>
<workflow>edit_workflow, delivery_movement_simulation_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow</workflow>
<workflow>delivery_movement_simulation_interaction_workflow, edit_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Model</type>
<workflow>paysheet_model_interaction_workflow, validation_workflow, edit_workflow</workflow>
<workflow>edit_workflow, paysheet_model_interaction_workflow, validation_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Model Line</type>
......@@ -21,14 +21,10 @@
</chain>
<chain>
<type>Pay Sheet Transaction</type>
<workflow>delivery_causality_interaction_workflow, delivery_simulation_interaction_workflow, delivery_causality_workflow, edit_workflow, accounting_workflow</workflow>
<workflow>delivery_causality_interaction_workflow, edit_workflow, delivery_simulation_interaction_workflow, accounting_workflow, delivery_causality_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Transaction Line</type>
<workflow>delivery_movement_simulation_interaction_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Payroll Service</type>
<workflow>edit_workflow, validation_workflow</workflow>
<workflow>delivery_movement_causality_interaction_workflow, edit_workflow, delivery_movement_simulation_interaction_workflow</workflow>
</chain>
</workflow_chain>
\ No newline at end of file
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_mirror_section.xml
View file @ 4d0f5b50
......@@ -13,9 +13,9 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>default</string>
<string>items</string>
<string>title</string>
</list>
</value>
</item>
......@@ -88,6 +88,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_field</string> </value>
......@@ -96,13 +100,19 @@
<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>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service Provider</string> </value>
<value> <string>Service Provider</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_resource.xml
View file @ 4d0f5b50
......@@ -13,11 +13,10 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>required</string>
<string>editable</string>
<string>default</string>
<string>editable</string>
<string>items</string>
<string>required</string>
</list>
</value>
</item>
......@@ -90,17 +89,27 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_field</string> </value>
<value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
<value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>required</string> </key>
......@@ -110,10 +119,6 @@
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service</string> </value>
</item>
</dictionary>
</value>
</item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_mirror_section.xml
View file @ 4d0f5b50
......@@ -13,8 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>items</string>
<string>title</string>
</list>
</value>
</item>
......@@ -89,13 +89,19 @@
<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>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service Provider</string> </value>
<value> <string>Service Provider</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_resource.xml
View file @ 4d0f5b50
......@@ -13,9 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>required</string>
<string>items</string>
<string>required</string>
</list>
</value>
</item>
......@@ -84,11 +83,17 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_field</string> </value>
<value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
<value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>required</string> </key>
......@@ -98,10 +103,6 @@
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service</string> </value>
</item>
</dictionary>
</value>
</item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_resource_title.xml
View file @ 4d0f5b50
......@@ -13,9 +13,6 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>portal_type</string>
<string>items</string>
<string>enabled</string>
</list>
</value>
......@@ -72,12 +69,6 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
......@@ -90,32 +81,21 @@
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
<key> <string>field_id</string> </key>
<value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Payroll Service</string>
<string>Payroll Service</string>
</tuple>
</list>
</value>
<key> <string>form_id</string> </key>
<value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Resource</string> </value>
</item>
</dictionary>
</value>
</item>
......@@ -138,20 +118,4 @@
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>REQUEST/relation_item_list</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml
View file @ 4d0f5b50
......@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>description</string>
<string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>description</string>
<string>portal_type</string>
<string>proxy_listbox_ids</string>
<string>title</string>
</list>
</value>
</item>
......@@ -127,7 +127,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service Provider</string> </value>
<value> <string>Service Provider</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_resource_title.xml
View file @ 4d0f5b50
......@@ -12,11 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>allow_jump</string>
<string>portal_type</string>
</list>
<list/>
</value>
</item>
<item>
......@@ -76,10 +72,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>allow_jump</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>default_module</string> </key>
<value> <string>service</string> </value>
......@@ -102,23 +94,12 @@
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>DeliveryCell_viewFieldLibrary</string> </value>
<value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>not_viewable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Payroll Service</string>
<string>Payroll Service</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>read_only</string> </key>
<value> <int>0</int> </value>
......@@ -127,10 +108,6 @@
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Resource</string> </value>
</item>
<item>
<key> <string>viewable_permission</string> </key>
<value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_source_title.xml
View file @ 4d0f5b50
......@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>description</string>
<string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>description</string>
<string>portal_type</string>
<string>proxy_listbox_ids</string>
<string>title</string>
</list>
</value>
</item>
......@@ -151,7 +151,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service Provider</string> </value>
<value> <string>Service Provider</string> </value>
</item>
<item>
<key> <string>viewable_permission</string> </key>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml
View file @ 4d0f5b50
......@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>description</string>
<string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list>
<list/>
</value>
</item>
<item>
......@@ -79,56 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>base_category</string> </key>
<value> <string>resource</string> </value>
</item>
<item>
<key> <string>catalog_index</string> </key>
<value> <string>title</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The Payroll Service used.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value>
<value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Payroll Service</string>
<string>Payroll Service</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value>
<list>
<tuple>
<string>PayrollServiceModule_viewPayrollServiceList/listbox</string>
<string>Payroll Services</string>
</tuple>
</list>
</value>
<value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service</string> </value>
</item>
</dictionary>
</value>
</item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml
View file @ 4d0f5b50
......@@ -12,13 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>catalog_index</string>
<string>title</string>
<string>display_width</string>
<string>portal_type</string>
<string>base_category</string>
</list>
<list/>
</value>
</item>
<item>
......@@ -78,45 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>base_category</string> </key>
<value> <string>resource</string> </value>
</item>
<item>
<key> <string>catalog_index</string> </key>
<value> <string>title</string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>35</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value>
<value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Payroll Service</string>
<string>Payroll Service</string>
</tuple>
</list>
</value>
<value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service</string> </value>
</item>
</dictionary>
</value>
</item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml
View file @ 4d0f5b50
......@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>description</string>
<string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>description</string>
<string>portal_type</string>
<string>proxy_listbox_ids</string>
<string>title</string>
</list>
</value>
</item>
......@@ -132,7 +132,7 @@ This can be the tax authority for taxes, or the employee for wages.</string> </v
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service Provider</string> </value>
<value> <string>Service Provider</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml
View file @ 4d0f5b50
......@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>description</string>
<string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list>
<list/>
</value>
</item>
<item>
......@@ -79,56 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>base_category</string> </key>
<value> <string>resource</string> </value>
</item>
<item>
<key> <string>catalog_index</string> </key>
<value> <string>title</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The Payroll Service used.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value>
<value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Payroll Service</string>
<string>Payroll Service</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value>
<list>
<tuple>
<string>PayrollServiceModule_viewPayrollServiceList/listbox</string>
<string>Payroll Services</string>
</tuple>
</list>
</value>
<value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service</string> </value>
</item>
</dictionary>
</value>
</item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
View file @ 4d0f5b50
......@@ -97,7 +97,7 @@
</tuple>
<tuple>
<string>resource_title</string>
<string>Payroll Service</string>
<string>Service</string>
</tuple>
<tuple>
<string>calculation_script_id</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
View file @ 4d0f5b50
......@@ -116,7 +116,7 @@ for model_line in model_line_list:\n
model_line.getBaseApplicationTitleList()]\n
base_name = \'+\'.join(base_list)\n
\n
payroll_service = model_line.getResourceValue()\n
service = model_line.getResourceValue()\n
base_contribution_list = model_line.getBaseContributionList()\n
\n
price = cell.getPrice()\n
......@@ -158,7 +158,7 @@ for model_line in model_line_list:\n
\'model_line\': model_line.getRelativeUrl(),\n
\'base_contribution_list\':base_contribution_list,\n
\'base_application_list\': base_application_list,\n
\'service_id\':payroll_service.getId()}\n
\'service_id\':service.getId()}\n
object_dict[salary_range].update(share_dict)\n
\n
# if the slice already exists, just update the share\n
......@@ -289,7 +289,7 @@ return line_list\n
<string>base_application</string>
<string>base_list</string>
<string>base_name</string>
<string>payroll_service</string>
<string>service</string>
<string>base_contribution_list</string>
<string>price</string>
<string>_write_</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
View file @ 4d0f5b50
......@@ -86,7 +86,7 @@ for line in line_list:\n
\'group\' : line.getSourceSectionTitle(),\n
\'source_section_title\': line.getSourceSectionTitle(),\n
\'title\' : line.getTitle(),\n
\'payroll_service\' : getattr(line, \'payroll_service\', None),\n
\'service\' : getattr(line, \'service\', None),\n
\'employer_share_total_price\' : getattr(line, \'employer_share_total_price\', None),\n
\'employee_share_total_price\' : getattr(line, \'employee_share_total_price\', None),\n
}\n
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml
View file @ 4d0f5b50
......@@ -66,7 +66,7 @@ editable_column_list = [(\'base\', \'Base\'),]\n
\n
not_editable_column_list = [(\'int_index\', \'PaySheet Order\'),\n
(\'title\', \'Title\'),\n
(\'source_section_title\', \'Payroll Service Provider\'),\n
(\'source_section_title\', \'Service Provider\'),\n
(\'slice\', \'Slice\'),]\n
\n
if not editable:\n
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
View file @ 4d0f5b50
......@@ -56,7 +56,7 @@
<value> <string>\'\'\'\n
This script return a Pay Sheet Line list with some new parameters on\n
each Pay Sheet Line (like base, base_name, base_contribution_list,\n
payroll_service,...)\n
service,...)\n
It\'s used in the PaySheetTransaction_view to display PaySheetLines\n
\'\'\'\n
\n
......@@ -80,7 +80,7 @@ for paysheet_line in paysheet_line_list:\n
base_application_list = paysheet_line.getBaseApplicationTitleList()\n
translated_base_application_list = [str(translateString(x)) for x in base_application_list]\n
base_application_list = \', \'.join(translated_base_application_list)\n
payroll_service = paysheet_line.getResourceValue(portal_type=\'Payroll Service\')\n
service = paysheet_line.getResourceValue(portal_type=\'Service\')\n
base_contribution_list = paysheet_line.getBaseContributionList()\n
causality = paysheet_line.getCausality()\n
\n
......@@ -104,8 +104,8 @@ for paysheet_line in paysheet_line_list:\n
\'base\':paysheet_line.getTotalPrice(),\n
\'base_contribution_list\':base_contribution_list,\n
\'base_application_list\': base_application_list,\n
\'payroll_service\': payroll_service is not None and\\\n
payroll_service.getId() or \'\',\n
\'service\': service is not None and\\\n
service.getId() or \'\',\n
\'causality\': causality,}\n
line_list.append(paysheet_line.asContext(**params))\n
continue\n
......@@ -147,8 +147,8 @@ for paysheet_line in paysheet_line_list:\n
\'base\':base,\n
\'base_contribution_list\':base_contribution_list,\n
\'base_application_list\': base_application_list,\n
\'payroll_service\': payroll_service is not None and\\\n
payroll_service.getId() or \'\',\n
\'service\': service is not None and\\\n
service.getId() or \'\',\n
\'causality\': causality,}\n
object_dict[slice].update(share_dict)\n
else:\n
......@@ -254,7 +254,7 @@ return line_list\n
<string>x</string>
<string>str</string>
<string>translated_base_application_list</string>
<string>payroll_service</string>
<string>service</string>
<string>base_contribution_list</string>
<string>causality</string>
<string>base_application</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml
View file @ 4d0f5b50
......@@ -114,7 +114,7 @@
</tuple>
<tuple>
<string>source_section_title</string>
<string>Payroll Service Provider</string>
<string>Service Provider</string>
</tuple>
</list>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml
View file @ 4d0f5b50
......@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable_columns</string>
<string>title</string>
<string>selection_name</string>
<string>columns</string>
<string>description</string>
<string>editable_columns</string>
<string>portal_types</string>
<string>selection_name</string>
<string>title</string>
</list>
</value>
</item>
......@@ -97,7 +97,7 @@
</tuple>
<tuple>
<string>source_title</string>
<string>Payroll Service Provider</string>
<string>Service Provider</string>
</tuple>
<tuple>
<string>quantity</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_resource_title.xml
View file @ 4d0f5b50
......@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>catalog_index</string>
<string>description</string>
<string>base_category</string>
<string>parameter_list</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
<string>title</string>
</list>
</value>
</item>
......@@ -60,6 +60,14 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>catalog_index</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -68,10 +76,28 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>parameter_list</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
......@@ -79,10 +105,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>base_category</string> </key>
<value> <string>resource</string> </value>
</item>
<item>
<key> <string>catalog_index</string> </key>
<value> <string>title</string> </value>
......@@ -93,7 +115,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The Payroll Service used.</string> </value>
<value> <string>The Service used.</string> </value>
</item>
<item>
<key> <string>editable_permission</string> </key>
......@@ -119,13 +141,19 @@
<key> <string>not_viewable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>parameter_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Payroll Service</string>
<string>Payroll Service</string>
<string>Service</string>
<string>Service</string>
</tuple>
</list>
</value>
......@@ -135,8 +163,8 @@
<value>
<list>
<tuple>
<string>PayrollServiceModule_viewPayrollServiceList/listbox</string>
<string>Payroll Services</string>
<string>ServiceModule_viewServiceList/listbox</string>
<string>Services</string>
</tuple>
</list>
</value>
......@@ -151,7 +179,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Service</string> </value>
<value> <string>Service</string> </value>
</item>
<item>
<key> <string>viewable_permission</string> </key>
......@@ -171,4 +199,20 @@
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [(\'use_uid\', [here.portal_categories.resolveCategory(x).getUid() for x in here.portal_preferences.getPreferredPayrollResourceUseCategoryList()])]</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SystemPreference_viewPayroll.xml 0 → 100644
View file @ 4d0f5b50
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Base_edit</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>my_preferred_payroll_resource_use_category_list</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SystemPreference_viewPayroll</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>SystemPreference_viewBPM</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_view</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>BPM</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SystemPreference_viewPayroll/my_preferred_payroll_resource_use_category_list.xml 0 → 100644
View file @ 4d0f5b50
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>items</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_preferred_payroll_resource_use_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_multi_list_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</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>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payroll Resource Use Categories</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: getattr(here.portal_categories.use, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\', base=1)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/bt/change_log
View file @ 4d0f5b50
2009-06-10 fabien
* Payroll Service is now replaced by Service
2009-05-18 yusei
* Fix some proxy fields. count_method should not be inherited from template field and proxy_listbox_ids had to be copied to new proxified fields but it was not copied.
......
bt5/erp5_payroll/bt/revision
View file @ 4d0f5b50
452
\ No newline at end of file
459
\ No newline at end of file
bt5/erp5_payroll/bt/template_action_path_list
View file @ 4d0f5b50
......@@ -29,5 +29,4 @@ Pay Sheet Transaction | view
Pay Sheet Transaction | view_payment
Pay Sheet Transaction | view_profile
Pay Sheet Transaction | view_ratio_settings
Payroll Service Module | view
Payroll Service | view
\ No newline at end of file
System Preference | payroll_preference
\ No newline at end of file
bt5/erp5_payroll/bt/template_module_id_list
View file @ 4d0f5b50
payroll_service_module
paysheet_model_module
\ No newline at end of file
bt5/erp5_payroll/bt/template_portal_type_allowed_content_type_list
View file @ 4d0f5b50
......@@ -15,5 +15,4 @@ Pay Sheet Transaction | Pay Sheet Model Line
Pay Sheet Transaction | Pay Sheet Model Ratio Line
Pay Sheet Transaction | Pay Sheet Transaction Line
Pay Sheet Transaction | Payment Condition
Payroll Service Module | Payroll Service
Preference | Pay Sheet Transaction
\ No newline at end of file
bt5/erp5_payroll/bt/template_portal_type_base_category_list
View file @ 4d0f5b50
......@@ -13,5 +13,4 @@ Pay Sheet Model Slice | salary_range
Pay Sheet Model Slice | tax_category
Pay Sheet Transaction | quantity_unit
Pay Sheet Transaction | specialise
Payroll Service Module | business_application
Payroll Service | base_amount
\ No newline at end of file
Service | base_amount
\ No newline at end of file
bt5/erp5_payroll/bt/template_portal_type_id_list
View file @ 4d0f5b50
......@@ -10,6 +10,4 @@ Pay Sheet Model Module
Pay Sheet Model Ratio Line
Pay Sheet Model Slice
Pay Sheet Transaction
Pay Sheet Transaction Line
Payroll Service
Payroll Service Module
\ No newline at end of file
Pay Sheet Transaction Line
\ No newline at end of file
bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list
View file @ 4d0f5b50
......@@ -18,6 +18,4 @@ Pay Sheet Transaction | accounting_workflow
Pay Sheet Transaction | delivery_causality_interaction_workflow
Pay Sheet Transaction | delivery_causality_workflow
Pay Sheet Transaction | delivery_simulation_interaction_workflow
Pay Sheet Transaction | edit_workflow
Payroll Service | edit_workflow
Payroll Service | validation_workflow
\ No newline at end of file
Pay Sheet Transaction | edit_workflow
\ No newline at end of file
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