From 10a8ee2d81916d4a65bb8a358f447eac100cb81c Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Tue, 16 Sep 2008 19:53:14 +0000 Subject: [PATCH] 2008-09-16 Kazuhiko * revise pay_sheet_transaction_builder using new API. * use delivery_causality_workflow instead of invoice_causality_workflow in Pay Sheet Transaction. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23655 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../pay_sheet_transaction_builder.xml | 44 +------ .../category_movement_group_on_delivery.xml | 54 ++++++++ .../category_movement_group_on_line.xml | 57 +++++++++ .../property_movement_group_on_delivery.xml | 55 ++++++++ ...e_causality_movement_group_on_delivery.xml | 45 +++++++ .../workflow_chain_type.xml | 2 +- .../PaySheetModel_getRuleReference.xml | 121 ++++++++++++++++++ .../PaySheetTransaction_getRuleReference.xml | 119 +++++++++++++++++ bt5/erp5_payroll/bt/change_log | 4 + bt5/erp5_payroll/bt/revision | 2 +- bt5/erp5_payroll/bt/template_path_list | 3 +- .../template_portal_type_workflow_chain_list | 2 +- 12 files changed, 464 insertions(+), 44 deletions(-) create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/category_movement_group_on_delivery.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/category_movement_group_on_line.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/property_movement_group_on_delivery.xml create mode 100644 bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/root_applied_rule_causality_movement_group_on_delivery.xml create mode 100644 bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_getRuleReference.xml create mode 100644 bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getRuleReference.xml diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml index b209d3a908..7f53ebfd9d 100644 --- a/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml +++ b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml @@ -9,12 +9,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_count</string> </key> <value> @@ -27,12 +21,6 @@ <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> @@ -146,7 +134,7 @@ </item> <item> <key> <string>last_id</string> </key> - <value> <string>1</string> </value> + <value> <string>2</string> </value> </item> <item> <key> <string>portal_type</string> </key> @@ -166,36 +154,18 @@ <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> + <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/> @@ -203,13 +173,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/> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/category_movement_group_on_delivery.xml b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/category_movement_group_on_delivery.xml new file mode 100644 index 0000000000..5c347e1bc3 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/category_movement_group_on_delivery.xml @@ -0,0 +1,54 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>divergence_scope/category</string> + <string>collect_order_group/delivery</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>category_movement_group_on_delivery</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>2</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category Movement Group</string> </value> + </item> + <item> + <key> <string>tested_property</string> </key> + <value> + <tuple> + <string>resource</string> + </tuple> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>category_movement_group_on_delivery</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/category_movement_group_on_line.xml b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/category_movement_group_on_line.xml new file mode 100644 index 0000000000..45ac39d44c --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/category_movement_group_on_line.xml @@ -0,0 +1,57 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>divergence_scope/category</string> + <string>collect_order_group/line</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>category_movement_group_on_line</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Category Movement Group</string> </value> + </item> + <item> + <key> <string>tested_property</string> </key> + <value> + <tuple> + <string>source</string> + <string>destination</string> + <string>source_section</string> + <string>destination_section</string> + </tuple> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>category_movement_group_on_line</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/property_movement_group_on_delivery.xml b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/property_movement_group_on_delivery.xml new file mode 100644 index 0000000000..0b3b538898 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/property_movement_group_on_delivery.xml @@ -0,0 +1,55 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>divergence_scope/property</string> + <string>collect_order_group/delivery</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>property_movement_group_on_delivery</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Property Movement Group</string> </value> + </item> + <item> + <key> <string>tested_property</string> </key> + <value> + <tuple> + <string>start_date</string> + <string>stop_date</string> + </tuple> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>property_movement_group_on_delivery</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/root_applied_rule_causality_movement_group_on_delivery.xml b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/root_applied_rule_causality_movement_group_on_delivery.xml new file mode 100644 index 0000000000..365ad744c7 --- /dev/null +++ b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder/root_applied_rule_causality_movement_group_on_delivery.xml @@ -0,0 +1,45 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="RootAppliedRuleCausalityMovementGroup" module="Products.ERP5Type.Document.RootAppliedRuleCausalityMovementGroup"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>collect_order_group/delivery</string> + </tuple> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>root_applied_rule_causality_movement_group_on_delivery</string> </value> + </item> + <item> + <key> <string>int_index</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Root Applied Rule Causality Movement Group</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>root_applied_rule_causality_movement_group_on_delivery</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index b30b068431..f9e601c9dd 100644 --- a/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -17,7 +17,7 @@ </chain> <chain> <type>Pay Sheet Transaction</type> - <workflow>invoice_causality_workflow, edit_workflow, delivery_causality_interaction_workflow, delivery_simulation_interaction_workflow, accounting_workflow</workflow> + <workflow>edit_workflow, delivery_causality_interaction_workflow, delivery_simulation_interaction_workflow, accounting_workflow, delivery_causality_workflow</workflow> </chain> <chain> <type>Pay Sheet Transaction Line</type> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_getRuleReference.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_getRuleReference.xml new file mode 100644 index 0000000000..f91f6b43ed --- /dev/null +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_getRuleReference.xml @@ -0,0 +1,121 @@ +<?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>Script_magic</string> </key> + <value> <int>3</int> </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>return None\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></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>0</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>None</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>PaySheetModel_getRuleReference</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getRuleReference.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getRuleReference.xml new file mode 100644 index 0000000000..0a93495e1a --- /dev/null +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getRuleReference.xml @@ -0,0 +1,119 @@ +<?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>Script_magic</string> </key> + <value> <int>3</int> </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>return \'default_invoice_rule\'\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></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>0</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <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>PaySheetTransaction_getRuleReference</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index 2cabef756b..cab3b6e921 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,3 +1,7 @@ +2008-09-16 Kazuhiko +* revise pay_sheet_transaction_builder using new API. +* use delivery_causality_workflow instead of invoice_causality_workflow in Pay Sheet Transaction. + 2008-09-04 yusei * Update English messages. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 272a4581e9..059361f246 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -316 \ No newline at end of file +317 \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/template_path_list b/bt5/erp5_payroll/bt/template_path_list index 5f1c4ce050..6283023fc0 100644 --- a/bt5/erp5_payroll/bt/template_path_list +++ b/bt5/erp5_payroll/bt/template_path_list @@ -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_deliveries/pay_sheet_transaction_builder \ No newline at end of file +portal_deliveries/pay_sheet_transaction_builder +portal_deliveries/pay_sheet_transaction_builder/** \ No newline at end of file diff --git a/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list b/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list index a86787ad07..f1211c4302 100644 --- a/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list @@ -13,8 +13,8 @@ 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_causality_workflow Pay Sheet Transaction | delivery_simulation_interaction_workflow Pay Sheet Transaction | edit_workflow -Pay Sheet Transaction | invoice_causality_workflow Payroll Service | edit_workflow Payroll Service | validation_workflow \ No newline at end of file -- 2.30.9