odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] pass correct magic value for resource 

[FIX] typo

lp bug: https://launchpad.net/bugs/1297352 fixed

bzr revid: hbrunn@therp.nl-20140325151047-6sd0irzu4e85i5ru
This commit is contained in:
Holger Brunn 2014-03-25 16:10:47 +01:00
parent 6bd66db6de
commit 266b553aa8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mrp_operations/mrp_operations.py
View File

@ -279,7 +279,9 @@ class mrp_production(osv.osv):
i = self.pool.get('resource.calendar').interval_get(
cr,
uid,
wc.workcenter_id.calendar_id and wc.workcenter_id.calendar_id.id or False,
#passing False makes resource_resource._schedule_hours
#run 1000 iterations doing nothing
wc.workcenter_id.calendar_id and wc.workcenter_id.calendar_id.id or None,
dt,
wc.hour or 0.0
)

2
addons/resource/resource.py
View File

@ -436,7 +436,7 @@ class resource_calendar(osv.osv):
working_intervals = self.get_working_intervals_of_day(cr, uid, id, **call_args)
if id is None and not working_interval: # no calendar -> consider working 8 hours
if id is None and not working_intervals: # no calendar -> consider working 8 hours
remaining_hours -= 8.0
elif working_intervals:
if backwards: