[Erp5-report] r38333 jerome - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/e...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Sep 14 10:06:10 2010
New Revision: 38333

URL: http://svn.erp5.org?rev=38333&view=rev
Log:
Ignore supply line that does not define a price, as suggested by Yoshinori
(this fixes test_CreateCELWithNoBasePrice)

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml?rev=38333&r1=38332&r2=38333&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml [utf8] Tue Sep 14 10:06:10 2010
@@ -88,7 +88,7 @@ else:\n
   # with the reference currency\n
   for predicate in predicate_list:\n
     operand_dict = predicate.Resource_getPriceCalculationOperandDict(movement=predicate, **kw)\n
-    if operand_dict is not None:\n
+    if operand_dict is not None and operand_dict.get(\'price\'):\n
       return operand_dict\n
 
 

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=38333&r1=38332&r2=38333&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Tue Sep 14 10:06:10 2010
@@ -1 +1 @@
-835
\ No newline at end of file
+836
\ No newline at end of file