main #7
@@ -122,11 +122,9 @@ class Component(metaclass=PoolMeta):
|
|||||||
if self.line.del_period:
|
if self.line.del_period:
|
||||||
pm = PM(self.line.del_period)
|
pm = PM(self.line.del_period)
|
||||||
if pm:
|
if pm:
|
||||||
logger.info("DELMONTHDATE:%s",pm.beg_date)
|
|
||||||
return pm.beg_date
|
return pm.beg_date
|
||||||
|
|
||||||
def getEstimatedTriggerPurchase(self,t):
|
def getEstimatedTriggerPurchase(self,t):
|
||||||
logger.info("GETTRIGGER:%s",t)
|
|
||||||
if t == 'delmonth':
|
if t == 'delmonth':
|
||||||
return self.getDelMonthDatePurchase()
|
return self.getDelMonthDatePurchase()
|
||||||
PE = Pool().get('pricing.estimated')
|
PE = Pool().get('pricing.estimated')
|
||||||
@@ -187,7 +185,6 @@ class Summary(ModelSQL,ModelView):
|
|||||||
if pc.price_index:
|
if pc.price_index:
|
||||||
PI = Pool().get('price.price')
|
PI = Pool().get('price.price')
|
||||||
pi = PI(pc.price_index)
|
pi = PI(pc.price_index)
|
||||||
logger.info("PURCHASECURRENCY:%s",self.line.purchase.currency)
|
|
||||||
return pi.get_price(Date.today(),self.line.unit,self.line.purchase.currency,True)
|
return pi.get_price(Date.today(),self.line.unit,self.line.purchase.currency,True)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@@ -1357,7 +1354,7 @@ class Line(metaclass=PoolMeta):
|
|||||||
for t in self.terms:
|
for t in self.terms:
|
||||||
grade = self.get_element_grade(self.assay_state,t.element)
|
grade = self.get_element_grade(self.assay_state,t.element)
|
||||||
logger.info("GRADE:%s",grade)
|
logger.info("GRADE:%s",grade)
|
||||||
if grade:
|
if grade != None:
|
||||||
payable_price = Decimal(0)
|
payable_price = Decimal(0)
|
||||||
penalty_price = Decimal(0)
|
penalty_price = Decimal(0)
|
||||||
if t.penalty_rules:
|
if t.penalty_rules:
|
||||||
|
|||||||
Reference in New Issue
Block a user