Commit 428a697f authored by Jérome Perrin's avatar Jérome Perrin

Add source_account and destination_account, and propagate it in simulation


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25584 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5ebd0673
......@@ -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(),
......
......@@ -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(''),
......
......@@ -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',
......
......@@ -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',
)
......
......@@ -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' },
)
......
......@@ -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(),
......
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