[Erp5-report] r21587 - in /erp5/trunk/bt5/erp5_payroll: PathTemplateItem/portal_deliveries/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 13 16:44:14 CEST 2008
Author: jerome
Date: Fri Jun 13 16:44:13 2008
New Revision: 21587
URL: http://svn.erp5.org?rev=21587&view=rev
Log:
Add interaction workflows to have simulation from pay sheets.
Add a builder to create accounting lines.
Add a script used to generate prevision in invoice transaction rule to use the employee as section for employee share; see TestPayroll.test_AccountingLineGeneration for example of use.
Added:
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/
erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SimulationMovement_generatePrevisionForEmployeeSharePaySheetMovement.xml
Modified:
erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
erp5/trunk/bt5/erp5_payroll/bt/template_path_list
erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list
Added: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml?rev=21587&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml Fri Jun 13 16:44:13 2008
@@ -1,0 +1,218 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>OrderMovementGroup</string>
+ <string>PathMovementGroup</string>
+ <string>DateMovementGroup</string>
+ <string>ResourceMovementGroup</string>
+ <string>VariantMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order_list</string> </key>
+ <value>
+ <list>
+ <string>test</string>
+ <string>test2</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order_list_id</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>comment</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_after_generation_method_id</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_after_generation_script_id</string> </key>
+ <value> <string>AccountingTransaction_roundDebitCredit</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_collect_order</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_portal_type</string> </key>
+ <value> <string>Pay Sheet Cell</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_separate_order</string> </key>
+ <value>
+ <tuple>
+ <string>calculateAddQuantity</string>
+ <string>calculateAveragePrice</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>DateMovementGroup</string>
+ <string>ResourceMovementGroup</string>
+ <string>RootAppliedRuleCausalityMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_line_collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>PathMovementGroup</string>
+ <string>SectionPathMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_line_portal_type</string> </key>
+ <value> <string>Pay Sheet Transaction Line</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_module</string> </key>
+ <value> <string>accounting_module</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_portal_type</string> </key>
+ <value> <string>Pay Sheet Transaction</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_select_method_id</string> </key>
+ <value> <string>InvoiceTransaction_selectDelivery</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Build Accounting Lines on Pay Sheets</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>pay_sheet_transaction_builder</string> </value>
+ </item>
+ <item>
+ <key> <string>last_id</string> </key>
+ <value> <string>1</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Delivery Builder</string> </value>
+ </item>
+ <item>
+ <key> <string>resource_portal_type</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_select_method_id</string> </key>
+ <value> <string>PaySheetTransaction_selectMovement</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Pay Sheet Transaction Builder</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=21587&r1=21586&r2=21587&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml Fri Jun 13 16:44:13 2008
@@ -1,11 +1,11 @@
<workflow_chain>
<chain>
<type>Pay Sheet Cell</type>
- <workflow>edit_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</workflow>
+ <workflow>delivery_movement_simulation_interaction_workflow, edit_workflow, delivery_movement_causality_interaction_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Model</type>
@@ -17,14 +17,14 @@
</chain>
<chain>
<type>Pay Sheet Transaction</type>
- <workflow>invoice_causality_workflow, edit_workflow, accounting_workflow</workflow>
+ <workflow>invoice_causality_workflow, edit_workflow, delivery_causality_interaction_workflow, delivery_simulation_interaction_workflow, accounting_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Transaction Line</type>
- <workflow>edit_workflow</workflow>
+ <workflow>delivery_movement_causality_interaction_workflow, edit_workflow, delivery_movement_simulation_interaction_workflow</workflow>
</chain>
<chain>
<type>Payroll Service</type>
- <workflow>validation_workflow, edit_workflow</workflow>
+ <workflow>edit_workflow, validation_workflow</workflow>
</chain>
</workflow_chain>
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SimulationMovement_generatePrevisionForEmployeeSharePaySheetMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SimulationMovement_generatePrevisionForEmployeeSharePaySheetMovement.xml?rev=21587&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SimulationMovement_generatePrevisionForEmployeeSharePaySheetMovement.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SimulationMovement_generatePrevisionForEmployeeSharePaySheetMovement.xml Fri Jun 13 16:44:13 2008
@@ -1,0 +1,149 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <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>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>property_dict[\'source_section\'] = context.getDestination()\n
+return property_dict\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>property_dict</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>property_dict</string>
+ <string>_getattr_</string>
+<string>context</string>
+ <string>_write_</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>SimulationMovement_generatePrevisionForEmployeeSharePaySheetMovement</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </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=21587&r1=21586&r2=21587&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Fri Jun 13 16:44:13 2008
@@ -1,1 +1,1 @@
-277
+285
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=21587&r1=21586&r2=21587&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/template_path_list (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/template_path_list Fri Jun 13 16:44:13 2008
@@ -11,4 +11,5 @@
portal_categories/base_amount/total_deductions
portal_categories/base_amount/total_income
portal_categories/tax_category/employee_share
-portal_categories/tax_category/employer_share
+portal_categories/tax_category/employer_share
+portal_deliveries/pay_sheet_transaction_builder
Modified: erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list?rev=21587&r1=21586&r2=21587&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list Fri Jun 13 16:44:13 2008
@@ -1,10 +1,18 @@
+Pay Sheet Cell | delivery_movement_causality_interaction_workflow
+Pay Sheet Cell | delivery_movement_simulation_interaction_workflow
Pay Sheet Cell | edit_workflow
+Pay Sheet Line | delivery_movement_causality_interaction_workflow
+Pay Sheet Line | delivery_movement_simulation_interaction_workflow
Pay Sheet Line | edit_workflow
Pay Sheet Model Line | edit_workflow
Pay Sheet Model | edit_workflow
Pay Sheet Model | validation_workflow
+Pay Sheet Transaction Line | delivery_movement_causality_interaction_workflow
+Pay Sheet Transaction Line | delivery_movement_simulation_interaction_workflow
Pay Sheet Transaction Line | edit_workflow
Pay Sheet Transaction | accounting_workflow
+Pay Sheet Transaction | delivery_causality_interaction_workflow
+Pay Sheet Transaction | delivery_simulation_interaction_workflow
Pay Sheet Transaction | edit_workflow
Pay Sheet Transaction | invoice_causality_workflow
Payroll Service | edit_workflow
More information about the Erp5-report
mailing list