From 3902aa61dc2fda0408390af95bba2bcba11ae40b Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Tue, 13 Aug 2013 13:13:30 +0530 Subject: [PATCH 01/17] [IMP]Improve domain syntact bzr revid: prajapatijitendra7969@gmail.com-20130813074330-i1rp7ew5i0zvm7p2 --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index da202f04d10..0948f445f73 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1046,7 +1046,7 @@ ir.actions.act_window form tree,form - ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False)] + ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),('picking_id','!=',False)] {'product_receive': True, 'search_default_future': True} @@ -1141,7 +1141,7 @@ ir.actions.act_window form tree,form - ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False)] + ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),('picking_id','!=',False)] {'search_default_future': True} From b8220056f775477720fb9f560b4b88a3ed1521bd Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 14 Aug 2013 16:14:26 +0530 Subject: [PATCH 02/17] [IMP] remove procure_method in yml that not in procurement anymore bzr revid: rma@tinyerp.com-20130814104426-o8w3mu3dxtgd17d9 --- addons/sale_stock/test/sale_order_onchange.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml index 1026e5627c3..c97acdcb8c9 100644 --- a/addons/sale_stock/test/sale_order_onchange.yml +++ b/addons/sale_stock/test/sale_order_onchange.yml @@ -4,7 +4,6 @@ !record {model: product.product, id: product_onchange1}: name: 'Devil Worship Book' list_price: 66.6 - procure_method: 'make_to_order' - Now i create a sale order that uses my new product - From d565a50c35babe211ebd9a5e0abc5f6c1f937e52 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 14 Aug 2013 14:13:49 +0200 Subject: [PATCH 03/17] [IMP] steps procrule bzr revid: jco@openerp.com-20130814121349-go02w2gs0bhi46dj --- addons/stock/test/procrule.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/stock/test/procrule.yml b/addons/stock/test/procrule.yml index a8baad650e8..d1762ae4806 100644 --- a/addons/stock/test/procrule.yml +++ b/addons/stock/test/procrule.yml @@ -1,5 +1,11 @@ - - Create new delivery order from output -> customers + Create new global procurement rule from Stock -> Output +- + !record {model: procurement.rule, ref:} + location_id: stock + location_dest_id: output +- + Create Delivery Order from Output -> Customer - !record {model: stock.picking, ref:} - From 290d3b31ccaa0cc54411357c8f7da99b8943f7bd Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 14 Aug 2013 17:44:45 +0530 Subject: [PATCH 04/17] [IMP] remove extra assert bzr revid: rma@tinyerp.com-20130814121445-i29uhxxd43rdzw2g --- addons/sale_stock/test/sale_order_onchange.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml index c97acdcb8c9..1c3a4a5b4c3 100644 --- a/addons/sale_stock/test/sale_order_onchange.yml +++ b/addons/sale_stock/test/sale_order_onchange.yml @@ -18,4 +18,3 @@ !assert {model: sale.order, id: sale_order_onchange1, string: The onchange function of product was not correctly triggered}: - order_line[0].name == u'Devil Worship Book' - order_line[0].price_unit == 66.6 - - order_line[0].type == 'make_to_order' From 24b1f53cce839f6cf7602bfe7aecd5114fead50f Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Wed, 14 Aug 2013 18:43:02 +0530 Subject: [PATCH 05/17] [IMP]improve domain bzr revid: prajapatijitendra7969@gmail.com-20130814131302-t4k5258dixltd6dm --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 0948f445f73..3054abfd60f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1046,7 +1046,7 @@ ir.actions.act_window form tree,form - ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),('picking_id','!=',False)] + {'product_receive': True, 'search_default_future': True} @@ -1141,7 +1141,7 @@ ir.actions.act_window form tree,form - ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),('picking_id','!=',False)] + {'search_default_future': True} From 2642c4a3798688720298d3a9a9378a79edaaf776 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 16 Aug 2013 09:48:46 +0200 Subject: [PATCH 06/17] [IMP] procurement state == done instead of != for test_state bzr revid: jco@openerp.com-20130816074846-di9cajwmylsvsg3s --- addons/sale_stock/sale_stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 707adb27a7e..95ebfa33e89 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -207,7 +207,7 @@ class sale_order(osv.osv): for order in self.browse(cr, uid, ids, context={}): for line in order.order_line: for procurement in line.procurement_ids: - if procurement.state != 'done': + if procurement.state == 'done': write_done_ids.append(line.id) else: finished = False From 349833452a0eb1c0f620a05e5feec5608999895a Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 16 Aug 2013 12:27:34 +0200 Subject: [PATCH 07/17] [IMP] Change test_state according to procurement_ids, do not allow running a procurement twice when it was successful and adapt view in sale_journal bzr revid: jco@openerp.com-20130816102734-j4xrxqbz26q942ps --- addons/mrp_jit/mrp_jit.py | 1 + addons/procurement/procurement.py | 15 ++++++++------- addons/sale_journal/sale_journal_view.xml | 2 +- addons/sale_stock/sale_stock.py | 23 +++++++++++++---------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/addons/mrp_jit/mrp_jit.py b/addons/mrp_jit/mrp_jit.py index 4ad5cca5f20..01d94692a9d 100644 --- a/addons/mrp_jit/mrp_jit.py +++ b/addons/mrp_jit/mrp_jit.py @@ -27,6 +27,7 @@ class procurement_order(osv.osv): def create(self, cr, uid, vals, context=None): procurement_id = super(procurement_order, self).create(cr, uid, vals, context=context) + # TODO: maybe this is not necessary anymore as we do this already self.run(cr, uid, [procurement_id], context=context) self.check(cr, uid, [procurement_id], context=context) return procurement_id diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 69e2b1cbf23..4e8b163eced 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -154,13 +154,14 @@ class procurement_order(osv.osv): def run(self, cr, uid, ids, context=None): for procurement in self.browse(cr, uid, ids, context=context): - if self._assign(cr, uid, procurement, context=context): - procurement.refresh() - self._run(cr, uid, procurement, context=context or {}) - self.write(cr, uid, [procurement.id], {'state': 'running'}, context=context) - else: - self.message_post(cr, uid, [procurement.id], body=_('No rule matching this procurement'), context=context) - self.write(cr, uid, [procurement.id], {'state': 'exception'}, context=context) + if procurement.state not in ("running", "done"): + if self._assign(cr, uid, procurement, context=context): + procurement.refresh() + self._run(cr, uid, procurement, context=context or {}) + self.write(cr, uid, [procurement.id], {'state': 'running'}, context=context) + else: + self.message_post(cr, uid, [procurement.id], body=_('No rule matching this procurement'), context=context) + self.write(cr, uid, [procurement.id], {'state': 'exception'}, context=context) return True def check(self, cr, uid, ids, context=None): diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index 3247f73d1cd..0c11029b48b 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -128,7 +128,7 @@ stock.picking - + diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 95ebfa33e89..3163365ffc0 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -205,16 +205,20 @@ class sale_order(osv.osv): write_done_ids = [] write_cancel_ids = [] for order in self.browse(cr, uid, ids, context={}): + #TODO: Need to rethink what happens when cancelling for line in order.order_line: - for procurement in line.procurement_ids: - if procurement.state == 'done': - write_done_ids.append(line.id) - else: - finished = False - if (procurement.state == 'cancel'): - canceled = True - if line.state != 'exception': + states = [x.state for x in line.procurement_ids] + cancel = all([x == 'cancel' for x in states]) + doneorcancel = all([x in ('done', 'cancel') for x in states]) + if cancel: + canceled = True + if line.state != 'exception': write_cancel_ids.append(line.id) + if not doneorcancel: + finished = False + if doneorcancel and not cancel: + write_done_ids.append(line.id) + if write_done_ids: self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'}) if write_cancel_ids: @@ -256,8 +260,7 @@ class sale_order(osv.osv): res = [] for order in self.browse(cr, uid, ids, context={}): for line in order.order_line: - if line.procurement_id: - res.append(line.procurement_id.id) + res += [x.id for x in line.procurement_ids] return res class sale_order_line(osv.osv): From bcbd83f242a2fd3e02d1636f0424f1574ad59c73 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 16 Aug 2013 14:30:30 +0200 Subject: [PATCH 08/17] [IMP] Invoice_state store should be triggered when moves are grouped into picking bzr revid: jco@openerp.com-20130816123030-kfapqsh40dg8qni9 --- addons/sale_stock/stock.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/addons/sale_stock/stock.py b/addons/sale_stock/stock.py index 2af7e1518f8..e404ab3dd7b 100644 --- a/addons/sale_stock/stock.py +++ b/addons/sale_stock/stock.py @@ -22,6 +22,7 @@ from openerp.osv import fields, osv from openerp.tools.translate import _ + class stock_picking(osv.osv): _inherit = 'stock.picking' def __get_invoice_state(self, cr, uid, ids, name, arg, context=None): @@ -45,16 +46,24 @@ class stock_picking(osv.osv): result[move.picking_id.id] = True return result.keys() + def __get_picking_move(self, cr, uid, ids, context={}): + res = [] + for move in self.pool.get('stock.move').browse(cr, uid, ids, context=context): + if move.picking_id: + res.append(move.picking_id.id) + return res + _columns = { 'invoice_state': fields.function(__get_invoice_state, type='selection', selection=[ ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), ("none", "Not Applicable") - ], string="Invoice Control", required=True, - store={ - 'procurement.order': (__get_picking_procurement, ['invoice_state'], 10), - 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10) - }, + ], string="Invoice Control", required=True, + store={ + 'procurement.order': (__get_picking_procurement, ['invoice_state'], 10), + 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10), + 'stock.move': (__get_picking_move, ['picking_id'], 10), + }, ), } _defaults = { From 593f1ddc8a74760456ec6bb9cbff102b253ad829 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 16 Aug 2013 17:02:26 +0200 Subject: [PATCH 09/17] [IMP] Change auto in waiting for picking state, add picking type in push rule view bzr revid: jco@openerp.com-20130816150226-th1rpjoozdf6p1wt --- addons/stock/stock.py | 8 ++++---- addons/stock_location/stock_location.py | 5 +---- addons/stock_location/stock_location_view.xml | 11 ++++++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 9788a0c33d8..2dff89acfa2 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -61,7 +61,7 @@ class stock_location(osv.osv): _order = 'parent_left' def name_get(self, cr, uid, ids, context=None): res = self._complete_name(cr, uid, ids, 'complete_name', None, context=context) - return res.items() + return res.items() def _complete_name(self, cr, uid, ids, name, args, context=None): """ Forms complete name of location from parent location to child location. @@ -432,7 +432,7 @@ class stock_picking(osv.osv): res[pick.id] = 'done' continue - order = {'confirmed':0, 'auto':1, 'assigned':2} + order = {'confirmed':0, 'waiting':1, 'assigned':2} order_inv = dict(zip(order.values(),order.keys())) lst = [order[x.state] for x in pick.move_lines if x.state not in ('cancel','done')] if pick.move_lines == 'one': @@ -467,7 +467,7 @@ class stock_picking(osv.osv): 'stock.move': (_get_pickings, ['state', 'picking_id'], 20)}, selection = [ ('draft', 'Draft'), ('cancel', 'Cancelled'), - ('auto', 'Waiting Another Operation'), + ('waiting', 'Waiting Another Operation'), ('confirmed', 'Waiting Availability'), ('assigned', 'Ready to Transfer'), ('done', 'Transferred'), @@ -1199,7 +1199,7 @@ class stock_move(osv.osv): ('group_id', '=', move.group_id.id), ('location_id', '=', move.location_id.id), ('location_dest_id', '=', move.location_dest_id.id), - ('state', 'in', ['confirmed', 'auto'])], context=context) + ('state', 'in', ['confirmed', 'waiting'])], context=context) if picks: pick = picks[0] else: diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index 668b80ae72a..d01bbbca5e0 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -52,9 +52,6 @@ class stock_location_path(osv.osv): 'name': fields.char('Operation', size=64), 'company_id': fields.many2one('res.company', 'Company'), 'route_id': fields.many2one('stock.location.route', 'Route'), - - 'product_id' : fields.many2one('product.product', 'Products', ondelete='cascade', select=1), - 'location_from_id' : fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1, required=True), 'location_dest_id' : fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1, required=True), 'delay': fields.integer('Delay (days)', help="Number of days to do this transition"), @@ -62,7 +59,7 @@ class stock_location_path(osv.osv): ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), ("none", "Not Applicable")], "Invoice Status", - required=True,), + required=True,), 'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', help="This is the picking type associated with the different pickings"), 'auto': fields.selection( [('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')], diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml index 088dceb8803..8a42f2afb46 100644 --- a/addons/stock_location/stock_location_view.xml +++ b/addons/stock_location/stock_location_view.xml @@ -87,14 +87,15 @@
- + - - - - + + + + +
From 3e7dcc7ad14b1613f8c1a12639994e62304d84d9 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 16 Aug 2013 17:47:08 +0200 Subject: [PATCH 10/17] [IMP] Picking type on stock move when purchase, needs to be improved further anyways bzr revid: jco@openerp.com-20130816154708-arzapc37lccq63ea --- addons/purchase/purchase.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index a80b84bddbc..3e2446568af 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -653,7 +653,6 @@ class purchase_order(osv.osv): def _prepare_order_picking(self, cr, uid, order, context=None): type_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'picking_type_in')[1] type = self.pool.get("stock.picking.type").browse(cr, uid, type_id, context=context) - return { 'name': self.pool.get('ir.sequence').get_id(cr, uid, type.sequence_id.id, 'id'), 'origin': order.name + ((order.origin and (':' + order.origin)) or ''), @@ -664,11 +663,14 @@ class purchase_order(osv.osv): 'purchase_id': order.id, 'company_id': order.company_id.id, 'move_lines' : [], - 'picking_type_id': type_id, + 'picking_type_id': type_id, } def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, context=None): ''' prepare the stock move data from the PO line ''' + type_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'picking_type_in')[1] + type = self.pool.get("stock.picking.type").browse(cr, uid, type_id, context=context) + return { 'name': order_line.name or '', 'product_id': order_line.product_id.id, @@ -686,7 +688,8 @@ class purchase_order(osv.osv): 'state': 'draft', 'purchase_line_id': order_line.id, 'company_id': order.company_id.id, - 'price_unit': order_line.price_unit, + 'price_unit': order_line.price_unit, + 'picking_type_id': type_id, } def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, context=None): From 128586c59c25ca74d214b03f399ccfc4086ea89f Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 19 Aug 2013 11:19:37 +0200 Subject: [PATCH 11/17] [IMP] location_id should be location_spec_id when applying putaway strats (psi) bzr revid: jco@openerp.com-20130819091937-r7zht49op1nupyrr --- addons/stock_location/stock_location.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index d01bbbca5e0..6daaf0858b1 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -269,16 +269,16 @@ class stock_move(osv.osv): if putaway: # Should call different methods here in later versions # TODO: take care of lots - if putaway.method == 'fixed' and putaway.location_id: + if putaway.method == 'fixed' and putaway.location_spec_id: moveputaway_obj.create(cr, uid, {'move_id': move.id, - 'location_id': putaway.location_id.id, + 'location_id': putaway.location_spec_id.id, 'quantity': move.product_uom_qty}, context=context) return True def action_assign(self, cr, uid, ids, context=None): - result = super(stock_move, self).action_assign(cr, uid, ids, context=context) - self._putaway_apply(cr, uid, ids, context=context) - return result + result = super(stock_move, self).action_assign(cr, uid, ids, context=context) + self._putaway_apply(cr, uid, ids, context=context) + return result def action_confirm(self, cr, uid, ids, context=None): result = super(stock_move, self).action_confirm(cr, uid, ids, context) @@ -286,6 +286,8 @@ class stock_move(osv.osv): self._push_apply(cr, uid, moves, context=context) return result + + def _create_procurement(self, cr, uid, move, context=None): """ Next to creating the procurement order, it will propagate the routes From 0d56b1b2f08e0465d6072b5098445f21556f828e Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Mon, 19 Aug 2013 15:44:11 +0530 Subject: [PATCH 12/17] [MERGE] lp:~openerp-dev/openobject-addons/trunk-wmsimplement-seduce-fp-product_kanban_link-jitendra bzr revid: prajapatijitendra7969@gmail.com-20130819101411-bbqg50aqu719b9xh --- addons/stock/product_view.xml | 4 ++-- addons/stock/stock_view.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index d057c47cc80..9c14a150b96 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -48,7 +48,7 @@ ir.actions.act_window form tree,form - [('picking_type_id','=',ref("picking_type_in")), ('location_id.usage','!=','internal'), ('location_dest_id.usage', '=', 'internal')] + @@ -69,7 +69,7 @@ form tree,form - [('picking_type_id','=',ref("picking_type_out")), ('location_id.usage','=','internal'), ('location_dest_id.usage', '!=', 'internal')] +

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3054abfd60f..575712ad771 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1046,7 +1046,7 @@ ir.actions.act_window form tree,form - + {'product_receive': True, 'search_default_future': True} @@ -1141,7 +1141,7 @@ ir.actions.act_window form tree,form - + {'search_default_future': True} From a4a742e1a345082ca92e391b2344aba988c184f7 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 19 Aug 2013 12:46:57 +0200 Subject: [PATCH 13/17] [IMP] Procurement should go to exception when no supplier bzr revid: jco@openerp.com-20130819104657-6ee5gmn9v7vxqi2c --- addons/purchase/purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3e2446568af..5f4471ce408 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1226,7 +1226,7 @@ class procurement_order(osv.osv): res_id = procurement.move_dest_id and procurement.move_dest_id.id or False partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement. if not partner: - procurement.write({'message': _('There is no supplier associated to product %s') % (procurement.product_id.name)}) + procurement.write({'message': _('There is no supplier associated to product %s') % (procurement.product_id.name), 'state': 'exception'}) else: seller_qty = procurement.product_id.seller_qty partner_id = partner.id From 3c8390289be3cfe0db96233a78f1ab9f737a2cd0 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 19 Aug 2013 15:46:15 +0200 Subject: [PATCH 14/17] [IMP] _run method should return whether it succeeded and change the state. Other methods migth do a message_post bzr revid: jco@openerp.com-20130819134615-m0divzqr7rslzhcx --- addons/mrp/procurement.py | 60 ++++++++++++++++--------------- addons/procurement/procurement.py | 7 ++-- addons/purchase/purchase.py | 7 ++-- 3 files changed, 41 insertions(+), 33 deletions(-) diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py index 9dad9aa5899..be19980ff24 100644 --- a/addons/mrp/procurement.py +++ b/addons/mrp/procurement.py @@ -44,7 +44,7 @@ class procurement_order(osv.osv): rule_id = super(procurement_order, self)._find_suitable_rule(cr, uid, procurement, context=context) if not rule_id: #if there isn't any specific procurement.rule defined for the product, we try to directly supply it from a supplier - if procurement.product_id.supply_method == 'manufacture' and self.check_bom_exists(cr, uid, [procurement.id], context=context): + if procurement.product_id.supply_method == 'manufacture': rule_id = self._search_suitable_rule(cr, uid, procurement, [('action', '=', 'manufacture'), ('location_id', '=', procurement.location_id.id)], context=context) rule_id = rule_id and rule_id[0] or False return rule_id @@ -52,7 +52,7 @@ class procurement_order(osv.osv): def _run(self, cr, uid, procurement, context=None): if procurement.rule_id and procurement.rule_id.action == 'manufacture': #make a manufacturing order for the procurement - return self.make_mo(cr, uid, [procurement.id], context=context) + return self.make_mo(cr, uid, [procurement.id], context=context)[procurement.id] return super(procurement_order, self)._run(cr, uid, procurement, context=context) def _check(self, cr, uid, procurement, context=None): @@ -119,32 +119,36 @@ class procurement_order(osv.osv): move_obj = self.pool.get('stock.move') procurement_obj = self.pool.get('procurement.order') for procurement in procurement_obj.browse(cr, uid, ids, context=context): - res_id = procurement.move_dest_id and procurement.move_dest_id.id or False - newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.produce_delay or 0.0) - newdate = newdate - relativedelta(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', 'production_id': produce_id}) - bom_result = production_obj.action_compute(cr, uid, - [produce_id], properties=[x.id for x in procurement.property_ids]) - production_obj.signal_button_confirm(cr, uid, [produce_id]) - if res_id: - move_obj.write(cr, uid, [res_id], - {'location_id': procurement.location_id.id}) + if self.check_bom_exists(cr, uid, [procurement.id], context=context): + res_id = procurement.move_dest_id and procurement.move_dest_id.id or False + newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.produce_delay or 0.0) + newdate = newdate - relativedelta(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], {'production_id': produce_id}) + bom_result = production_obj.action_compute(cr, uid, + [produce_id], properties=[x.id for x in procurement.property_ids]) + production_obj.signal_button_confirm(cr, uid, [produce_id]) + if res_id: + move_obj.write(cr, uid, [res_id], + {'location_id': procurement.location_id.id}) + else: + res[procurement.id] = False + self.message_post(cr, uid, [procurement.id], body=_("No BoM exists for this product!"), context=context) self.production_order_create_note(cr, uid, ids, context=context) return res diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 4e8b163eced..62170c13eea 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -157,8 +157,11 @@ class procurement_order(osv.osv): if procurement.state not in ("running", "done"): if self._assign(cr, uid, procurement, context=context): procurement.refresh() - self._run(cr, uid, procurement, context=context or {}) - self.write(cr, uid, [procurement.id], {'state': 'running'}, context=context) + res = self._run(cr, uid, procurement, context=context or {}) + if res: + self.write(cr, uid, [procurement.id], {'state': 'running'}, context=context) + else: + self.write(cr, uid, [procurement.id], {'state': 'exception'}, context=context) else: self.message_post(cr, uid, [procurement.id], body=_('No rule matching this procurement'), context=context) self.write(cr, uid, [procurement.id], {'state': 'exception'}, context=context) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 5f4471ce408..4948a292a04 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1115,7 +1115,7 @@ class procurement_order(osv.osv): def _run(self, cr, uid, procurement, context=None): if procurement.rule_id and procurement.rule_id.action == 'buy': #make a purchase order for the procurement - return self.make_po(cr, uid, [procurement.id], context=context) + return self.make_po(cr, uid, [procurement.id], context=context)[procurement.id] return super(procurement_order, self)._run(cr, uid, procurement, context=context) def _check(self, cr, uid, procurement, context=None): @@ -1226,7 +1226,8 @@ class procurement_order(osv.osv): res_id = procurement.move_dest_id and procurement.move_dest_id.id or False partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement. if not partner: - procurement.write({'message': _('There is no supplier associated to product %s') % (procurement.product_id.name), 'state': 'exception'}) + self.message_post(cr, uid, [procurement.id],_('There is no supplier associated to product %s') % (procurement.product_id.name)) + res[procurement.id] = False else: seller_qty = procurement.product_id.seller_qty partner_id = partner.id @@ -1276,7 +1277,7 @@ class procurement_order(osv.osv): 'payment_term_id': partner.property_supplier_payment_term.id or False, } res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=new_context) - self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]}) + self.write(cr, uid, [procurement.id], {'purchase_id': res[procurement.id]}) pass_ids += [procurement.id] if pass_ids: self.message_post(cr, uid, pass_ids, body=_("Draft Purchase Order created"), context=context) From 69fa5dbec2c671733e30c70ea260725238328c71 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 19 Aug 2013 19:03:19 +0200 Subject: [PATCH 15/17] [ADD] Add test for procurement exceptions bzr revid: jco@openerp.com-20130819170319-rd0zqen2pqot1e3p --- .../test/procurementexception.yml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 addons/stock_complex_routes/test/procurementexception.yml diff --git a/addons/stock_complex_routes/test/procurementexception.yml b/addons/stock_complex_routes/test/procurementexception.yml new file mode 100644 index 00000000000..67afc101089 --- /dev/null +++ b/addons/stock_complex_routes/test/procurementexception.yml @@ -0,0 +1,37 @@ +- + Create product with no seller_ids +- + +- + Create a sales order with 1 piece for that product and route crossdock +- + !record{sale.order} +- + Confirm sales order +- + !python { +- + Check there is a procurement in exception that has the procurement group of the sales order +- + !python { + assert +- + Adjust the product that it has at least one seller_id +- + !record{id: model: product.product) or in !python +- + Run the Scheduler +- + !python +- + Check the status changed there is no procurement order in exception any more from that procurement group +- + !python{model: procurement.order} + search procurement from +- + Check a purchase quotation was created +- + + + + From 49e1cc58ad929635a6dfe0e079d2c7cd51dd8a73 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Tue, 20 Aug 2013 11:22:01 +0200 Subject: [PATCH 16/17] [IMP] Remove product from stock_location_path demo bzr revid: jco@openerp.com-20130820092201-skxo7gygyvtofqe6 --- addons/stock_location/stock_location_demo_cpu3.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/stock_location/stock_location_demo_cpu3.yml b/addons/stock_location/stock_location_demo_cpu3.yml index 52a18c4a68e..d1d4a2c8348 100644 --- a/addons/stock_location/stock_location_demo_cpu3.yml +++ b/addons/stock_location/stock_location_demo_cpu3.yml @@ -21,7 +21,6 @@ - !record {model: stock.location.path, id: push_pick}: name: Pick List - product_id: product.product_product_10 location_from_id: stock.stock_location_output location_dest_id: location_pack_zone picking_type_id: stock.picking_type_internal \ No newline at end of file From fb22df1f63e8450de458003bec51c0d1fb5d2696 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Tue, 20 Aug 2013 18:25:55 +0200 Subject: [PATCH 17/17] [IMP] Don't apply push when there is a move_dest_id bzr revid: jco@openerp.com-20130820162555-1pnhtnkeya6eccbe --- addons/purchase/purchase.py | 1 + addons/stock/stock.py | 8 +++++--- addons/stock_location/stock_location.py | 17 +++++++++-------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 4948a292a04..79df9f31103 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -290,6 +290,7 @@ class purchase_order(osv.osv): return {} return {'value': {'currency_id': self.pool.get('product.pricelist').browse(cr, uid, pricelist_id, context=context).currency_id.id}} + #Destination address is used when dropshipping def onchange_dest_address_id(self, cr, uid, ids, address_id): if not address_id: return {} diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 2dff89acfa2..357da1a3927 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -697,7 +697,8 @@ class stock_picking(osv.osv): self.action_done(cr, uid, [picking.id], context=context) continue for op in picking.pack_operation_ids: - if op.package_id: + #TODO: op.package_id can not work as quants_get is not defined on quant package => gives traceback + if op.package_id: for quant in quant_package_obj.quants_get(cr, uid, op.package_id, context=context): self._do_partial_product_move(cr, uid, picking, quant.product_id, quant.qty, quant, context=context) op.package_id.write(cr, uid, { @@ -705,12 +706,14 @@ class stock_picking(osv.osv): }, context=context) elif op.product_id: moves = self._do_partial_product_move(cr, uid, picking, op.product_id, op.product_qty, op.quant_id, context=context) + quants = [] for m in moves: for quant in m.quant_ids: quants.append(quant.id) quant_obj.write(cr, uid, quants, { 'package_id': op.result_package_id.id + }, context=context) self._create_backorder(cr, uid, picking, context=context) @@ -1506,7 +1509,7 @@ class stock_move(osv.osv): self.write(cr, uid, [move.id], { 'product_uom_qty': move.product_uom_qty - uom_qty, 'product_uos_qty': move.product_uos_qty - uos_qty, - 'reserved_quant_ids': [] + 'reserved_quant_ids': [(6,0,[])] }, context=context) return new_move @@ -1932,7 +1935,6 @@ class stock_pack_operation(osv.osv): 'lot_id': fields.many2one('stock.production.lot', 'Lot/Serial Number'), 'result_package_id': fields.many2one('stock.quant.package', 'Container Package', help="If set, the operations are packed into this package", required=False, ondelete='cascade'), 'date': fields.datetime('Date', required=True), - #'lot_id': fields.many2one('stock.production.lot', 'Serial Number', ondelete='CASCADE'), #'update_cost': fields.boolean('Need cost update'), 'cost': fields.float("Cost", help="Unit Cost for this product line"), 'currency': fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed", ondelete='CASCADE'), diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index 6daaf0858b1..7f27496ff0d 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -251,14 +251,15 @@ class stock_move(osv.osv): def _push_apply(self, cr, uid, moves, context): for move in moves: - for route in move.product_id.route_ids: - found = False - for rule in route.push_ids: - if rule.location_from_id.id == move.location_dest_id.id: - self.pool.get('stock.location.path')._apply(cr, uid, rule, move, context=context) - found = True - break - if found: break + if not move.move_dest_id: + for route in move.product_id.route_ids: + found = False + for rule in route.push_ids: + if rule.location_from_id.id == move.location_dest_id.id: + self.pool.get('stock.location.path')._apply(cr, uid, rule, move, context=context) + found = True + break + if found: break return True # Create the stock.move.putaway records