# -*- encoding: utf-8 -*-
##############################################################################
#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# This program is free software: you can redistribute it and/or modify
from mx import DateTime
import time
+
class mrp_procurement(osv.osv):
_inherit = 'mrp.procurement'
+
def _procure_confirm(self, cr, uid, ids=None, use_new_cursor=False, context=None):
'''
use_new_cursor: False or the dbname
'''
if not context:
- context={}
+ context = {}
if use_new_cursor:
cr = pooler.get_db(use_new_cursor).cursor()
procurement_obj = self.pool.get('mrp.procurement')
if not ids:
- ids=procurement_obj.search(cr,uid,[], order="date_planned")
+ ids = procurement_obj.search(cr, uid, [], order="date_planned")
for id in ids:
wf_service.trg_validate(uid, 'mrp.procurement', id, 'button_restart', cr)
if use_new_cursor:
report_except = 0
report_later = 0
while True:
- cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by date_planned limit 500 offset %d', ('confirmed','make_to_order',offset))
- ids = map(lambda x:x[0], cr.fetchall())
+ cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
+ ids = map(lambda x: x[0], cr.fetchall())
for proc in procurement_obj.browse(cr, uid, ids):
- if maxdate.strftime('%Y-%m-%d')>=proc.date_planned:
+ if (maxdate.strftime('%Y-%m-%d')>=proc.date_planned):
wf_service.trg_validate(uid, 'mrp.procurement', proc.id, 'button_check', cr)
else:
- offset+=1
+ offset += 1
report_later += 1
for proc in procurement_obj.browse(cr, uid, ids):
if proc.state == 'exception':
ids = []
while True:
report_ids = []
- ids = self.pool.get('mrp.procurement').search(cr, uid, [('state','=','confirmed'),('procure_method','=','make_to_stock')], offset=offset)
+ ids = self.pool.get('mrp.procurement').search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset)
for proc in procurement_obj.browse(cr, uid, ids):
- if (maxdate).strftime('%Y-%m-%d') >= proc.date_planned:
+ if ((maxdate).strftime('%Y-%m-%d') >= proc.date_planned) :
wf_service.trg_validate(uid, 'mrp.procurement', proc.id, 'button_check', cr)
report_ids.append(proc.id)
else:
- report_later +=1
- report_total +=1
+ report_later += 1
+ report_total += 1
for proc in procurement_obj.browse(cr, uid, report_ids):
if proc.state == 'exception':
report.append('PROC %d: from stock - %3.2f %-5s - %s' % \
(proc.id, proc.product_qty, proc.product_uom.name,
proc.product_id.name,))
- report_except +=1
+ report_except += 1
if use_new_cursor:
cr.commit()
offset += len(ids)
summary = '''Here is the procurement scheduling report.
Computation Started; %s
- Computation Finnished; %s
+ Computation Finished; %s
Total procurement: %d
Exception procurement: %d
Not run now procurement: %d
Exceptions;
- '''% (start_date,end_date,report_total, report_except,report_later)
+ '''% (start_date, end_date, report_total, report_except, report_later)
summary += '\n'.join(report)
request.create(cr, uid,
- {'name' : "Procurement calculation report.",
- 'act_from' : uid,
- 'act_to' : uid,
+ {'name': "Procurement calculation report.",
+ 'act_from': uid,
+ 'act_to': uid,
'body': summary,
})
if use_new_cursor:
cr.close()
return {}
- def create_automatic_op(self,cr, uid, context=None):
+ def create_automatic_op(self, cr, uid, context=None):
if not context:
- context={}
+ context = {}
product_obj = self.pool.get('product.product')
proc_obj = self.pool.get('mrp.procurement')
warehouse_obj = self.pool.get('stock.warehouse')
for warehouse in warehouse_obj.browse(cr, uid, warehouse_ids, context=context):
context['warehouse'] = warehouse
for product in self.pool.get('product.product').browse(cr, uid, products_id, context=context):
- if product.virtual_available>=0.0:
+ if product.virtual_available >= 0.0:
continue
newdate = DateTime.now()
else:
continue
proc_id = proc_obj.create(cr, uid, {
- 'name': 'PROC:Automatic OP for product:%s' % product.name,
+ 'name': 'Automatic OP: %s' % product.name,
'origin': 'SCHEDULER',
'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
'product_id': product.id,
use_new_cursor: False or the dbname
'''
if not context:
- context={}
+ context = {}
if use_new_cursor:
cr = pooler.get_db(use_new_cursor).cursor()
orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
if automatic:
self.create_automatic_op(cr, uid, context=context)
while ids:
- ids=orderpoint_obj.search(cr,uid,[],offset=offset,limit=100)
+ ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
for op in orderpoint_obj.browse(cr, uid, ids):
- if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft','confirmed'):
+ if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
continue
prods = location_obj._product_virtual_get(cr, uid,
op.location_id.id, [op.product_id.id],
if prods < op.product_min_qty:
qty = max(op.product_min_qty, op.product_max_qty)-prods
reste = qty % op.qty_multiple
- if reste>0:
- qty += op.qty_multiple-reste
+ if reste > 0:
+ qty += op.qty_multiple - reste
newdate = DateTime.now() + DateTime.RelativeDateTime(
- days=op.product_id.seller_delay)
+ days=int(op.product_id.seller_delay))
if op.product_id.supply_method == 'buy':
location_id = op.warehouse_id.lot_input_id
elif op.product_id.supply_method == 'produce':
location_id = op.warehouse_id.lot_stock_id
else:
continue
- proc_id = procurement_obj.create(cr, uid, {
- 'name': 'OP:'+str(op.id),
- 'date_planned': newdate.strftime('%Y-%m-%d'),
- 'product_id': op.product_id.id,
- 'product_qty': qty,
- 'product_uom': op.product_uom.id,
- 'location_id': op.warehouse_id.lot_input_id.id,
- 'procure_method': 'make_to_order',
- 'origin': op.name
- })
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id,
- 'button_confirm', cr)
- wf_service.trg_validate(uid, 'mrp.procurement', proc_id,
- 'button_check', cr)
- orderpoint_obj.write(cr, uid, [op.id],
- {'procurement_id': proc_id})
+ if qty <= 0:
+ continue
+ if op.product_id.type not in ('consu'):
+ proc_id = procurement_obj.create(cr, uid, {
+ 'name': 'OP:' + str(op.id),
+ 'date_planned': newdate.strftime('%Y-%m-%d'),
+ 'product_id': op.product_id.id,
+ 'product_qty': qty,
+ 'product_uom': op.product_uom.id,
+ 'location_id': op.warehouse_id.lot_input_id.id,
+ 'procure_method': 'make_to_order',
+ 'origin': op.name
+ })
+ wf_service.trg_validate(uid, 'mrp.procurement', proc_id,
+ 'button_confirm', cr)
+ wf_service.trg_validate(uid, 'mrp.procurement', proc_id,
+ 'button_check', cr)
+ orderpoint_obj.write(cr, uid, [op.id],
+ {'procurement_id': proc_id})
offset += len(ids)
if use_new_cursor:
cr.commit()
cr.close()
return {}
mrp_procurement()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff