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

[IMP]Improved code of onchange. 

bzr revid: psa@tinyerp.com-20121207100329-te2a7ff8qgnv6xtl
This commit is contained in:
Paramjit Singh Sahota 2012-12-07 15:33:29 +05:30
parent 68a1b5c238
commit a347798d7e
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/mrp_operations/mrp_operations.py
View File

@ -52,14 +52,13 @@ stock_move()
class mrp_production_workcenter_line(osv.osv):
def _calculate_end_date(self, cr, uid, ids, date_planned, cycle, hour, workcenter_id, context=None):
def _calculate_end_date(self, cr, uid, date_planned, hour, calendar_id, context=None):
if not date_planned:
return False
ops = self.browse(cr, uid, ids, context=context)
date_and_hours_by_cal =[ (date_planned, hour, workcenter_id)]
date_and_hours_by_cal =[ (date_planned, hour, calendar_id)]
intervals = self.pool.get('resource.calendar').interval_get_multi(cr, uid, date_and_hours_by_cal)
if intervals:
i = intervals.get((date_planned, hour, workcenter_id))
i = intervals.get((date_planned, hour, calendar_id))
if i:
res = i[-1][1].strftime('%Y-%m-%d %H:%M:%S')
else:
@ -75,21 +74,16 @@ class mrp_production_workcenter_line(osv.osv):
for op in ops:
res[op.id] = False
if op.date_planned:
res[op.id] = self._calculate_end_date(cr, uid, ids, op.date_planned, op.cycle, op.hour, op.workcenter_id.calendar_id.id)
res[op.id] = self._calculate_end_date(cr, uid, op.date_planned, op.hour, op.workcenter_id.calendar_id.id)
else:
res[op.id] = op.date_planned
return res
def onchange_get_date_end(self, cr, uid, ids, workcenter_id, context=None):
res = {'value':{}}
work_ids = self.search(cr,uid,[('workcenter_id','=',workcenter_id)],context=context)
ops = self.browse(cr, uid, work_ids, context=context)
for op in ops:
res['date_planned_end'] = False
if op.date_planned:
res['date_planned_end'] = self._calculate_end_date(cr, uid, ids, op.date_planned, op.cycle, op.hour, op.workcenter_id.calendar_id.id)
else:
res['date_planned_end'] = op.date_planned
def onchange_date_planned(self, cr, uid, ids, date_planned, hour, workcenter_id, context=None):
res = {}
if workcenter_id:
workcenter = self.pool.get("mrp.workcenter").browse(cr, uid, workcenter_id, context=context)
res['date_planned_end'] = self._calculate_end_date(cr, uid, date_planned, hour, workcenter.calendar_id.id)
return {'value': res}
def onchange_production_id(self, cr, uid, ids, production_id, context=None):

8
addons/mrp_operations/mrp_operations_view.xml
View File

@ -75,7 +75,7 @@
<sheet string="Work Orders">
<group col="4">
<field colspan="2" name="name"/>
<field name="workcenter_id"/>
<field name="workcenter_id" on_change="onchange_date_planned(date_planned, hour, workcenter_id, context)"/>
<field name="production_id" on_change="onchange_production_id(production_id)"/>
<field name="production_state"/>
<field name="sequence"/>
@ -84,13 +84,13 @@
<page string="Information">
<group>
<group string="Planned Date">
<field name="date_planned" on_change="onchange_get_date_end(date_planned, cycle, hour)"/>
<field name="date_planned" on_change="onchange_date_planned(date_planned, hour, workcenter_id, context)"/>
<field name="date_planned_end"/>
</group>
<group string="Duration">
<field name="cycle" on_change="onchange_get_date_end(date_planned, cycle, hour)"/>
<field name="hour" widget="float_time" on_change="onchange_get_date_end(date_planned, cycle, hour)"/>
<field name="cycle"/>
<field name="hour" widget="float_time" on_change="onchange_date_planned(date_planned, hour, workcenter_id, context)"/>
</group>
<group string="Actual Production Date" >
<field name="date_start" readonly="1"/>