[Erp5-report] r27898 - in /erp5/trunk/products/ERP5: Document/ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jul 3 11:56:22 CEST 2009
Author: luke
Date: Fri Jul 3 11:56:22 2009
New Revision: 27898
URL: http://svn.erp5.org?rev=27898&view=rev
Log:
- it is needed to set causality link to Business Process from Simulation Movement, so revert partially 27727 (test) and fully 27690 (implementation)
Modified:
erp5/trunk/products/ERP5/Document/TradeModelRule.py
erp5/trunk/products/ERP5/tests/testBPMCore.py
Modified: erp5/trunk/products/ERP5/Document/TradeModelRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeModelRule.py?rev=27898&r1=27897&r2=27898&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TradeModelRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TradeModelRule.py [utf8] Fri Jul 3 11:56:22 2009
@@ -98,6 +98,9 @@
else:
movement_dict['start_date'] = movement.getStartDate()
movement_dict['stop_date'] = movement.getStopDate()
+
+ movement_dict['causality_value'] = business_path
+
return movement_dict
def _getStaticPropertyDict(self, context_movement):
Modified: erp5/trunk/products/ERP5/tests/testBPMCore.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBPMCore.py?rev=27898&r1=27897&r2=27898&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBPMCore.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testBPMCore.py [utf8] Fri Jul 3 11:56:22 2009
@@ -637,6 +637,11 @@
)
self.assertEqual(
+ business_path_discounting,
+ trade_model_simulation_movement_discount_complex.getCausalityValue()
+ )
+
+ self.assertEqual(
price_currency,
trade_model_simulation_movement_discount_complex \
.getPriceCurrencyValue()
@@ -673,6 +678,11 @@
)
self.assertEqual(
+ business_path_taxing,
+ trade_model_simulation_movement_tax_complex.getCausalityValue()
+ )
+
+ self.assertEqual(
price_currency,
trade_model_simulation_movement_tax_complex.getPriceCurrencyValue()
)
@@ -727,6 +737,11 @@
)
self.assertEqual(
+ business_path_discounting,
+ trade_model_simulation_movement_discount_only.getCausalityValue()
+ )
+
+ self.assertEqual(
price_currency,
trade_model_simulation_movement_discount_only.getPriceCurrencyValue()
)
@@ -754,6 +769,11 @@
self.assertEqual(trade_model_simulation_movement_discount_only. \
getTotalPrice() * self.default_tax_ratio,
trade_model_simulation_movement_tax_only.getTotalPrice())
+
+ self.assertEqual(
+ business_path_taxing,
+ trade_model_simulation_movement_tax_only.getCausalityValue()
+ )
self.assertEqual(
price_currency,
@@ -794,6 +814,11 @@
trade_model_simulation_movement.getParentValue().getParentValue() \
.getTotalPrice() * self.default_tax_ratio,
trade_model_simulation_movement.getTotalPrice()
+ )
+
+ self.assertEqual(
+ business_path,
+ trade_model_simulation_movement.getCausalityValue()
)
self.assertEqual(
More information about the Erp5-report
mailing list