diff --git a/addons/mrp/stock.py.moved b/addons/mrp/stock.py.moved deleted file mode 100644 index 4ddfddf6d90..00000000000 --- a/addons/mrp/stock.py.moved +++ /dev/null @@ -1,225 +0,0 @@ -# -*- 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 stock_warehouse_orderpoint(osv.osv): - _name = "stock.warehouse.orderpoint" - _description = "Orderpoint minimum rule" - _columns = { - 'name': fields.char('Name', size=32, required=True), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."), - 'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True), - 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True), - 'location_id': fields.many2one('stock.location', 'Location', required=True), - 'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]), - 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ), - 'product_min_qty': fields.float('Min Quantity', required=True, - help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\ - "a requisition to bring the virtual stock to the Max Quantity."), - 'product_max_qty': fields.float('Max Quantity', required=True, - help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\ - "a requisition to bring the virtual stock to the Max Quantity."), - 'qty_multiple': fields.integer('Qty Multiple', required=True, - help="The requisition quantity will by rounded up to this multiple."), - 'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'), - 'company_id': fields.many2one('res.company','Company',required=True), - } - _defaults = { - 'active': lambda *a: 1, - 'logic': lambda *a: 'max', - 'qty_multiple': lambda *a: 1, - 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '', - 'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False), - 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c) - } - def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}): - if warehouse_id: - w=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id, context) - v = {'location_id':w.lot_stock_id.id} - return {'value': v} - return {} - def onchange_product_id(self, cr, uid, ids, product_id, context={}): - if product_id: - prod=self.pool.get('product.product').browse(cr,uid,product_id) - v = {'product_uom':prod.uom_id.id} - return {'value': v} - return {} - def copy(self, cr, uid, id, default=None,context={}): - if not default: - default = {} - default.update({ - 'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '', - }) - return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context) -stock_warehouse_orderpoint() - -class StockMove(osv.osv): - _inherit = 'stock.move' - _columns = { - 'production_id': fields.many2one('mrp.production', 'Production', select=True), - 'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'), - } - def copy(self, cr, uid, id, default=None, context=None): - default = default or {} - default['procurements'] = [] - return super(StockMove, self).copy(cr, uid, id, default, context) - - def _action_explode(self, cr, uid, move, context={}): - if move.product_id.supply_method=='produce' and move.product_id.procure_method=='make_to_order': - bis = self.pool.get('mrp.bom').search(cr, uid, [ - ('product_id','=',move.product_id.id), - ('bom_id','=',False), - ('type','=','phantom')]) - if bis: - factor = move.product_qty - bom_point = self.pool.get('mrp.bom').browse(cr, uid, bis[0]) - res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor, []) - dest = move.product_id.product_tmpl_id.property_stock_production.id - state = 'confirmed' - if move.state=='assigned': - state='assigned' - for line in res[0]: - valdef = { - 'picking_id': move.picking_id.id, - 'product_id': line['product_id'], - 'product_uom': line['product_uom'], - 'product_qty': line['product_qty'], - 'product_uos': line['product_uos'], - 'product_uos_qty': line['product_uos_qty'], - 'move_dest_id': move.id, - 'state': state, - 'name': line['name'], - 'location_dest_id': dest, - 'move_history_ids': [(6,0,[move.id])], - 'move_history_ids2': [(6,0,[])], - 'procurements': [], - } - mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef) - prodobj = self.pool.get('product.product').browse(cr, uid, line['product_id'], context=context) - proc_id = self.pool.get('mrp.procurement').create(cr, uid, { - 'name': (move.picking_id.origin or ''), - 'origin': (move.picking_id.origin or ''), - 'date_planned': move.date_planned, - 'product_id': line['product_id'], - 'product_qty': line['product_qty'], - 'product_uom': line['product_uom'], - 'product_uos_qty': line['product_uos'] and line['product_uos_qty'] or False, - 'product_uos': line['product_uos'], - 'location_id': move.location_id.id, - 'procure_method': prodobj.procure_method, - 'move_id': mid, - 'company_id': line['company_id'], - }) - wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr) - self.pool.get('stock.move').write(cr, uid, [move.id], { - 'location_id': move.location_dest_id.id, - 'auto_validate': True, - 'picking_id': False, - 'location_id': dest, - 'state': 'waiting' - }) - for m in self.pool.get('mrp.procurement').search(cr, uid, [('move_id','=',move.id)], context): - wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr) - return True - - - def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None): - res = [] - production_obj = self.pool.get('mrp.production') - wf_service = netsvc.LocalService("workflow") - for move in self.browse(cr, uid, ids): - new_moves = super(StockMove, self).action_consume(cr, uid, [move.id], product_qty, location_id, context=context) - production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) - for prod in production_obj.browse(cr, uid, production_ids, context=context): - if prod.state == 'confirmed': - production_obj.force_production(cr, uid, [prod.id]) - wf_service.trg_validate(uid, 'mrp.production', prod.id, 'button_produce', cr) - for new_move in new_moves: - production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) - res.append(new_move) - return res - - def action_scrap(self, cr, uid, ids, product_qty, location_id, context=None): - res = [] - production_obj = self.pool.get('mrp.production') - wf_service = netsvc.LocalService("workflow") - for move in self.browse(cr, uid, ids): - new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context) - production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) - for prod_id in production_ids: - wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr) - for new_move in new_moves: - production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) - res.append(new_move) - return {} - -StockMove() - - -class StockPicking(osv.osv): - _inherit = 'stock.picking' - - def test_finnished(self, cursor, user, ids): - wf_service = netsvc.LocalService("workflow") - res = super(StockPicking, self).test_finnished(cursor, user, ids) - for picking in self.browse(cursor, user, ids): - for move in picking.move_lines: - if move.state == 'done' and move.procurements: - for procurement in move.procurements: - wf_service.trg_validate(user, 'mrp.procurement', - procurement.id, 'button_check', cursor) - return res - - # - # Explode picking by replacing phantom BoMs - # - def action_explode(self, cr, uid, picks, *args): - for move in self.pool.get('stock.move').browse(cr, uid, picks): - self.pool.get('stock.move')._action_explode(cr, uid, move) - return picks - -StockPicking() - - -class spilt_in_production_lot(osv.osv_memory): - _inherit = "stock.move.split" - def split(self, cr, uid, ids, move_ids, context=None): - production_obj = self.pool.get('mrp.production') - move_obj = self.pool.get('stock.move') - res = [] - for move in move_obj.browse(cr, uid, move_ids, context=context): - new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context) - production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) - for new_move in new_moves: - production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) - return res -spilt_in_production_lot() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: