rename 'date_to_procure' to 'order_release_date'

This commit is contained in:
Jordi Ballester Alomar
2018-07-05 11:36:23 +02:00
committed by JasminSForgeFlow
parent 8daabc2649
commit be9a7a7e22
3 changed files with 15 additions and 14 deletions

View File

@@ -38,9 +38,9 @@ class MrpInventory(models.Model):
initial_on_hand_qty = fields.Float(string='Starting Inventory') initial_on_hand_qty = fields.Float(string='Starting Inventory')
final_on_hand_qty = fields.Float(string='Forecasted Inventory') final_on_hand_qty = fields.Float(string='Forecasted Inventory')
to_procure = fields.Float(string='To procure') to_procure = fields.Float(string='To procure')
date_to_procure = fields.Date( order_release_date = fields.Date(
string="Date to Procure", string="Order Release Date",
compute="_compute_date_to_procure", compute="_compute_order_release_date",
store=True, store=True,
) )
@@ -53,7 +53,7 @@ class MrpInventory(models.Model):
@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') 'mrp_product_id.mrp_area_id.calendar_id')
def _compute_date_to_procure(self): def _compute_order_release_date(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):
delay = 0 delay = 0
@@ -64,11 +64,11 @@ class MrpInventory(models.Model):
# TODO: 'move' supply method # TODO: 'move' supply method
if delay and rec.mrp_area_id.calendar_id: if delay and rec.mrp_area_id.calendar_id:
dt_date = fields.Datetime.from_string(rec.date) dt_date = fields.Datetime.from_string(rec.date)
date_to_procure = rec.mrp_area_id.calendar_id.plan_days( order_release_date = rec.mrp_area_id.calendar_id.plan_days(
-delay - 1, dt_date).date() -delay - 1, dt_date).date()
else: else:
date_to_procure = fields.Date.from_string( order_release_date = fields.Date.from_string(
rec.date) - timedelta(days=delay) rec.date) - timedelta(days=delay)
if date_to_procure < today: if order_release_date < today:
date_to_procure = today order_release_date = today
rec.date_to_procure = date_to_procure rec.order_release_date = order_release_date

View File

@@ -43,7 +43,7 @@
<field name="supply_qty"/> <field name="supply_qty"/>
<field name="final_on_hand_qty"/> <field name="final_on_hand_qty"/>
<field name="to_procure"/> <field name="to_procure"/>
<field name="date_to_procure"/> <field name="order_release_date"/>
<button string="Create Procurement" <button string="Create Procurement"
name="%(mrp_multi_level.act_mrp_inventory_procure)d" name="%(mrp_multi_level.act_mrp_inventory_procure)d"
icon="fa-cogs" type="action" icon="fa-cogs" type="action"
@@ -97,11 +97,11 @@
<filter string="MRP Area" <filter string="MRP Area"
context="{'group_by':'mrp_area_id'}"/> context="{'group_by':'mrp_area_id'}"/>
<filter string="Date to Procure (By Day)" <filter string="Date to Procure (By Day)"
context="{'group_by':'date_to_procure:day'}"/> context="{'group_by':'order_release_date:day'}"/>
<filter string="Date to Procure (By Week)" <filter string="Date to Procure (By Week)"
context="{'group_by':'date_to_procure:week'}"/> context="{'group_by':'order_release_date:week'}"/>
<filter string="Date to Procure (By Month)" <filter string="Date to Procure (By Month)"
context="{'group_by':'date_to_procure:month'}"/> context="{'group_by':'order_release_date:month'}"/>
</group> </group>
</search> </search>
</field> </field>

View File

@@ -224,7 +224,8 @@ class MultiLevelMrp(models.TransientModel):
if calendar and mrp_product_id.mrp_lead_time: if calendar and mrp_product_id.mrp_lead_time:
date_str = fields.Date.to_string(mrp_date) date_str = fields.Date.to_string(mrp_date)
dt = fields.Datetime.from_string(date_str) dt = fields.Datetime.from_string(date_str)
res = calendar.plan_days(-1 * mrp_product_id.mrp_lead_time -1, dt) res = calendar.plan_days(
-1 * mrp_product_id.mrp_lead_time - 1, dt)
mrp_action_date = res.date() mrp_action_date = res.date()
else: else:
mrp_action_date = mrp_date - timedelta( mrp_action_date = mrp_date - timedelta(