[Erp5-report] r28045 - /erp5/trunk/products/ERP5/Document/TradeModelLine.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jul 9 16:44:47 CEST 2009
Author: fabien
Date: Thu Jul 9 16:44:44 2009
New Revision: 28045
URL: http://svn.erp5.org?rev=28045&view=rev
Log:
get script on model only if model_line parent is instance of TradeCondition
Modified:
erp5/trunk/products/ERP5/Document/TradeModelLine.py
Modified: erp5/trunk/products/ERP5/Document/TradeModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeModelLine.py?rev=28045&r1=28044&r2=28045&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TradeModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TradeModelLine.py [utf8] Thu Jul 9 16:44:44 2009
@@ -34,6 +34,7 @@
from Products.ERP5.Document.Amount import Amount
from Products.ERP5.Document.Predicate import Predicate
from Products.ERP5.AggregatedAmountList import AggregatedAmountList
+from Products.ERP5.Document.TradeCondition import TradeCondition
import zope.interface
def isMovement(document):
@@ -89,8 +90,9 @@
script_name = self.getCalculationScriptId()
if script_name is None:
# if model line script is None, get the default model script
- model = self.getParentValue()
- script_name = model.getCalculationScriptId()
+ if isinstance(self.getParentValue(), TradeCondition):
+ # if parent is a TradeCondition
+ script_name = self.getParentValue().getCalculationScriptId()
if script_name is None:
return None
script = getattr(context, script_name, None)
More information about the Erp5-report
mailing list