pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging changes from stable addons

Browse Source 
bzr revid: vinusoft85@gmail.com-20090609042051-uarkzai16e7ei0ue
This commit is contained in:
vra (Tiny)
2009-06-09 09:50:51 +05:30
parent 05eef9dc02 1f93b0aef6
commit ea5574cbaa
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp_operations/mrp_operations.py
+9 -7
View File
@@ -56,14 +56,16 @@ class mrp_production_workcenter_line(osv.osv):
res[op.id]=False
return res
def _get_date_end(self, cr, uid, ids, field_name, arg, context):
res={}
res = {}
for op in self.browse(cr, uid, ids, context=context):
d = DateTime.strptime(op.date_planned,'%Y-%m-%d %H:%M:%S')
i = self.pool.get('hr.timesheet.group').interval_get(cr, uid, op.workcenter_id.timesheet_id.id or False, d, op.hour or 0.0)
if i:
res[op.id] = i[-1][1].strftime('%Y-%m-%d %H:%M:%S')
else:
res[op.id] = op.date_planned
res[op.id]= False
if op.date_planned:
d = DateTime.strptime(op.date_planned,'%Y-%m-%d %H:%M:%S')
i = self.pool.get('hr.timesheet.group').interval_get(cr, uid, op.workcenter_id.timesheet_id.id or False, d, op.hour or 0.0)
if i:
res[op.id] = i[-1][1].strftime('%Y-%m-%d %H:%M:%S')
else:
res[op.id] = op.date_planned
return res
_inherit = 'mrp.production.workcenter.line'
_columns = {