admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

23.03.26

Browse Source
This commit is contained in:
laurentbarontini
2026-03-23 11:18:58 +01:00
parent 062ca10340
commit 0e76aa6312
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/price/price.py
View File

@@ -71,7 +71,6 @@ class Price(
def get_price(self,dt,unit,currency,last=False): def get_price(self,dt,unit,currency,last=False):
price = float(0) price = float(0)
PV = Pool().get('price.price_value') PV = Pool().get('price.price_value')
logger.info("ASKED_PRICE_FOR:%s",dt)
if self.price_values: if self.price_values:
dt = dt.strftime("%Y-%m-%d") dt = dt.strftime("%Y-%m-%d")
pv = PV.search([('price','=',self.id),('price_date','=',dt)]) pv = PV.search([('price','=',self.id),('price_date','=',dt)])
@@ -115,7 +114,6 @@ class Calendar(DeactivableMixin,ModelSQL,ModelView,MultiValueMixin):
dt = dt.strftime("%Y-%m-%d") dt = dt.strftime("%Y-%m-%d")
cl = CL.search([('calendar','=',self.id),('price_date','=',dt)]) cl = CL.search([('calendar','=',self.id),('price_date','=',dt)])
if cl: if cl:
#logger.info("ISQUOTE:%s",cl)
return False return False
else: else:
return True return True

8
modules/purchase_trade/pricing.py
View File

@@ -423,14 +423,11 @@ class Trigger(ModelSQL,ModelView):
pp = PP(self.application_period) pp = PP(self.application_period)
CO = Pool().get('pricing.component') CO = Pool().get('pricing.component')
co = CO(self.component) co = CO(self.component)
logger.info("DELDATEEST_:%s",co)
if co.line: if co.line:
d = co.getEstimatedTriggerPurchase(pp.trigger) d = co.getEstimatedTriggerPurchase(pp.trigger)
else: else:
d = co.getEstimatedTriggerSale(pp.trigger) d = co.getEstimatedTriggerSale(pp.trigger)
logger.info("DELDATEEST:%s",d)
date_from,date_to,dates = pp.getDates(d) date_from,date_to,dates = pp.getDates(d)
logger.info("DELDATEEST2:%s",dates)
return date_from,date_to,d,pp.include,dates return date_from,date_to,d,pp.include,dates
def getApplicationListDates(self, cal): def getApplicationListDates(self, cal):
@@ -536,8 +533,6 @@ class Period(ModelSQL,ModelView):
date_from = None date_from = None
date_to = None date_to = None
dates = [] dates = []
logger.info("GETDATES:%s",t)
logger.info("GETDATES:%s",self.every)
if t: if t:
if self.every: if self.every:
if t: if t:
@@ -554,21 +549,18 @@ class Period(ModelSQL,ModelView):
while current.month == t.month: while current.month == t.month:
dates.append(datetime.datetime(current.year, current.month, current.day)) dates.append(datetime.datetime(current.year, current.month, current.day))
current += datetime.timedelta(days=7) current += datetime.timedelta(days=7)
logger.info("GETDATES:%s",dates)
elif self.nb_quotation > 0: elif self.nb_quotation > 0:
days_to_add = (weekday_target - t.weekday()) % 7 days_to_add = (weekday_target - t.weekday()) % 7
current = t + datetime.timedelta(days=days_to_add) current = t + datetime.timedelta(days=days_to_add)
while len(dates) < self.nb_quotation: while len(dates) < self.nb_quotation:
dates.append(datetime.datetime(current.year, current.month, current.day)) dates.append(datetime.datetime(current.year, current.month, current.day))
current += datetime.timedelta(days=7) current += datetime.timedelta(days=7)
logger.info("GETDATES:%s",dates)
elif self.nb_quotation < 0: elif self.nb_quotation < 0:
days_to_sub = (t.weekday() - weekday_target) % 7 days_to_sub = (t.weekday() - weekday_target) % 7
current = t - datetime.timedelta(days=days_to_sub) current = t - datetime.timedelta(days=days_to_sub)
while len(dates) < -self.nb_quotation: while len(dates) < -self.nb_quotation:
dates.append(datetime.datetime(current.year, current.month, current.day)) dates.append(datetime.datetime(current.year, current.month, current.day))
current -= datetime.timedelta(days=7) current -= datetime.timedelta(days=7)
logger.info("GETDATES:%s",dates)
else: else:
if self.startday == 'before': if self.startday == 'before':