diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml index 17b4bc486bc..191f1818612 100644 --- a/addons/board_manufacturing/board_manufacturing_view.xml +++ b/addons/board_manufacturing/board_manufacturing_view.xml @@ -15,7 +15,7 @@ - + diff --git a/addons/board_warehouse/board_warehouse_view.xml b/addons/board_warehouse/board_warehouse_view.xml index cdc93d9a274..af797401935 100644 --- a/addons/board_warehouse/board_warehouse_view.xml +++ b/addons/board_warehouse/board_warehouse_view.xml @@ -23,7 +23,7 @@
- + diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py index 39d97d0ba11..d23cee8d565 100644 --- a/addons/mrp/__init__.py +++ b/addons/mrp/__init__.py @@ -26,5 +26,6 @@ import installer import wizard import report import company -import schedulers +import mrp_procurement + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index a69e8ce4025..0fa66ac7bd1 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -26,7 +26,7 @@ "author" : "Tiny", "website" : "http://www.openerp.com", "category" : "Generic Modules/Production", - "depends" : ["stock", "resource", "purchase", "product","process"], + "depends" : ["mrp_procurement", "stock", "resource", "purchase", "product","process"], "description": """ This is the base module to manage the manufacturing process in Open ERP. @@ -61,15 +61,11 @@ 'mrp_workflow.xml', 'mrp_data.xml', 'wizard/mrp_product_produce_view.xml', - 'wizard/make_procurement_view.xml', - 'wizard/mrp_procurement_view.xml', 'wizard/change_production_qty_view.xml', - 'wizard/orderpoint_procurement_view.xml', 'wizard/mrp_price_view.xml', 'wizard/mrp_workcenter_load_view.xml', # 'wizard/mrp_track_prod_view.xml', 'mrp_view.xml', - 'wizard/schedulers_all_view.xml', 'mrp_wizard.xml', 'mrp_report.xml', 'company_view.xml', @@ -81,6 +77,7 @@ 'report/mrp_production_order_view.xml', ], 'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'], +# 'test': ['test/mrp_phantom_bom.yml','test/mrp_production_order.yml'], 'installable': True, 'active': False, 'certificate': '0032052481373', diff --git a/addons/mrp/company.py b/addons/mrp/company.py index 1844fff47eb..22acf4fc5dd 100644 --- a/addons/mrp/company.py +++ b/addons/mrp/company.py @@ -24,22 +24,10 @@ from osv import osv,fields class company(osv.osv): _inherit = 'res.company' _columns = { - 'schedule_range': fields.float('Scheduler Range', required=True, - help="This is the time frame analysed by the scheduler when "\ - "computing procurements. All procurements that are not between "\ - "today and today+range are skipped for futur computation."), - 'po_lead': fields.float('Purchase Lead Time', required=True, - help="This is the leads/security time for each purchase order."), - 'security_lead': fields.float('Security Days', required=True, - help="This is the days added to what you promise to customers "\ - "for security purpose"), 'manufacturing_lead': fields.float('Manufacturing Lead Time', required=True, help="Security days for each manufacturing operation."), } _defaults = { - 'schedule_range': lambda *a: 80.0, - 'po_lead': lambda *a: 1.0, - 'security_lead': lambda *a: 5.0, 'manufacturing_lead': lambda *a: 1.0, } company() diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml index 1975bf5bb72..e94324f8195 100644 --- a/addons/mrp/company_view.xml +++ b/addons/mrp/company_view.xml @@ -9,12 +9,7 @@ - - - - - diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 675c4a73bb0..d5cea81933b 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -64,35 +64,6 @@ class mrp_workcenter(osv.osv): mrp_workcenter() -class mrp_property_group(osv.osv): - """ - Group of mrp properties. - """ - _name = 'mrp.property.group' - _description = 'Property Group' - _columns = { - 'name': fields.char('Property Group', size=64, required=True), - 'description': fields.text('Description'), - } -mrp_property_group() - -class mrp_property(osv.osv): - """ - Properties of mrp. - """ - _name = 'mrp.property' - _description = 'Property' - _columns = { - 'name': fields.char('Name', size=64, required=True), - 'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."), - 'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True), - 'description': fields.text('Description'), - } - _defaults = { - 'composition': lambda *a: 'min', - } -mrp_property() - class mrp_routing(osv.osv): """ For specifying the routings of workcenters. @@ -996,520 +967,6 @@ class mrp_production_product_line(osv.osv): } mrp_production_product_line() -# ------------------------------------------------------------------ -# Procurement -# ------------------------------------------------------------------ -# -# Produce, Buy or Find products and place a move -# then wizard for picking lists & move -# -class mrp_procurement(osv.osv): - """ - Procument Orders - """ - _name = "mrp.procurement" - _description = "Procurement" - _order = 'priority,date_planned' - - _columns = { - 'name': fields.char('Reason', size=64, required=True, help='Procurement name.'), - 'origin': fields.char('Source Document', size=64, - help="Reference of the document that created this Procurement.\n" - "This is automatically completed by Open ERP."), - 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True), - 'date_planned': fields.datetime('Scheduled date', required=True), - 'date_close': fields.datetime('Date Closed'), - 'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True), - 'product_qty': fields.float('Quantity', required=True, states={'draft':[('readonly',False)]}, readonly=True), - 'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True), - 'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True), - 'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True), - 'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'), - 'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True), - - 'close_move': fields.boolean('Close Move at end', required=True), - 'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True), - 'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]}, - readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \ - " a make to order method."), - - 'purchase_id': fields.many2one('purchase.order', 'Purchase Order'), - 'note': fields.text('Note'), - - 'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'), - - 'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."), - 'state': fields.selection([ - ('draft','Draft'), - ('confirmed','Confirmed'), - ('exception','Exception'), - ('running','Running'), - ('cancel','Cancel'), - ('ready','Ready'), - ('done','Done'), - ('waiting','Waiting')], 'State', required=True, - help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\ - \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'), - 'note': fields.text('Note'), - 'company_id': fields.many2one('res.company','Company',required=True), - } - _defaults = { - 'state': lambda *a: 'draft', - 'priority': lambda *a: '1', - 'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), - 'close_move': lambda *a: 0, - 'procure_method': lambda *a: 'make_to_order', - 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.procurement', context=c) - } - - def unlink(self, cr, uid, ids, context=None): - procurements = self.read(cr, uid, ids, ['state']) - unlink_ids = [] - for s in procurements: - if s['state'] in ['draft','cancel']: - unlink_ids.append(s['id']) - else: - raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state'])) - return osv.osv.unlink(self, cr, uid, unlink_ids, context=context) - - def onchange_product_id(self, cr, uid, ids, product_id, context={}): - """ Finds UoM and UoS of changed product. - @param product_id: Changed id of product. - @return: Dictionary of values. - """ - if product_id: - w = self.pool.get('product.product').browse(cr, uid, product_id, context) - v = { - 'product_uom': w.uom_id.id, - 'product_uos': w.uos_id and w.uos_id.id or w.uom_id.id - } - return {'value': v} - return {} - - def check_product(self, cr, uid, ids): - """ Checks product type. - @return: True or False - """ - for procurement in self.browse(cr, uid, ids): - if procurement.product_id.type in ('product', 'consu'): - return True - return False - - def check_move_cancel(self, cr, uid, ids, context={}): - """ Checks if move is cancelled or not. - @return: True or False. - """ - res = True - ok = False - for procurement in self.browse(cr, uid, ids, context): - if procurement.move_id: - ok = True - if not procurement.move_id.state == 'cancel': - res = False - return res and ok - - def check_move_done(self, cr, uid, ids, context={}): - """ Checks if move is done or not. - @return: True or False. - """ - res = True - for proc in self.browse(cr, uid, ids, context): - if proc.move_id: - if not proc.move_id.state == 'done': - res = False - return res - - # - # This method may be overrided by objects that override mrp.procurment - # for computing their own purpose - # - def _quantity_compute_get(self, cr, uid, proc, context={}): - """ Finds sold quantity of product. - @param proc: Current procurement. - @return: Quantity or False. - """ - if proc.product_id.type == 'product': - if proc.move_id.product_uos: - return proc.move_id.product_uos_qty - return False - - def _uom_compute_get(self, cr, uid, proc, context={}): - """ Finds UoS if product is Stockable Product. - @param proc: Current procurement. - @return: UoS or False. - """ - if proc.product_id.type == 'product': - if proc.move_id.product_uos: - return proc.move_id.product_uos.id - return False - - # - # Return the quantity of product shipped/produced/served, wich may be - # different from the planned quantity - # - def quantity_get(self, cr, uid, id, context={}): - """ Finds quantity of product used in procurement. - @return: Quantity of product. - """ - proc = self.browse(cr, uid, id, context) - result = self._quantity_compute_get(cr, uid, proc, context) - if not result: - result = proc.product_qty - return result - - def uom_get(self, cr, uid, id, context=None): - """ Finds UoM of product used in procurement. - @return: UoM of product. - """ - proc = self.browse(cr, uid, id, context) - result = self._uom_compute_get(cr, uid, proc, context) - if not result: - result = proc.product_uom.id - return result - - def check_waiting(self, cr, uid, ids, context=[]): - """ Checks state of move. - @return: True or False - """ - for procurement in self.browse(cr, uid, ids, context=context): - if procurement.move_id and procurement.move_id.state == 'auto': - return True - return False - - def check_produce_service(self, cr, uid, procurement, context=[]): - return True - - def check_produce_product(self, cr, uid, procurement, context=[]): - """ Finds BoM of a product if not found writes exception message. - @param procurement: Current procurement. - @return: True or False. - """ - properties = [x.id for x in procurement.property_ids] - bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties) - if not bom_id: - cr.execute('update mrp_procurement set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id)) - return False - return True - - def check_make_to_stock(self, cr, uid, ids, context={}): - """ Checks product type. - @return: True or False - """ - ok = True - for procurement in self.browse(cr, uid, ids, context=context): - if procurement.product_id.type == 'service': - ok = ok and self._check_make_to_stock_service(cr, uid, procurement, context) - else: - ok = ok and self._check_make_to_stock_product(cr, uid, procurement, context) - return ok - - def check_produce(self, cr, uid, ids, context={}): - """ Checks product type. - @return: True or Product Id. - """ - res = True - user = self.pool.get('res.users').browse(cr, uid, uid) - for procurement in self.browse(cr, uid, ids): - if procurement.product_id.product_tmpl_id.supply_method <> 'produce': - if procurement.product_id.seller_ids: - partner = procurement.product_id.seller_ids[0].name - if user.company_id and user.company_id.partner_id: - if partner.id == user.company_id.partner_id.id: - return True - return False - if procurement.product_id.product_tmpl_id.type=='service': - res = res and self.check_produce_service(cr, uid, procurement, context) - else: - res = res and self.check_produce_product(cr, uid, procurement, context) - if not res: - return False - return res - - def check_buy(self, cr, uid, ids): - """ Checks product type. - @return: True or Product Id. - """ - user = self.pool.get('res.users').browse(cr, uid, uid) - partner_obj = self.pool.get('res.partner') - for procurement in self.browse(cr, uid, ids): - if procurement.product_id.product_tmpl_id.supply_method <> 'buy': - return False - if not procurement.product_id.seller_ids: - cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id)) - return False - partner = procurement.product_id.seller_ids[0].name - if user.company_id and user.company_id.partner_id: - if partner.id == user.company_id.partner_id.id: - return False - address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery'] - if not address_id: - cr.execute('update mrp_procurement set message=%s where id=%s', (_('No address defined for the supplier'), procurement.id)) - return False - return True - - def test_cancel(self, cr, uid, ids): - """ Tests whether state of move is cancelled or not. - @return: True or False - """ - for record in self.browse(cr, uid, ids): - if record.move_id and record.move_id.state == 'cancel': - return True - return False - - def action_confirm(self, cr, uid, ids, context={}): - """ Confirms procurement and writes exception message if any. - @return: True - """ - move_obj = self.pool.get('stock.move') - for procurement in self.browse(cr, uid, ids): - if procurement.product_qty <= 0.00: - raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!')) - if procurement.product_id.type in ('product', 'consu'): - if not procurement.move_id: - source = procurement.location_id.id - if procurement.procure_method == 'make_to_order': - source = procurement.product_id.product_tmpl_id.property_stock_procurement.id - id = move_obj.create(cr, uid, { - 'name': 'PROC:' + procurement.name, - 'location_id': source, - 'location_dest_id': procurement.location_id.id, - 'product_id': procurement.product_id.id, - 'product_qty': procurement.product_qty, - 'product_uom': procurement.product_uom.id, - 'date_planned': procurement.date_planned, - 'state': 'confirmed', - 'company_id': procurement.company_id.id, - }) - self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1}) - else: - # TODO: check this - if procurement.procure_method == 'make_to_stock' and procurement.move_id.state in ('waiting',): - id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'}) - self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''}) - return True - - def action_move_assigned(self, cr, uid, ids, context={}): - """ Changes procurement state to Running and writes message. - @return: True - """ - self.write(cr, uid, ids, {'state': 'running', 'message': _('from stock: products assigned.')}) - return True - - def _check_make_to_stock_service(self, cr, uid, procurement, context={}): - return True - - def _check_make_to_stock_product(self, cr, uid, procurement, context={}): - """ Checks procurement move state. - @param procurement: Current procurement. - @return: True or move id. - """ - ok = True - if procurement.move_id: - id = procurement.move_id.id - if not (procurement.move_id.state in ('done','assigned','cancel')): - ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id]) - cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,)) - if not cr.fetchone()[0]: - cr.execute('update mrp_procurement set message=%s where id=%s', (_('from stock and no minimum orderpoint rule defined'), procurement.id)) - return ok - - def action_produce_assign_service(self, cr, uid, ids, context={}): - """ Changes procurement state to Running. - @return: True - """ - for procurement in self.browse(cr, uid, ids): - self.write(cr, uid, [procurement.id], {'state': 'running'}) - return True - - def action_produce_assign_product(self, cr, uid, ids, context={}): - """ This is action which call from workflow to assign production order to procurements - @return: True - """ - res = self.make_mo(cr, uid, ids, context=context) - res = res.values() - return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value - - def make_mo(self, cr, uid, ids, context={}): - """ Make Manufecturing(production) order from procurement - @return: New created Production Orders procurement wise - """ - res = {} - company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id - production_obj = self.pool.get('mrp.production') - move_obj = self.pool.get('stock.move') - wf_service = netsvc.LocalService("workflow") - for procurement in self.browse(cr, uid, ids): - res_id = procurement.move_id.id - loc_id = procurement.location_id.id - newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - DateTime.RelativeDateTime(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0) - newdate = newdate - DateTime.RelativeDateTime(days=company.manufacturing_lead) - produce_id = production_obj.create(cr, uid, { - 'origin': procurement.origin, - 'product_id': procurement.product_id.id, - 'product_qty': procurement.product_qty, - 'product_uom': procurement.product_uom.id, - 'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False, - 'product_uos': procurement.product_uos and procurement.product_uos.id or False, - 'location_src_id': procurement.location_id.id, - 'location_dest_id': procurement.location_id.id, - 'bom_id': procurement.bom_id and procurement.bom_id.id or False, - 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'), - 'move_prod_id': res_id, - 'company_id': procurement.company_id.id, - }) - res[procurement.id] = produce_id - self.write(cr, uid, [procurement.id], {'state': 'running'}) - bom_result = production_obj.action_compute(cr, uid, - [produce_id], properties=[x.id for x in procurement.property_ids]) - wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr) - move_obj.write(cr, uid, [res_id], - {'location_id': procurement.location_id.id}) - return res - - def action_po_assign(self, cr, uid, ids, context={}): - """ This is action which call from workflow to assign purchase order to procuments - @return: True - """ - res = self.make_po(cr, uid, ids, context=context) - res = res.values() - return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value - - def make_po(self, cr, uid, ids, context={}): - """ Make purchase order from procurement - @return: New created Purchase Orders procurement wise - """ - res = {} - company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id - partner_obj = self.pool.get('res.partner') - uom_obj = self.pool.get('product.uom') - pricelist_obj = self.pool.get('product.pricelist') - prod_obj = self.pool.get('product.product') - acc_pos_obj = self.pool.get('account.fiscal.position') - po_obj = self.pool.get('purchase.order') - for procurement in self.browse(cr, uid, ids): - res_id = procurement.move_id.id - partner = procurement.product_id.seller_ids[0].name - partner_id = partner.id - address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery'] - pricelist_id = partner.property_product_pricelist_purchase.id - - uom_id = procurement.product_id.uom_po_id.id - - qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id) - if procurement.product_id.seller_ids[0].qty: - qty = max(qty,procurement.product_id.seller_ids[0].qty) - - price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id] - - newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead) - newdate = newdate - procurement.product_id.seller_ids[0].delay - - #Passing partner_id to context for purchase order line integrity of Line name - context.update({'lang': partner.lang, 'partner_id': partner_id}) - - product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context) - - line = { - 'name': product.partner_ref, - 'product_qty': qty, - 'product_id': procurement.product_id.id, - 'product_uom': uom_id, - 'price_unit': price, - 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'), - 'move_dest_id': res_id, - 'notes': product.description_purchase, - } - - taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id - taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids) - line.update({ - 'taxes_id': [(6,0,taxes)] - }) - purchase_id = po_obj.create(cr, uid, { - 'origin': procurement.origin, - 'partner_id': partner_id, - 'partner_address_id': address_id, - 'location_id': procurement.location_id.id, - 'pricelist_id': pricelist_id, - 'order_line': [(0,0,line)], - 'company_id': procurement.company_id.id, - 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False - }) - res[procurement.id] = purchase_id - self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id}) - return res - - def action_cancel(self, cr, uid, ids): - """ Cancels procurement and writes move state to Assigned. - @return: True - """ - todo = [] - todo2 = [] - move_obj = self.pool.get('stock.move') - for proc in self.browse(cr, uid, ids): - if proc.close_move: - if proc.move_id.state not in ('done', 'cancel'): - todo2.append(proc.move_id.id) - else: - if proc.move_id and proc.move_id.state == 'waiting': - todo.append(proc.move_id.id) - if len(todo2): - move_obj.action_cancel(cr, uid, todo2) - if len(todo): - move_obj.write(cr, uid, todo, {'state': 'assigned'}) - self.write(cr, uid, ids, {'state': 'cancel'}) - wf_service = netsvc.LocalService("workflow") - for id in ids: - wf_service.trg_trigger(uid, 'mrp.procurement', id, cr) - return True - - def action_check_finnished(self, cr, uid, ids): - return self.check_move_done(cr, uid, ids) - - def action_check(self, cr, uid, ids): - """ Checks procurement move state whether assigned or done. - @return: True - """ - ok = False - for procurement in self.browse(cr, uid, ids): - if procurement.move_id.state == 'assigned' or procurement.move_id.state == 'done': - self.action_done(cr, uid, [procurement.id]) - ok = True - return ok - - def action_ready(self, cr, uid, ids): - """ Changes procurement state to Ready. - @return: True - """ - res = self.write(cr, uid, ids, {'state': 'ready'}) - return res - - def action_done(self, cr, uid, ids): - """ Changes procurement state to Done and writes Closed date. - @return: True - """ - move_obj = self.pool.get('stock.move') - for procurement in self.browse(cr, uid, ids): - if procurement.move_id: - if procurement.close_move and (procurement.move_id.state <> 'done'): - move_obj.action_done(cr, uid, [procurement.move_id.id]) - res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')}) - wf_service = netsvc.LocalService("workflow") - for id in ids: - wf_service.trg_trigger(uid, 'mrp.procurement', id, cr) - return res - - def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None): - ''' Runs through scheduler. - @param use_new_cursor: False or the dbname - ''' - if not context: - context={} - self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context) - self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\ - use_new_cursor=use_new_cursor, context=context) -mrp_procurement() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml index 2793f84b924..a7db7109e55 100644 --- a/addons/mrp/mrp_data.xml +++ b/addons/mrp/mrp_data.xml @@ -31,18 +31,5 @@ 1 - - Run mrp scheduler - - - 1 - days - -1 - - - - - - diff --git a/addons/mrp/mrp_procurement.py b/addons/mrp/mrp_procurement.py new file mode 100644 index 00000000000..84392b329ea --- /dev/null +++ b/addons/mrp/mrp_procurement.py @@ -0,0 +1,93 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from mx import DateTime +from osv import fields +from osv import osv +from tools.translate import _ +import ir +import netsvc +import time + +class mrp_procurement(osv.osv): + _inherit = 'mrp.procurement' + _columns = { + 'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True), + } + + def check_produce_product(self, cr, uid, procurement, context=[]): + properties = [x.id for x in procurement.property_ids] + bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties) + if not bom_id: + cr.execute('update mrp_procurement set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id)) + return False + return True + + def action_produce_assign_product(self, cr, uid, ids, context={}): + """ This is action which call from workflow to assign production order to procurements + @return: True + """ + procurement_obj = self.pool.get('mrp.procurement') + res = procurement_obj.make_mo(cr, uid, ids, context=context) + res = res.values() + return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value + + def make_mo(self, cr, uid, ids, context={}): + """ Make Manufacturing(production) order from procurement + @return: New created Production Orders procurement wise + """ + res = {} + company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id + production_obj = self.pool.get('mrp.production') + move_obj = self.pool.get('stock.move') + wf_service = netsvc.LocalService("workflow") + procurement_obj = self.pool.get('mrp.procurement') + for procurement in procurement_obj.browse(cr, uid, ids): + res_id = procurement.move_id.id + loc_id = procurement.location_id.id + newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - DateTime.RelativeDateTime(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0) + newdate = newdate - DateTime.RelativeDateTime(days=company.manufacturing_lead) + produce_id = production_obj.create(cr, uid, { + 'origin': procurement.origin, + 'product_id': procurement.product_id.id, + 'product_qty': procurement.product_qty, + 'product_uom': procurement.product_uom.id, + 'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False, + 'product_uos': procurement.product_uos and procurement.product_uos.id or False, + 'location_src_id': procurement.location_id.id, + 'location_dest_id': procurement.location_id.id, + 'bom_id': procurement.bom_id and procurement.bom_id.id or False, + 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'), + 'move_prod_id': res_id, + 'company_id': procurement.company_id.id, + }) + res[procurement.id] = produce_id + self.write(cr, uid, [procurement.id], {'state': 'running'}) + bom_result = production_obj.action_compute(cr, uid, + [produce_id], properties=[x.id for x in procurement.property_ids]) + wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr) + move_obj.write(cr, uid, [res_id], + {'location_id': procurement.location_id.id}) + return res + +mrp_procurement() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 5b8b7c41084..ba86fc1facc 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -12,6 +12,7 @@ id="menu_mrp_bom" parent="base.menu_mrp_root" sequence="5" /> + @@ -257,14 +258,14 @@ - - + + - + - + @@ -378,10 +379,27 @@ - + + + + + + + + + + + + + Production Management + --> mrp.production.tree @@ -765,259 +783,22 @@ - - - - - mrp.procurement.tree - mrp.procurement - tree - - - - - - - - - - - + + + mrp.procurement.form.inherit + mrp.procurement + + form + + + + + - - mrp.procurement.form - mrp.procurement - form - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -