from osv import fields
from osv import osv
-import datetime
import netsvc
import time
-from mx import DateTime
+from datetime import datetime
from tools.translate import _
#----------------------------------------------------------
_columns = {
'move_dest_id_lines': fields.one2many('stock.move','move_dest_id', 'Children Moves')
}
+
+ def copy(self, cr, uid, id, default=None, context=None):
+ if default is None:
+ default = {}
+ default.update({
+ 'move_dest_id_lines': [],
+ })
+ return super(stock_move, self).copy(cr, uid, id, default, context)
+
stock_move()
class mrp_production_workcenter_line(osv.osv):
- def _get_date_date(self, cr, uid, ids, field_name, arg, context):
+ def _get_date_date(self, cr, uid, ids, field_name, arg, context=None):
""" Finds starting date.
@return: Dictionary of values.
"""
else:
res[op.id]=False
return res
-
- def _get_date_end(self, cr, uid, ids, field_name, arg, context):
+
+ def _get_date_end(self, cr, uid, ids, field_name, arg, context=None):
""" Finds ending date.
@return: Dictionary of values.
"""
+ ops = self.browse(cr, uid, ids, context=context)
+ date_and_hours_by_cal = [(op.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops if op.date_planned]
+
+ intervals = self.pool.get('resource.calendar').interval_get_multi(cr, uid, date_and_hours_by_cal)
+
res = {}
- for op in self.browse(cr, uid, ids, context=context):
+ for op in ops:
res[op.id] = False
if op.date_planned:
- d = DateTime.strptime(op.date_planned,'%Y-%m-%d %H:%M:%S')
- i = self.pool.get('resource.calendar').interval_get(cr, uid, op.workcenter_id.calendar_id.id or False, d, op.hour or 0.0)
+ i = intervals.get((op.date_planned, op.hour, op.workcenter_id.calendar_id.id))
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'
_order = "sequence, date_planned"
-
+
_columns = {
'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
help="* When a work order is created it is set in 'Draft' state.\n" \
'date_planned': fields.datetime('Scheduled Date'),
'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
'date_start': fields.datetime('Start Date'),
- 'date_finnished': fields.datetime('End Date'),
+ 'date_finished': fields.datetime('End Date'),
'delay': fields.float('Working Hours',help="This is lead time between operation start and stop in this workcenter",readonly=True),
'production_state':fields.related('production_id','state',
type='selection',
wf_service.trg_validate(uid, 'mrp.production', oper_obj.production_id.id, 'button_produce_done', cr)
return
- def write(self, cr, uid, ids, vals, context={}, update=True):
+ def write(self, cr, uid, ids, vals, context=None, update=True):
result = super(mrp_production_workcenter_line, self).write(cr, uid, ids, vals, context=context)
prod_obj = self.pool.get('mrp.production')
if vals.get('date_planned', False) and update:
date_now = time.strftime('%Y-%m-%d %H:%M:%S')
obj_line = self.browse(cr, uid, ids[0])
- date_start = datetime.datetime.strptime(obj_line.date_start,'%Y-%m-%d %H:%M:%S')
- date_finished = datetime.datetime.strptime(date_now,'%Y-%m-%d %H:%M:%S')
+ date_start = datetime.strptime(obj_line.date_start,'%Y-%m-%d %H:%M:%S')
+ date_finished = datetime.strptime(date_now,'%Y-%m-%d %H:%M:%S')
delay += (date_finished-date_start).days * 24
delay += (date_finished-date_start).seconds / float(60*60)
- self.write(cr, uid, ids, {'state':'done', 'date_finnished': date_now,'delay':delay})
+ self.write(cr, uid, ids, {'state':'done', 'date_finished': date_now,'delay':delay})
self.modify_production_order_state(cr,uid,ids,'done')
return True
'allow_reorder': fields.boolean('Free Serialisation', help="Check this to be able to move independently all production orders, without moving dependent ones."),
}
- def _production_date_end(self, cr, uid, ids, prop, unknow_none, context={}):
+ def _production_date_end(self, cr, uid, ids, prop, unknow_none, context=None):
""" Calculates planned end date of production order.
@return: Dictionary of values
"""
wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_cancel', cr)
return super(mrp_production,self).action_cancel(cr,uid,ids)
- def _compute_planned_workcenter(self, cr, uid, ids, context={}, mini=False):
+ def _compute_planned_workcenter(self, cr, uid, ids, context=None, mini=False):
""" Computes planned and finished dates for work order.
@return: Calculated date
"""
- dt_end = DateTime.now()
+ dt_end = datetime.now()
+ if context is None:
+ context = {}
for po in self.browse(cr, uid, ids, context=context):
- dt_end = DateTime.strptime(po.date_start or po.date_planned, '%Y-%m-%d %H:%M:%S')
+ dt_end = datetime.strptime(po.date_planned, '%Y-%m-%d %H:%M:%S')
if not po.date_start:
self.write(cr, uid, [po.id], {
'date_start': po.date_planned
del context['__last_update']
if (wc.date_planned < dt.strftime('%Y-%m-%d %H:%M:%S')) or mini:
self.pool.get('mrp.production.workcenter.line').write(cr, uid, [wc.id], {
- 'date_planned':dt.strftime('%Y-%m-%d %H:%M:%S')
+ 'date_planned': dt.strftime('%Y-%m-%d %H:%M:%S')
}, context=context, update=False)
i = self.pool.get('resource.calendar').interval_get(
cr,
if i:
dt_end = max(dt_end, i[-1][1])
else:
- dt_end = DateTime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
+ dt_end = datetime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
+
old = wc.sequence or 0
super(mrp_production, self).write(cr, uid, [po.id], {
- 'date_finnished': dt_end
+ 'date_finished': dt_end
})
return dt_end
- def _move_pass(self, cr, uid, ids, context={}):
+ def _move_pass(self, cr, uid, ids, context=None):
""" Calculates start date for stock moves finding interval from resource calendar.
@return: True
"""
- for po in self.browse(cr, uid, ids, context):
+ for po in self.browse(cr, uid, ids, context=context):
if po.allow_reorder:
continue
todo = po.move_lines
- dt = DateTime.strptime(po.date_start,'%Y-%m-%d %H:%M:%S')
+ dt = datetime.strptime(po.date_start,'%Y-%m-%d %H:%M:%S')
while todo:
l = todo.pop(0)
if l.state in ('done','cancel','draft'):
continue
todo += l.move_dest_id_lines
- if l.production_id and (l.production_id.date_finnished > dt):
+ if l.production_id and (l.production_id.date_finished > dt):
if l.production_id.state not in ('done','cancel'):
for wc in l.production_id.workcenter_lines:
i = self.pool.get('resource.calendar').interval_min_get(
self.write(cr, uid, [l.production_id.id], {'date_start':dt.strftime('%Y-%m-%d %H:%M:%S')}, mini=True)
return True
- def _move_futur(self, cr, uid, ids, context={}):
+ def _move_futur(self, cr, uid, ids, context=None):
""" Calculates start date for stock moves.
@return: True
"""
- for po in self.browse(cr, uid, ids, context):
+ for po in self.browse(cr, uid, ids, context=context):
if po.allow_reorder:
continue
for line in po.move_created_ids:
break
if l.production_id.state in ('done','cancel'):
break
- if l.production_id and (l.production_id.date_start < po.date_finnished):
- self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finnished})
+ if l.production_id and (l.production_id.date_start < po.date_finished):
+ self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finished})
break
- def write(self, cr, uid, ids, vals, context={}, update=True, mini=True):
+ def write(self, cr, uid, ids, vals, context=None, update=True, mini=True):
direction = {}
if vals.get('date_start', False):
for po in self.browse(cr, uid, ids, context=context):
operation_ids = self.pool.get('mrp_operations.operation').search(cr, uid, [('production_id','=',ids[0])], context=context)
return operation_ids
- def _get_order_date(self, cr, uid, ids, field_name, arg, context):
+ def _get_order_date(self, cr, uid, ids, field_name, arg, context=None):
""" Calculates planned date for an operation.
@return: Dictionary of values
"""
if not i: continue
if code_lst[i-1] not in ('resume','start'):
continue
- a = datetime.datetime.strptime(time_lst[i-1],'%Y-%m-%d %H:%M:%S')
- b = datetime.datetime.strptime(time_lst[i],'%Y-%m-%d %H:%M:%S')
+ a = datetime.strptime(time_lst[i-1],'%Y-%m-%d %H:%M:%S')
+ b = datetime.strptime(time_lst[i],'%Y-%m-%d %H:%M:%S')
diff += (b-a).days * 24
diff += (b-a).seconds / float(60*60)
return diff
return True
def write(self, cr, uid, ids, vals, context=None):
- oper_objs=self.browse(cr,uid,ids)[0]
+ oper_objs = self.browse(cr, uid, ids, context=context)[0]
vals['production_id']=oper_objs.production_id.id
vals['workcenter_id']=oper_objs.workcenter_id.id
def create(self, cr, uid, vals, context=None):
wf_service = netsvc.LocalService('workflow')
code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
- code=self.pool.get('mrp_operations.operation.code').browse(cr,uid,code_ids)[0]
+ code=self.pool.get('mrp_operations.operation.code').browse(cr, uid, code_ids, context=context)[0]
wc_op_id=self.pool.get('mrp.production.workcenter.line').search(cr,uid,[('workcenter_id','=',vals['workcenter_id']),('production_id','=',vals['production_id'])])
if code.start_stop in ('start','done','pause','cancel','resume'):
if not wc_op_id:
- production_obj=self.pool.get('mrp.production').browse(cr,uid,vals['production_id'])
+ production_obj=self.pool.get('mrp.production').browse(cr, uid, vals['production_id'], context=context)
wc_op_id.append(self.pool.get('mrp.production.workcenter.line').create(cr,uid,{'production_id':vals['production_id'],'name':production_obj.product_id.name,'workcenter_id':vals['workcenter_id']}))
if code.start_stop=='start':
self.pool.get('mrp.production.workcenter.line').action_start_working(cr,uid,wc_op_id)
if code.start_stop=='done':
self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_done', cr)
- self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
+ self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finished':datetime.now().strftime('%Y-%m-%d %H:%M:%S')})
if code.start_stop=='pause':
self.pool.get('mrp.production.workcenter.line').action_pause(cr,uid,wc_op_id)
line_vals['delay'] = delay
if vals.get('date_start',False):
if code.start_stop == 'done':
- line_vals['date_finnished'] = vals['date_start']
+ line_vals['date_finished'] = vals['date_start']
elif code.start_stop == 'start':
line_vals['date_start'] = vals['date_start']
'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'], 10)}),
}
_defaults={
- 'date_start': lambda *a:DateTime.now().strftime('%Y-%m-%d %H:%M:%S')
+ 'date_start': lambda *a:datetime.now().strftime('%Y-%m-%d %H:%M:%S')
}
mrp_operations_operation()
projects / odoo / odoo.git / blobdiff