From ff9a7525c40e32d3d382be194ccc15459a802003 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 24 Jan 2009 14:13:29 +0100 Subject: [PATCH] bugfix bzr revid: fp@tinyerp.com-20090124131329-635ywxv5i4hdsh16 --- addons/hr_holidays/security/ir.model.access.csv | 2 +- addons/mrp/mrp.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index 77d0bc559cd..5af36ab580e 100644 --- a/addons/hr_holidays/security/ir.model.access.csv +++ b/addons/hr_holidays/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_holidays_log","hr.holidays.log","model_hr_holidays_log_access","hr.group_hr_user",1,1,1,1 +"access_hr_holidays_log","hr.holidays.log","model_hr_holidays_log","hr.group_hr_user",1,1,1,1 "access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1 "access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1 diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index e6bb1dc66c9..be31827a2d9 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -283,13 +283,14 @@ class mrp_bom(osv.osv): for wc_use in bom.routing_id.workcenter_lines: wc = wc_use.workcenter_id d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle) - cycle = (d + (m and 1.0 or 0.0)) * wc_use.cycle_nbr + mult = (d + (m and 1.0 or 0.0)) + cycle = mult * wc_use.cycle_nbr result2.append({ 'name': bom.routing_id.name, 'workcenter_id': wc.id, 'sequence': level+(wc_use.sequence or 0), 'cycle': cycle, - 'hour': float(wc_use.hour_nbr + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)), + 'hour': float(wc_use.hour_nbr*mult + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)), }) for bom2 in bom.bom_lines: res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10)