diff --git a/product/ERP5/Document/DeliveryRule.py b/product/ERP5/Document/DeliveryRule.py index 5fe4f2b9de4ac634aa131a18c6fd8e97c60b4e99..1a37ea22bb6727459cf03915f2bcc761ca1ce2cd 100644 --- a/product/ERP5/Document/DeliveryRule.py +++ b/product/ERP5/Document/DeliveryRule.py @@ -122,9 +122,11 @@ class DeliveryRule(Rule): source=deliv_mvt.getSource(), source_section=deliv_mvt.getSourceSection(), source_function=deliv_mvt.getSourceFunction(), + source_account=deliv_mvt.getSourceAccount(), destination=deliv_mvt.getDestination(), destination_section=deliv_mvt.getDestinationSection(), destination_function=deliv_mvt.getDestinationFunction(), + destination_account=deliv_mvt.getDestinationAccount(), start_date=deliv_mvt.getStartDate(), stop_date=deliv_mvt.getStopDate(), @@ -152,9 +154,11 @@ class DeliveryRule(Rule): source=deliv_mvt.getSource(), source_section=deliv_mvt.getSourceSection(), source_function=deliv_mvt.getSourceFunction(), + source_account=deliv_mvt.getSourceAccount(), destination=deliv_mvt.getDestination(), destination_section=deliv_mvt.getDestinationSection(), destination_function=deliv_mvt.getDestinationFunction(), + destination_account=deliv_mvt.getDestinationAccount(), start_date=deliv_mvt.getStartDate(), stop_date=deliv_mvt.getStopDate(), diff --git a/product/ERP5/Document/InvoicingRule.py b/product/ERP5/Document/InvoicingRule.py index d24599a3ba642210480cf6a34304d070bf825447..6c6e6a5826fb587e7c21a6f42a0fd416b5d6691e 100644 --- a/product/ERP5/Document/InvoicingRule.py +++ b/product/ERP5/Document/InvoicingRule.py @@ -95,6 +95,7 @@ class InvoicingRule(Rule): 'source_project': context_movement.getSourceProject(), 'source_function': context_movement.getSourceFunction(), 'source_payment': context_movement.getSourcePayment(), + 'source_account': context_movement.getSourceAccount(), 'destination': context_movement.getDestination(), 'destination_section': context_movement.getDestinationSection(), 'destination_decision': context_movement.getDestinationDecision(), @@ -102,6 +103,7 @@ class InvoicingRule(Rule): 'destination_project': context_movement.getDestinationProject(), 'destination_function': context_movement.getDestinationFunction(), 'destination_payment': context_movement.getDestinationPayment(), + 'destination_account': context_movement.getDestinationAccount(), 'start_date': context_movement.getStartDate(), 'stop_date': context_movement.getStopDate(), 'description': context_movement.getDescription(''), diff --git a/product/ERP5/Document/OrderRule.py b/product/ERP5/Document/OrderRule.py index 11fbe2b432bbb4d982099812ca4bfdd2b68a81e3..dffb6e1deb183921feaa4b3bc51c85321c40bc8c 100644 --- a/product/ERP5/Document/OrderRule.py +++ b/product/ERP5/Document/OrderRule.py @@ -176,9 +176,11 @@ class OrderRule(DeliveryRule): 'source', 'source_section', 'source_function', + 'source_account', 'destination', 'destination_section', 'destination_function', + 'destination_account', 'start_date', 'stop_date', 'description', diff --git a/product/ERP5/PropertySheet/Arrow.py b/product/ERP5/PropertySheet/Arrow.py index 0aad7af3f1d7d8ef54fbad81edb96edf27acff3e..0f8500dffe474f0715b83acf3f23bf5a2287f8eb 100644 --- a/product/ERP5/PropertySheet/Arrow.py +++ b/product/ERP5/PropertySheet/Arrow.py @@ -810,6 +810,7 @@ class Arrow: 'source_project', 'destination_project', 'source_carrier', 'destination_carrier', 'source_referral', 'destination_referral', + 'source_account', 'destination_account', # Virtual categories 'source_region', 'destination_region', ) diff --git a/product/ERP5/PropertySheet/DefaultSupply.py b/product/ERP5/PropertySheet/DefaultSupply.py index 9e1991c9947e0039eb9d7285afdb51153d3024d3..eaaa34bf0b922bfa0f56ec6a73e3333570fdd24e 100644 --- a/product/ERP5/PropertySheet/DefaultSupply.py +++ b/product/ERP5/PropertySheet/DefaultSupply.py @@ -65,7 +65,8 @@ class DefaultSupply: 'start_date_range_max', 'start_date_range_min', 'comment', 'source_reference', - 'p_variation_base_category_list'), + 'p_variation_base_category_list', + 'destination_account'), 'mode' : 'w' }, # Define default sale supply line { 'id' : 'sale_supply_line', @@ -83,7 +84,8 @@ class DefaultSupply: 'start_date_range_max', 'start_date_range_min', 'comment', 'destination_reference', - 'p_variation_base_category_list'), + 'p_variation_base_category_list', + 'source_account'), 'mode' : 'w' }, ) diff --git a/product/ERP5/TargetSolver/SplitAndDefer.py b/product/ERP5/TargetSolver/SplitAndDefer.py index d08004509a09c43a1c1078dc85a64c7f4210f2a7..f7e27bfe7f102e3be5fcbe29ecac4768000ee621 100644 --- a/product/ERP5/TargetSolver/SplitAndDefer.py +++ b/product/ERP5/TargetSolver/SplitAndDefer.py @@ -80,6 +80,9 @@ class SplitAndDefer(CopyToTarget): destination_section=simulation_movement.getDestinationSection(), source_function=simulation_movement.getSourceFunction(), destination_function=simulation_movement.getDestinationFunction(), + source_account=simulation_movement.getSourceAccount(), + destination_account=simulation_movement.getDestinationAccount(), + variation_category_list=simulation_movement.getVariationCategoryList(), variation_property_dict=simulation_movement.getVariationPropertyDict(),