Skip to content

erp5
erp5
Commit 3c3c5645 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

2009-02-16 jerome 

* copy source_account and destination_account from supply line on delivery lines, and enable this for divergence on invoice lines.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25586 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6c418d7c
Show whitespace changes
Inline Side-by-side
Showing with 744 additions and 6 deletions
bt5/erp5_invoicing/CategoryTemplateItem/portal_categories/destination_account.xml 0 → 100644
View file @ 3c3c5645
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>destination_account</string>
</tuple>
</value>
</item>
<item>
<key> <string>category_type</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>destination_account</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>multimembership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>read_permission</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>rid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Account</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/CategoryTemplateItem/portal_categories/source_account.xml 0 → 100644
View file @ 3c3c5645
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>destination_account</string>
<string>source_account</string>
</tuple>
</value>
</item>
<item>
<key> <string>category_type</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>source_account</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>multimembership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>read_permission</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>rid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Account</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule/default_category_tester.xml
View file @ 3c3c5645
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
<string>aggregate | Aggregate</string> <string>aggregate | Aggregate</string>
<string>price_currency | Price Currency</string> <string>price_currency | Price Currency</string>
<string>base_contribution | Base Contribution</string> <string>base_contribution | Base Contribution</string>
<string>source_account | Source Account</string>
<string>destination_account | Destination Account</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ 3c3c5645
<workflow_chain> <workflow_chain>
<chain> <chain>
<type>Invoice Cell</type> <type>Invoice Cell</type>
<workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, tax_interaction_workflow, pricing_interaction_workflow</workflow> <workflow>pricing_interaction_workflow, delivery_movement_account_interaction_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, tax_interaction_workflow, edit_workflow</workflow>
</chain> </chain>
<chain> <chain>
<type>Invoice Line</type> <type>Invoice Line</type>
<workflow>delivery_movement_simulation_interaction_workflow, tax_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow> <workflow>delivery_movement_simulation_interaction_workflow, delivery_movement_account_interaction_workflow, pricing_interaction_workflow, tax_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
</chain> </chain>
<chain> <chain>
<type>Invoice Transaction Rule</type> <type>Invoice Transaction Rule</type>
<workflow>rule_interaction_workflow, rule_validation_workflow, edit_workflow</workflow> <workflow>edit_workflow, rule_interaction_workflow, rule_validation_workflow</workflow>
</chain> </chain>
<chain> <chain>
<type>Invoicing Rule</type> <type>Invoicing Rule</type>
<workflow>rule_validation_workflow, edit_workflow</workflow> <workflow>edit_workflow, rule_validation_workflow</workflow>
</chain> </chain>
<chain> <chain>
<type>Purchase Invoice Transaction</type> <type>Purchase Invoice Transaction</type>
<workflow>delivery_tax_interaction_workflow</workflow> <workflow>delivery_tax_interaction_workflow</workflow>
</chain> </chain>
<chain>
<type>Purchase Order Cell</type>
<workflow>delivery_movement_account_interaction_workflow</workflow>
</chain>
<chain>
<type>Purchase Order Line</type>
<workflow>delivery_movement_account_interaction_workflow</workflow>
</chain>
<chain> <chain>
<type>Sale Invoice Transaction</type> <type>Sale Invoice Transaction</type>
<workflow>delivery_tax_interaction_workflow</workflow> <workflow>delivery_tax_interaction_workflow</workflow>
</chain> </chain>
<chain>
<type>Sale Order Cell</type>
<workflow>delivery_movement_account_interaction_workflow</workflow>
</chain>
<chain>
<type>Sale Order Line</type>
<workflow>delivery_movement_account_interaction_workflow</workflow>
</chain>
<chain> <chain>
<type>Tax Rule</type> <type>Tax Rule</type>
<workflow>edit_workflow, rule_validation_workflow</workflow> <workflow>edit_workflow, rule_validation_workflow</workflow>
......
bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow.xml 0 → 100644
View file @ 3c3c5645
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>delivery_movement_account_interaction_workflow</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/interactions.xml 0 → 100644
View file @ 3c3c5645
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Interaction" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_mapping</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>interactions</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/interactions/copySourceAndDestinationAccount.xml 0 → 100644
View file @ 3c3c5645
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>activate_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value>
<list>
<string>copySourceAndDestinationAccount</string>
</list>
</value>
</item>
<item>
<key> <string>before_commit_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>copySourceAndDestinationAccount</string> </value>
</item>
<item>
<key> <string>method_id</string> </key>
<value>
<list>
<string>_setResource.*</string>
</list>
</value>
</item>
<item>
<key> <string>once_per_transaction</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type_filter</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/scripts.xml 0 → 100644
View file @ 3c3c5645
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Scripts" module="Products.DCWorkflow.Scripts"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_mapping</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>scripts</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/scripts/copySourceAndDestinationAccount.xml 0 → 100644
View file @ 3c3c5645
<?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>line = sci[\'object\']\n
\n
searchPredicateList = line.getPortalObject().portal_domains.searchPredicateList\n
\n
for predicate in searchPredicateList(\n
context=line, portal_type=\'Purchase Supply Line\'):\n
if predicate.getDestinationAccount():\n
line.setDestinationAccount(predicate.getDestinationAccount())\n
break\n
\n
for predicate in searchPredicateList(\n
context=line, portal_type=\'Sale Supply Line\'):\n
if predicate.getSourceAccount():\n
line.setSourceAccount(predicate.getSourceAccount())\n
break\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>sci</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>sci</string>
<string>_getitem_</string>
<string>line</string>
<string>_getattr_</string>
<string>searchPredicateList</string>
<string>_getiter_</string>
<string>predicate</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>copySourceAndDestinationAccount</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/variables.xml 0 → 100644
View file @ 3c3c5645
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Variables" module="Products.DCWorkflow.Variables"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_mapping</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>variables</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/worklists.xml 0 → 100644
View file @ 3c3c5645
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Worklists" module="Products.DCWorkflow.Worklists"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_mapping</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>worklists</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_invoicing/bt/change_log
View file @ 3c3c5645
2009-02-16 jerome
* copy source_account and destination_account from supply line on delivery lines, and enable this for divergence on invoice lines.
2009-02-12 yusei 2009-02-12 yusei
* Invoice Line can now contain Invoice Line. This is useful if we want to make a invoice which collect all orders from divisions in one company and list up invoice line per each division. * Invoice Line can now contain Invoice Line. This is useful if we want to make a invoice which collect all orders from divisions in one company and list up invoice line per each division.
......
bt5/erp5_invoicing/bt/revision
View file @ 3c3c5645
209 213
\ No newline at end of file \ No newline at end of file
bt5/erp5_invoicing/bt/template_base_category_list
View file @ 3c3c5645
destination_account
invoice_transmission_mode invoice_transmission_mode
source_account
\ No newline at end of file
bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list
View file @ 3c3c5645
Invoice Cell | delivery_movement_account_interaction_workflow
Invoice Cell | delivery_movement_causality_interaction_workflow Invoice Cell | delivery_movement_causality_interaction_workflow
Invoice Cell | delivery_movement_simulation_interaction_workflow Invoice Cell | delivery_movement_simulation_interaction_workflow
Invoice Cell | edit_workflow Invoice Cell | edit_workflow
Invoice Cell | pricing_interaction_workflow Invoice Cell | pricing_interaction_workflow
Invoice Cell | tax_interaction_workflow Invoice Cell | tax_interaction_workflow
Invoice Line | delivery_movement_account_interaction_workflow
Invoice Line | delivery_movement_causality_interaction_workflow Invoice Line | delivery_movement_causality_interaction_workflow
Invoice Line | delivery_movement_simulation_interaction_workflow Invoice Line | delivery_movement_simulation_interaction_workflow
Invoice Line | edit_workflow Invoice Line | edit_workflow
...@@ -15,6 +17,10 @@ Invoice Transaction Rule | rule_validation_workflow ...@@ -15,6 +17,10 @@ Invoice Transaction Rule | rule_validation_workflow
Invoicing Rule | edit_workflow Invoicing Rule | edit_workflow
Invoicing Rule | rule_validation_workflow Invoicing Rule | rule_validation_workflow
Purchase Invoice Transaction | delivery_tax_interaction_workflow Purchase Invoice Transaction | delivery_tax_interaction_workflow
Purchase Order Cell | delivery_movement_account_interaction_workflow
Purchase Order Line | delivery_movement_account_interaction_workflow
Sale Invoice Transaction | delivery_tax_interaction_workflow Sale Invoice Transaction | delivery_tax_interaction_workflow
Sale Order Cell | delivery_movement_account_interaction_workflow
Sale Order Line | delivery_movement_account_interaction_workflow
Tax Rule | edit_workflow Tax Rule | edit_workflow
Tax Rule | rule_validation_workflow Tax Rule | rule_validation_workflow
\ No newline at end of file
bt5/erp5_invoicing/bt/template_workflow_id_list
View file @ 3c3c5645
delivery_movement_account_interaction_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