mirror of
https://github.com/OCA/manufacture.git
synced 2025-01-28 16:37:15 +02:00
change date_to_procure to consider working calendar
This commit is contained in:
committed by
davidborromeo
parent
ccbae558f2
commit
4e189e9034
@@ -51,7 +51,8 @@ class MrpInventory(models.Model):
|
|||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
@api.depends('mrp_product_id', 'mrp_product_id.main_supplierinfo_id',
|
@api.depends('mrp_product_id', 'mrp_product_id.main_supplierinfo_id',
|
||||||
'mrp_product_id.mrp_lead_time')
|
'mrp_product_id.mrp_lead_time',
|
||||||
|
'mrp_product_id.mrp_area_id.calendar_id')
|
||||||
def _compute_date_to_procure(self):
|
def _compute_date_to_procure(self):
|
||||||
today = date.today()
|
today = date.today()
|
||||||
for rec in self.filtered(lambda r: r.date):
|
for rec in self.filtered(lambda r: r.date):
|
||||||
@@ -61,8 +62,13 @@ class MrpInventory(models.Model):
|
|||||||
elif rec.mrp_product_id.supply_method == 'manufacture':
|
elif rec.mrp_product_id.supply_method == 'manufacture':
|
||||||
delay = rec.mrp_product_id.mrp_lead_time
|
delay = rec.mrp_product_id.mrp_lead_time
|
||||||
# TODO: 'move' supply method
|
# TODO: 'move' supply method
|
||||||
date_to_procure = fields.Date.from_string(
|
if delay and rec.mrp_area_id.calendar_id:
|
||||||
rec.date) - timedelta(days=delay)
|
dt_date = fields.Datetime.from_string(rec.date)
|
||||||
|
date_to_procure = rec.mrp_area_id.calendar_id.plan_days(
|
||||||
|
-delay - 1, dt_date).date()
|
||||||
|
else:
|
||||||
|
date_to_procure = fields.Date.from_string(
|
||||||
|
rec.date) - timedelta(days=delay)
|
||||||
if date_to_procure < today:
|
if date_to_procure < today:
|
||||||
date_to_procure = today
|
date_to_procure = today
|
||||||
rec.date_to_procure = date_to_procure
|
rec.date_to_procure = date_to_procure
|
||||||
|
|||||||
Reference in New Issue
Block a user