[Erp5-report] r25584 - in /erp5/trunk/products/ERP5: Document/ PropertySheet/ TargetSolver/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Feb 16 18:42:17 CET 2009
Author: jerome
Date: Mon Feb 16 18:42:15 2009
New Revision: 25584
URL: http://svn.erp5.org?rev=25584&view=rev
Log:
Add source_account and destination_account, and propagate it in simulation
Modified:
erp5/trunk/products/ERP5/Document/DeliveryRule.py
erp5/trunk/products/ERP5/Document/InvoicingRule.py
erp5/trunk/products/ERP5/Document/OrderRule.py
erp5/trunk/products/ERP5/PropertySheet/Arrow.py
erp5/trunk/products/ERP5/PropertySheet/DefaultSupply.py
erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py
Modified: erp5/trunk/products/ERP5/Document/DeliveryRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryRule.py?rev=25584&r1=25583&r2=25584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] Mon Feb 16 18:42:15 2009
@@ -122,9 +122,11 @@
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 @@
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(),
Modified: erp5/trunk/products/ERP5/Document/InvoicingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoicingRule.py?rev=25584&r1=25583&r2=25584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoicingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InvoicingRule.py [utf8] Mon Feb 16 18:42:15 2009
@@ -95,6 +95,7 @@
'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 @@
'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(''),
Modified: erp5/trunk/products/ERP5/Document/OrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderRule.py?rev=25584&r1=25583&r2=25584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderRule.py [utf8] Mon Feb 16 18:42:15 2009
@@ -176,9 +176,11 @@
'source',
'source_section',
'source_function',
+ 'source_account',
'destination',
'destination_section',
'destination_function',
+ 'destination_account',
'start_date',
'stop_date',
'description',
Modified: erp5/trunk/products/ERP5/PropertySheet/Arrow.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Arrow.py?rev=25584&r1=25583&r2=25584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Arrow.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Arrow.py [utf8] Mon Feb 16 18:42:15 2009
@@ -810,6 +810,7 @@
'source_project', 'destination_project',
'source_carrier', 'destination_carrier',
'source_referral', 'destination_referral',
+ 'source_account', 'destination_account',
# Virtual categories
'source_region', 'destination_region',
)
Modified: erp5/trunk/products/ERP5/PropertySheet/DefaultSupply.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/DefaultSupply.py?rev=25584&r1=25583&r2=25584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/DefaultSupply.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/DefaultSupply.py [utf8] Mon Feb 16 18:42:15 2009
@@ -65,7 +65,8 @@
'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 @@
'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' },
)
Modified: erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py?rev=25584&r1=25583&r2=25584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py [utf8] (original)
+++ erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py [utf8] Mon Feb 16 18:42:15 2009
@@ -80,6 +80,9 @@
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(),
More information about the Erp5-report
mailing list