From 038aee2d06f89d97b075d825f9f862b3aabf3dfd Mon Sep 17 00:00:00 2001 From: "Bharat R. Devnani (OpenERP)" Date: Wed, 21 Aug 2013 15:07:42 +0530 Subject: [PATCH 01/16] [IMP] improved the code bzr revid: bde@tinyerp.com-20130821093742-rt0lvwdw98aiwx3w --- addons/stock/procurement.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py index 4eeca78e0a1..e0c93957459 100644 --- a/addons/stock/procurement.py +++ b/addons/stock/procurement.py @@ -97,7 +97,6 @@ class procurement_order(osv.osv): move_obj = self.pool.get('stock.move') move_dict = self._run_move_create(cr, uid, procurement, context=context) move_id = move_obj.create(cr, uid, move_dict, context=context) - self.write(cr, uid, procurement.id, {'move_dest_id': move_id}, context=context) move_obj.action_confirm(cr, uid, [move_id], context=context) return move_id return super(procurement_order, self)._run(cr, uid, procurement, context) From 95c6b17bdef105c13627986809247bc899e2fe97 Mon Sep 17 00:00:00 2001 From: "Bharat R. Devnani (OpenERP)" Date: Thu, 22 Aug 2013 15:59:52 +0530 Subject: [PATCH 02/16] [IMP] improved the code bzr revid: bde@tinyerp.com-20130822102952-3kep0jyz0gnbq5fx --- addons/stock/procurement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py index e0c93957459..eae63e50642 100644 --- a/addons/stock/procurement.py +++ b/addons/stock/procurement.py @@ -86,7 +86,7 @@ class procurement_order(osv.osv): 'rule_id': procurement.rule_id.id, 'origin': procurement.origin, 'picking_type_id': procurement.rule_id.picking_type_id.id, - 'price_unit': procurement.sale_line_id.product_id.standard_price + 'price_unit': procurement.sale_line_id.product_id and procurement.sale_line_id.product_id.standard_price, } def _run(self, cr, uid, procurement, context=None): From 79d4ed0b8fd8058ee990ccc2aeefa03de140e1fd Mon Sep 17 00:00:00 2001 From: "Pooja Zankhariya (OpenERP Trainee)" Date: Thu, 22 Aug 2013 18:02:05 +0530 Subject: [PATCH 03/16] [IMP]Improved procurementexception yml bzr revid: pooja.zakhariya@gmail.com-20130822123205-ia2qzcdy0ou7ltbv --- addons/stock_complex_routes/__openerp__.py | 2 +- .../test/procurementexception.yml | 98 ++++++++++++------- 2 files changed, 63 insertions(+), 37 deletions(-) diff --git a/addons/stock_complex_routes/__openerp__.py b/addons/stock_complex_routes/__openerp__.py index 5426e2c7aca..476066a78ed 100644 --- a/addons/stock_complex_routes/__openerp__.py +++ b/addons/stock_complex_routes/__openerp__.py @@ -38,7 +38,7 @@ This adds a route on the sales order and sales order line (mini module) 'init_xml': [], 'update_xml': ['stock_complex_routes.xml'], 'demo_xml': [], - 'test': [], + 'test': ['test/procurementexception.yml'], 'installable': True, 'auto_install': True, } diff --git a/addons/stock_complex_routes/test/procurementexception.yml b/addons/stock_complex_routes/test/procurementexception.yml index 67afc101089..f94bed726f0 100644 --- a/addons/stock_complex_routes/test/procurementexception.yml +++ b/addons/stock_complex_routes/test/procurementexception.yml @@ -1,37 +1,63 @@ -- - 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 -- - - - - + I create a product with no supplier define for it. +- + !record {model: product.product, id: product_with_no_seller}: + name: 'product with no seller' + list_price: 20.00 + standard_price: 15.00 + categ_id: product.product_category_1 +- + I create a sales order with this product with route crossdock. +- + !record {model: sale.order, id: sale_order_route_crossdock}: + partner_id: base.res_partner_2 + partner_invoice_id: base.res_partner_address_3 + partner_shipping_id: base.res_partner_address_3 + note: crossdock route + payment_term: account.account_payment_term + order_line: + - product_id: product_with_no_seller + product_uom_qty: 1 + route_id: stock_location.route_warehouse0_crossdock +- + I confirm the sales order. +- + !workflow {model: sale.order, ref: sale_order_route_crossdock, action: order_confirm} +- + I check there is a procurement in exception that has the procurement group of the sales order created before. +- + !python {model: procurement.order}: | + self.run_scheduler(cr, uid) + sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) + proc_id = self.search(cr, uid, [('group_id.name', '=', sale_id.name), ('state', '=', 'exception')]) + assert proc_id, 'No Procurement!' +- + I set the at least one supplier on the product. +- + !record {model: product.product, id: product_with_no_seller}: + seller_ids: + - delay: 1 + name: base.res_partner_2 + min_qty: 2.0 +- + I run the Scheduler. +- + !python {model: procurement.order}: | + sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) + proc_id = self.search(cr, uid, [('group_id.name', '=', sale_id.name), ('state', '=', 'exception')]) + self.run(cr, uid, proc_id) +- + I check the status changed there is no procurement order in exception any more from that procurement group +- + !python {model: procurement.order}: | + sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) + proc_id = self.search(cr, uid, [('group_id.name', '=', sale_id.name), ('state', '=', 'exception')]) + assert not proc_id, 'Procurement should be in running state' +- + I check a purchase quotation was created. +- + !python {model: procurement.order}: | + sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) + proc_ids = self.search(cr, uid, [('group_id.name', '=', sale_id.name)]) + purchase_id = self.browse(cr, uid, proc_ids)[1].purchase_id + assert purchase_id, 'No Purchase Quotation is created' From b42f8b53db1c84c1e07e43bae27347565fef7497 Mon Sep 17 00:00:00 2001 From: "Bharat R. Devnani (OpenERP)" Date: Fri, 23 Aug 2013 12:21:19 +0530 Subject: [PATCH 04/16] [IMP] improved _get_orders method and added _get_orders_procurements method to complete the flow of Sale Order bzr revid: bde@tinyerp.com-20130823065119-6yje7t9nyfi3r5fl --- addons/sale_stock/sale_stock.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 3163365ffc0..920be1793c1 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -57,11 +57,18 @@ class sale_order(osv.osv): def _get_orders(self, cr, uid, ids, context=None): res = set() - for move in self.browse(cr, uid, ids, context=context): + for move in self.pool.get('stock.move').browse(cr, uid, ids, context=context): if move.procurement_id and move.procurement_id.sale_line_id: res.add(move.procurement_id.sale_line_id.order_id.id) return list(res) - + + def _get_orders_procurements(self, cr, uid, ids, context=None): + res = set() + for proc in self.pool.get('procurement.order').browse(cr, uid, ids, context=context): + if proc.sale_line_id: + res.add(proc.sale_line_id.order_id.id) + return list(res) + def _get_picking_ids(self, cr, uid, ids, name, args, context=None): res = {} for sale in self.browse(cr, uid, ids, context=context): @@ -107,7 +114,10 @@ class sale_order(osv.osv): ('prepaid', 'Before Delivery'), ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="""On demand: A draft invoice can be created from the sales order when needed. \nOn delivery order: A draft invoice can be created from the delivery order when the products have been delivered. \nBefore delivery: A draft invoice is created from the sales order and must be paid before the products can be delivered."""), - 'shipped': fields.function(_get_shipped, string='Delivered', type='boolean', store={'stock.move': (_get_orders, ['state'], 10)}), + 'shipped': fields.function(_get_shipped, string='Delivered', type='boolean', store={ + 'stock.move': (_get_orders, ['state'], 10), + 'procurement.order': (_get_orders_procurements, ['state'], 10) + }), 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True), 'picking_ids': fields.function(_get_picking_ids, method=True, type='one2many', relation='stock.picking', string='Picking associated to this sale'), } @@ -223,7 +233,7 @@ class sale_order(osv.osv): self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'}) if write_cancel_ids: self.pool.get('sale.order.line').write(cr, uid, write_cancel_ids, {'state': 'exception'}) - + if mode == 'finished': return finished elif mode == 'canceled': @@ -265,7 +275,7 @@ class sale_order(osv.osv): class sale_order_line(osv.osv): _inherit = 'sale.order.line' - + def _number_packages(self, cr, uid, ids, field_name, arg, context=None): res = {} for line in self.browse(cr, uid, ids, context=context): From b97a9da42dfdbd5ec1bc76f2f0860e4f5f0cce0d Mon Sep 17 00:00:00 2001 From: "Bharat R. Devnani (OpenERP)" Date: Mon, 26 Aug 2013 12:44:05 +0530 Subject: [PATCH 05/16] [REVERT] reverted the changes in _get_orders method bzr revid: bde@tinyerp.com-20130826071405-yax8hqw0esrll766 --- 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 920be1793c1..015347449ae 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -57,7 +57,7 @@ class sale_order(osv.osv): def _get_orders(self, cr, uid, ids, context=None): res = set() - for move in self.pool.get('stock.move').browse(cr, uid, ids, context=context): + for move in self.browse(cr, uid, ids, context=context): if move.procurement_id and move.procurement_id.sale_line_id: res.add(move.procurement_id.sale_line_id.order_id.id) return list(res) From 30685ddffb634397dc91e3398a0fe0a816d142db Mon Sep 17 00:00:00 2001 From: "Bharat R. Devnani (OpenERP)" Date: Mon, 26 Aug 2013 15:49:14 +0530 Subject: [PATCH 06/16] [IMP] overrided _run_move_create method to get standard price of a product bzr revid: bde@tinyerp.com-20130826101914-24jt4eqx8zqpvvbg --- addons/sale/sale.py | 8 +++++++- addons/stock/procurement.py | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index f733cfd9ff1..fa041b11370 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1082,4 +1082,10 @@ class procurement_order(osv.osv): _defaults = { 'invoice_state': 'none', } - + + def _run_move_create(self, cr, uid, procurement, context=None): + res = super(procurement_order, self)._run_move_create(cr, uid, procurement, context=context) + res.update({ + 'price_unit': procurement.sale_line_id and procurement.sale_line_id.product_id and procurement.sale_line_id.product_id.standard_price or 0.0, + }) + return res diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py index eae63e50642..7f36871b9d1 100644 --- a/addons/stock/procurement.py +++ b/addons/stock/procurement.py @@ -86,7 +86,6 @@ class procurement_order(osv.osv): 'rule_id': procurement.rule_id.id, 'origin': procurement.origin, 'picking_type_id': procurement.rule_id.picking_type_id.id, - 'price_unit': procurement.sale_line_id.product_id and procurement.sale_line_id.product_id.standard_price, } def _run(self, cr, uid, procurement, context=None): From 8a3640f70eff3543dccad922ae36a3c77f43a76e Mon Sep 17 00:00:00 2001 From: "Pooja Zankhariya (OpenERP Trainee)" Date: Tue, 27 Aug 2013 14:33:25 +0530 Subject: [PATCH 07/16] [IMP]Improved Code bzr revid: pooja.zakhariya@gmail.com-20130827090325-umd88itb3p16v6ry --- addons/stock_complex_routes/test/procurementexception.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock_complex_routes/test/procurementexception.yml b/addons/stock_complex_routes/test/procurementexception.yml index f94bed726f0..e5c7dbfd72c 100644 --- a/addons/stock_complex_routes/test/procurementexception.yml +++ b/addons/stock_complex_routes/test/procurementexception.yml @@ -40,7 +40,7 @@ name: base.res_partner_2 min_qty: 2.0 - - I run the Scheduler. + I run the Procurement. - !python {model: procurement.order}: | sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) @@ -59,5 +59,5 @@ !python {model: procurement.order}: | sale_id = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_route_crossdock")) proc_ids = self.search(cr, uid, [('group_id.name', '=', sale_id.name)]) - purchase_id = self.browse(cr, uid, proc_ids)[1].purchase_id + purchase_id = [proc.purchase_id for proc in self.browse(cr, uid, proc_ids) if proc.purchase_id] assert purchase_id, 'No Purchase Quotation is created' From cc4764f48fde77fc37f77d6e6e318a811da01e60 Mon Sep 17 00:00:00 2001 From: "Bharat R. Devnani (OpenERP)" Date: Tue, 27 Aug 2013 14:42:17 +0530 Subject: [PATCH 08/16] [REVERT] reverted price_unit changes bzr revid: bde@tinyerp.com-20130827091217-9l7wbz2v6weaxuoz --- addons/sale/sale.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 354a3b48301..83ec686b898 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1082,10 +1082,4 @@ class procurement_order(osv.osv): _defaults = { 'invoice_state': 'none', } - - def _run_move_create(self, cr, uid, procurement, context=None): - res = super(procurement_order, self)._run_move_create(cr, uid, procurement, context=context) - res.update({ - 'price_unit': procurement.sale_line_id and procurement.sale_line_id.product_id and procurement.sale_line_id.product_id.standard_price or 0.0, - }) - return res + \ No newline at end of file From 72e1113082a87664c3f52ec25b8ced327fe896e5 Mon Sep 17 00:00:00 2001 From: "Bharat R. Devnani (OpenERP)" Date: Tue, 27 Aug 2013 15:47:09 +0530 Subject: [PATCH 09/16] [IMP] assigned picking_policy of SO in move_type of procurement.group bzr revid: bde@tinyerp.com-20130827101709-8mp60l9rke2rpcqj --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 83ec686b898..6535ed7bc6d 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -658,7 +658,7 @@ class sale_order(osv.osv): for order in self.browse(cr, uid, ids, context=context): proc_ids = [] group_id = self.pool.get("procurement.group").create(cr, uid, { - 'name': order.name, 'partner_id': order.partner_shipping_id.id + 'name': order.name, 'partner_id': order.partner_shipping_id.id, 'move_type': order.picking_policy }, context=context) order.write({'procurement_group_id': group_id}, context=context) for line in order.order_line: From b1611b9fa7332d46c1959841685d93d76b176003 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Thu, 29 Aug 2013 11:53:27 +0200 Subject: [PATCH 10/16] [IMP] Remove procure_method in timesheet (branch bde) bzr revid: jco@openerp.com-20130829095327-jn9b06q1b3g3n07i --- .../test/worktask_entry_to_timesheetline_entry.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml index 99e5fc41401..2d95eb89d71 100644 --- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml +++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml @@ -14,8 +14,7 @@ !record {model: product.product, id: product_product_hrmanger0}: categ_id: product.product_category_6 mes_type: fixed - name: HR Manger - procure_method: make_to_stock + name: HR Manager standard_price: 1.0 supply_method: buy type: service From 9cd5e3f2f7600ef9d69f5222a29f464a517a3360 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (OpenERP)" Date: Thu, 29 Aug 2013 17:00:13 +0530 Subject: [PATCH 11/16] [IMP/ADD]dropship yml improve and add crossdock yml bzr revid: sgo@tinyerp.com-20130829113013-cqcpzoulg88lbdu2 --- addons/purchase/purchase.py | 2 + addons/stock_complex_routes/__openerp__.py | 6 +- .../stock_complex_routes/test/crossdock.yml | 38 +++++++ addons/stock_complex_routes/test/dropship.yml | 98 ++++++++++++------- 4 files changed, 106 insertions(+), 38 deletions(-) create mode 100644 addons/stock_complex_routes/test/crossdock.yml diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 660b70a488c..8efacf7f75e 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -386,6 +386,8 @@ class purchase_order(osv.osv): ''' This function returns an action that display existing picking orders of given purchase order ids. ''' + if context is None: + context = {} mod_obj = self.pool.get('ir.model.data') pick_ids = [] for po in self.browse(cr, uid, ids, context=context): diff --git a/addons/stock_complex_routes/__openerp__.py b/addons/stock_complex_routes/__openerp__.py index 872f42d98b5..0b2110b3eda 100644 --- a/addons/stock_complex_routes/__openerp__.py +++ b/addons/stock_complex_routes/__openerp__.py @@ -38,7 +38,11 @@ This adds a route on the sales order and sales order line (mini module) 'init_xml': [], 'update_xml': ['stock_complex_routes.xml'], 'demo_xml': [], - 'test': ['test/lifo_price.yml'], + 'test': [ + 'test/crossdock.yml', + 'test/dropship.yml', + 'test/lifo_price.yml' + ], 'installable': True, 'auto_install': True, } diff --git a/addons/stock_complex_routes/test/crossdock.yml b/addons/stock_complex_routes/test/crossdock.yml new file mode 100644 index 00000000000..dfdd08330b7 --- /dev/null +++ b/addons/stock_complex_routes/test/crossdock.yml @@ -0,0 +1,38 @@ +- + Create new product without any routes +- + !record {model: product.product, id: cross_shop_product}: + name: PCE + type: product + categ_id: product.product_category_1 + list_price: 100.0 + standard_price: 70.0 + seller_ids: + - delay: 1 + name: base.res_partner_2 + min_qty: 2.0 + qty: 5.0 + type: product + uom_id: product.product_uom_unit + uom_po_id: product.product_uom_unit +- + Create a sales order with a line of 100 PCE incoming shipment, with route_id crossdock shipping. +- + !record {model: sale.order, id: sale_order_crossdock_shpng}: + partner_id: base.res_partner_4 + note: Create Sales order + order_line: + - product_id: cross_shop_product + product_uom_qty: 100.00 + route_id: stock_location.route_warehouse0_crossdock +- + Confirm sales order +- + !python {model: sale.order}: | + self.action_button_confirm(cr, uid, [ref('sale_order_crossdock_shpng')]) +- + Check a quotation was created to a certain supplier and confirm so it becomes a confirmed purchase order +- + !python {model: purchase.order}: | + po_id = self.search(cr, uid, [('partner_id', '=', ref('base.res_partner_2'))]) + self.wkf_confirm_order(cr, uid, po_id) diff --git a/addons/stock_complex_routes/test/dropship.yml b/addons/stock_complex_routes/test/dropship.yml index 7bcb1b93a71..e63d072a118 100644 --- a/addons/stock_complex_routes/test/dropship.yml +++ b/addons/stock_complex_routes/test/dropship.yml @@ -1,53 +1,77 @@ - - Create new product without any routes + Create new product without any routes - - !record {model:product.product, id:} + !record {model: product.product, id: drop_shop_product}: + name: Pen drive + type: product + categ_id: product.product_category_1 + list_price: 100.0 + standard_price: 70.0 + seller_ids: + - delay: 1 + name: base.res_partner_2 + min_qty: 2.0 + qty: 5.0 + uom_id: product.product_uom_unit + uom_po_id: product.product_uom_unit - - Create a sales order with a line of 200 PCE incoming shipment, with route_id drop shipping + Create a sales order with a line of 200 PCE incoming shipment, with route_id drop shipping. - - !record {model: sale.order, id: } : - customer: - - product_id: - product_qty: 200 - product_uom: - supplier_ids: - - + !record {model: sale.order, id: sale_order_drp_shpng}: + partner_id: base.res_partner_2 + note: Create sale order for drop shipping + payment_term: account.account_payment_term + order_line: + - product_id: drop_shop_product + product_uom_qty: 200 + price_unit: 100.00 + route_id: route_drop_shipping - - Confirm sales order + Confirm sales order - - !python{model: sale.order}: | - self.browse(cr, uid, ref()).action_b + !workflow {model: sale.order, action: order_confirm, ref: sale_order_drp_shpng} - - Check the sales order created a procurement group which has a procurement of 200 pieces + Check the sales order created a procurement group which has a procurement of 200 pieces - - !python{model: procurement.group}: | - proc_group = self.search(cr, uid, [('sale_id', '=', ref())]) - assert self.browse(cr, uid, proc_group)[0].procurement_ids[0].product_qty == 200 + !python {model: procurement.group}: | + sale_record = self.pool.get("sale.order").browse(cr, uid, ref('sale_order_drp_shpng')) + assert self.browse(cr, uid, sale_record.procurement_group_id.id).procurement_ids[0].product_qty == 200 - - Check a quotation was created to a certain supplier and confirm so it becomes a confirmed purchase order + Check a quotation was created to a certain supplier and confirm so it becomes a confirmed purchase order +- + !python {model: purchase.order}: | + from openerp import netsvc + sale_record = self.pool.get("sale.order").browse(cr, uid, ref('sale_order_drp_shpng')) + procurement_order = self.pool.get("procurement.group").browse(cr, uid, sale_record.procurement_group_id.id).procurement_ids[0] + purchase_id = procurement_order.purchase_id.id + wf_service = netsvc.LocalService('workflow') + wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'purchase_confirm', cr) - - + Use 'Receive Products' button to immediately view this picking, it should have created a picking with 200 pieces.. +- + !python {model: purchase.order}: | + po_id = self.search(cr, uid, [('partner_id', '=', ref('base.res_partner_2'))]) + picking_id = self.search(cr, uid, [('purchase_id', '=', po_id[0])]) + context.update({'active_model': 'stock.picking', 'active_id': backorder_id[0], 'active_ids': backorder_id}) + self.view_picking(cr, uid, po_id) +- + Send the 200 pieces. - - Check the sales order has one picking with 200 pieces + !python {model: stock.picking}: | + po_id = self.pool.get('purchase.order').search(cr, uid, [('partner_id', '=', ref('base.res_partner_2'))]) + picking_id = self.search(cr, uid, [('purchase_id', '=', po_id[0])]) + self.do_partial(cr, uid, picking_id) - - !python{model: sale.order}: | - assert len(self.browse(cr, uid, ref()).picking_ids) == 1 + Check one quant was created in Customers location with 200 pieces and one move in the history_ids - - Use 'View Delivery Order' button to immediately view this picking and check shipped of purchase order is False -- - -- - Send the 200 pieces -- - !python{model: stock.partial.picking}: | - - -- - Check one quant was created in Customers location with 200 pieces and one move in the move_history_ids -- - + !python {model: stock.quant}: | + quant_id = self.search(cr, uid, [('location_id', '=', ref('stock.stock_location_customers')),('qty', '=', 200)]) + assert len(self.browse(cr, uid, quant_id)[0].history_ids) == 1 + assert len(quant_id) == 1 - Check the sum of the moves related to this product and the sum of the quants is equal - - + !python {model: stock.quant}: | + move_ids = self.pool.get('stock.move').search(cr, uid, [('product_id', '=', ref('drop_shop_product'))]) + quant_ids = self.search(cr, uid, [('product_id', '=', ref('drop_shop_product'))]) + assert len(move_ids) == len(quant_ids) From fd88e3fd232f721ff2c597f851685a5af617bd69 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (OpenERP)" Date: Thu, 29 Aug 2013 17:05:01 +0530 Subject: [PATCH 12/16] [IMP]improve code used sale order confirm workflow instead of method bzr revid: sgo@tinyerp.com-20130829113501-cvxtjp3e0i7f27ma --- addons/stock_complex_routes/test/crossdock.yml | 3 +-- addons/stock_complex_routes/test/dropship.yml | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/stock_complex_routes/test/crossdock.yml b/addons/stock_complex_routes/test/crossdock.yml index dfdd08330b7..e757cbfd554 100644 --- a/addons/stock_complex_routes/test/crossdock.yml +++ b/addons/stock_complex_routes/test/crossdock.yml @@ -28,8 +28,7 @@ - Confirm sales order - - !python {model: sale.order}: | - self.action_button_confirm(cr, uid, [ref('sale_order_crossdock_shpng')]) + !workflow {model: sale.order, action: order_confirm, ref: sale_order_crossdock_shpng} - Check a quotation was created to a certain supplier and confirm so it becomes a confirmed purchase order - diff --git a/addons/stock_complex_routes/test/dropship.yml b/addons/stock_complex_routes/test/dropship.yml index e63d072a118..9b3a786acd1 100644 --- a/addons/stock_complex_routes/test/dropship.yml +++ b/addons/stock_complex_routes/test/dropship.yml @@ -51,8 +51,6 @@ - !python {model: purchase.order}: | po_id = self.search(cr, uid, [('partner_id', '=', ref('base.res_partner_2'))]) - picking_id = self.search(cr, uid, [('purchase_id', '=', po_id[0])]) - context.update({'active_model': 'stock.picking', 'active_id': backorder_id[0], 'active_ids': backorder_id}) self.view_picking(cr, uid, po_id) - Send the 200 pieces. From 48f217177953cd6ecc38b4966ead137a0a1dd886 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Thu, 29 Aug 2013 15:02:07 +0200 Subject: [PATCH 13/16] [WIP] Split of moves bzr revid: jco@openerp.com-20130829130207-vablfdmy0hfq8ar8 --- addons/stock/stock.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 740e60b9a50..7ece3c202dc 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -332,7 +332,7 @@ class stock_quant(osv.osv): def quants_unreserve(self, cr, uid, move, context=None): #cr.execute('update stock_quant set reservation_id=NULL where reservation_id=%s', (move.id,)) #need write for related store of remaining qty - related_quants = self.search(cr, uid, [('reservation_id', '=', move.id)], context=context) + related_quants = [x.id for x in move.reserved_quant_ids] self.write(cr, uid, related_quants, {'reservation_id': False}, context=context) return True @@ -1442,6 +1442,8 @@ class stock_move(osv.osv): """ context = context or {} for move in self.browse(cr, uid, ids, context=context): + if move.reserved_quant_ids: + self.pool.get("stock.quant").quants_unreserve(cr, uid, move, context=context) if move.move_dest_id: if move.propagate: self.action_cancel(cr, uid, [move.move_dest_id.id], context=context) @@ -1616,10 +1618,9 @@ class stock_move(osv.osv): return res def split(self, cr, uid, move, qty, context=None): - """ Partially (or not) moves a stock.move. - @param partial_datas: Dictionary containing details of partial picking - like partner_id, delivery_date, delivery - moves with product_id, product_qty, uom + """ + Splits qty from move move into a new move + It will check if it can propagate the split """ if move.product_qty==qty: return move.id @@ -1648,6 +1649,9 @@ class stock_move(osv.osv): 'product_uos_qty': move.product_uos_qty - uos_qty, # 'reserved_quant_ids': [(6,0,[])] SHOULD NOT CHANGE as it has been reserved already }, context=context) + + if move.move_dest_id and move.propagate: + self.split(self, cr, uid, move.move_dest_id, qty, context=context) return new_move class stock_inventory(osv.osv): @@ -1925,7 +1929,7 @@ report_sxw.report_sxw('report.stock.quant.package.barcode', 'stock.quant.package class stock_package(osv.osv): """ - These are the packages, containing quants and/or others packages + These are the packages, containing quants and/or other packages """ _name = "stock.quant.package" _description = "Physical Packages" From 6d55144ca9c4d3bfd12a9f9d5df55cbd16652998 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Thu, 29 Aug 2013 15:05:29 +0200 Subject: [PATCH 14/16] [IMP] Correct error from merge bzr revid: jco@openerp.com-20130829130529-1nuyi9qijuh9cyw6 --- addons/stock_complex_routes/test/dropship.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/addons/stock_complex_routes/test/dropship.yml b/addons/stock_complex_routes/test/dropship.yml index 9b3a786acd1..a8f19969dc4 100644 --- a/addons/stock_complex_routes/test/dropship.yml +++ b/addons/stock_complex_routes/test/dropship.yml @@ -66,10 +66,3 @@ quant_id = self.search(cr, uid, [('location_id', '=', ref('stock.stock_location_customers')),('qty', '=', 200)]) assert len(self.browse(cr, uid, quant_id)[0].history_ids) == 1 assert len(quant_id) == 1 -- - Check the sum of the moves related to this product and the sum of the quants is equal -- - !python {model: stock.quant}: | - move_ids = self.pool.get('stock.move').search(cr, uid, [('product_id', '=', ref('drop_shop_product'))]) - quant_ids = self.search(cr, uid, [('product_id', '=', ref('drop_shop_product'))]) - assert len(move_ids) == len(quant_ids) From 81cb96eb9290f3e890620fd1506d4f88c3a0fd8b Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Thu, 29 Aug 2013 18:04:33 +0200 Subject: [PATCH 15/16] [IMP] Change to followed route bzr revid: jco@openerp.com-20130829160433-71wo5rgowv61dhhj --- addons/stock_location/stock_location.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index 77d1a67149a..2cdffdad785 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -155,7 +155,7 @@ class procurement_rule(osv.osv): class procurement_order(osv.osv): _inherit = 'procurement.order' _columns = { - 'route_ids': fields.many2many('stock.location.route', 'stock_location_route_procurement', 'procurement_id', 'route_id', 'Destination route', help="Preferred route to be followed by the procurement order"), + 'route_ids': fields.many2many('stock.location.route', 'stock_location_route_procurement', 'procurement_id', 'route_id', 'Followed Route', help="Preferred route to be followed by the procurement order"), } def _run_move_create(self, cr, uid, procurement, context=None): From 1a1338fa41c2c77dd11f907f28728e8adc23037a Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 30 Aug 2013 10:16:48 +0200 Subject: [PATCH 16/16] [IMP] Add invoice_state on move in stock_account and make sure it gets passed through procurement on the move bzr revid: jco@openerp.com-20130830081648-mmfxshzl9cuk3jg6 --- addons/sale_stock/sale_stock.py | 5 +- addons/stock/stock.py | 5 +- addons/stock_account/stock.py | 70 ++++++++++++++++----- addons/stock_account/stock_account.py | 5 -- addons/stock_account/stock_account_view.xml | 12 +++- addons/stock_location/stock_location.py | 6 +- 6 files changed, 74 insertions(+), 29 deletions(-) diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 015347449ae..055b4309d6d 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -168,11 +168,12 @@ class sale_order(osv.osv): # if order_policy<>picking: super() # else: call invoice_on_picking_method() def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_invoice = False, context=None): - picking_obj = self.pool.get('stock.picking') + move_obj = self.pool.get("stock.move") res = super(sale_order,self).action_invoice_create(cr, uid, ids, grouped=grouped, states=states, date_invoice = date_invoice, context=context) for order in self.browse(cr, uid, ids, context=context): if order.order_policy == 'picking': - picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'}) + for picking in order.picking_ids: + move_obj.write(cr, uid, [x.id for x in picking.move_lines], {'invoice_state': 'invoiced'}, context=context) return res def action_cancel(self, cr, uid, ids, context=None): diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 7ece3c202dc..819762b06c2 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1130,7 +1130,10 @@ class stock_move(osv.osv): 'origin_returned_move_id': fields.many2one('stock.move', 'Origin return move', help='move that created the return move'), 'returned_move_ids': fields.one2many('stock.move', 'origin_returned_move_id', 'All returned moves', help='Optional: all returned moves created from this move'), 'availability': fields.function(_get_product_availability, type='float', string='Availability'), - } + } + + + def copy(self, cr, uid, id, default=None, context=None): if default is None: diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py index e404ab3dd7b..312b1668f6d 100644 --- a/addons/stock_account/stock.py +++ b/addons/stock_account/stock.py @@ -22,6 +22,55 @@ from openerp.osv import fields, osv from openerp.tools.translate import _ +#---------------------------------------------------------- +# Procurement Rule +#---------------------------------------------------------- +class procurement_rule(osv.osv): + _inherit = 'procurement.rule' + _columns= { + 'invoice_state': fields.selection([ + ("invoiced", "Invoiced"), + ("2binvoiced", "To Be Invoiced"), + ("none", "Not Applicable")], "Invoice Status", + required=False), + } + +#---------------------------------------------------------- +# Procurement Order +#---------------------------------------------------------- + + +class procurement_order(osv.osv): + _inherit = "procurement.order" + + def _run_move_create(self, cr, uid, procurement, context=None): + res = super(procurement_order, self)._run_move_create(cr, uid, procurement, context=context) + res.update({'invoice_state': procurement.rule_id.invoice_state in ('none', False) and procurement.invoice_state or procurement.rule_id.invoice_state }) + return res + + +#---------------------------------------------------------- +# Move +#---------------------------------------------------------- + +class stock_move(osv.osv): + _inherit = "stock.move" + _columns = { + 'invoice_state': fields.selection([("invoiced", "Invoiced"), + ("2binvoiced", "To Be Invoiced"), + ("none", "Not Applicable")], "Invoice Control", + select=True, required=True, track_visibility='onchange', + states={'draft': [('readonly', False)]}), + } + _defaults= { + 'invoice_state': lambda *args, **argv: 'none' + } + + + +#---------------------------------------------------------- +# Picking +#---------------------------------------------------------- class stock_picking(osv.osv): _inherit = 'stock.picking' @@ -30,22 +79,13 @@ class stock_picking(osv.osv): for pick in self.browse(cr, uid, ids, context=context): result[pick.id] = 'none' for move in pick.move_lines: - if move.procurement_id: - if move.procurement_id.invoice_state=='invoiced': - result[pick.id] = 'invoiced' - elif move.procurement_id.invoice_state=='2binvoiced': - result[pick.id] = '2binvoiced' - break + if move.invoice_state=='invoiced': + result[pick.id] = 'invoiced' + elif move.invoice_state=='2binvoiced': + result[pick.id] = '2binvoiced' + break return result - def __get_picking_procurement(self, cr, uid, ids, context={}): - result = {} - for proc in self.pool.get('procurement.order').browse(cr, uid, ids, context=context): - for move in proc.move_ids: - if move.picking_id: - 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): @@ -59,8 +99,8 @@ class stock_picking(osv.osv): ("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), 'stock.move': (__get_picking_move, ['picking_id'], 10), }, diff --git a/addons/stock_account/stock_account.py b/addons/stock_account/stock_account.py index f9e62fa80e2..659f53adf91 100644 --- a/addons/stock_account/stock_account.py +++ b/addons/stock_account/stock_account.py @@ -34,11 +34,6 @@ import openerp.addons.decimal_precision as dp import logging _logger = logging.getLogger(__name__) -#---------------------------------------------------------- -# Invoice state -#---------------------------------------------------------- - - #---------------------------------------------------------- diff --git a/addons/stock_account/stock_account_view.xml b/addons/stock_account/stock_account_view.xml index a7e6bc8afe9..c6f9a581858 100644 --- a/addons/stock_account/stock_account_view.xml +++ b/addons/stock_account/stock_account_view.xml @@ -29,8 +29,18 @@ - + + + stock.move.form.inherit + stock.move + + + + + + + diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index 2cdffdad785..fc36d48d7f9 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -133,11 +133,7 @@ class procurement_rule(osv.osv): 'delay': fields.integer('Number of Hours'), 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."), 'partner_address_id': fields.many2one('res.partner', 'Partner Address'), - 'invoice_state': fields.selection([ - ("invoiced", "Invoiced"), - ("2binvoiced", "To Be Invoiced"), - ("none", "Not Applicable")], "Invoice Status", - required=True,), + 'route_sequence': fields.related('route_id', 'sequence', string='Route Sequence', store={'stock.location.route': (_get_rules, ['sequence'], 10)}), 'sequence': fields.integer('Sequence'), 'propagate': fields.boolean('Propagate cancel and split', help='If checked, when the previous move of the move (which was generated by a next procurement) is cancelled or split, the move generated by this move will too'),