From b5d729d874493c5e7669003cc5b8a200f2ce160b Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 7 Aug 2013 16:06:29 +0530 Subject: [PATCH 1/6] [IMP] stock_picking_out replace with stock_picking and set required field false bzr revid: rma@tinyerp.com-20130807103629-h6rc3mxmupyb0945 --- addons/mrp_repair/mrp_repair.py | 4 ++-- addons/sale_stock/stock.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 6e8a56ad7f0..bf8aa3260e4 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -518,7 +518,7 @@ class mrp_repair(osv.osv): }) repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context) if repair.deliver_bool: - pick_name = seq_obj.get(cr, uid, 'stock.picking.out') + pick_name = seq_obj.get(cr, uid, 'stock.picking') picking = pick_obj.create(cr, uid, { 'name': pick_name, 'origin': repair.name, @@ -527,7 +527,7 @@ class mrp_repair(osv.osv): 'partner_id': repair.address_id and repair.address_id.id or False, 'note': repair.internal_notes, 'invoice_state': 'none', - 'type': 'out', + 'picking_type_id': self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context).id }) move_id = move_obj.create(cr, uid, { 'name': repair.name, diff --git a/addons/sale_stock/stock.py b/addons/sale_stock/stock.py index 2af7e1518f8..fc7fecba2d1 100644 --- a/addons/sale_stock/stock.py +++ b/addons/sale_stock/stock.py @@ -50,7 +50,7 @@ class stock_picking(osv.osv): ("invoiced", "Invoiced"), ("2binvoiced", "To Be Invoiced"), ("none", "Not Applicable") - ], string="Invoice Control", required=True, + ], string="Invoice Control", required=False, store={ 'procurement.order': (__get_picking_procurement, ['invoice_state'], 10), 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10) From 8773c107c6c29fb9affb8e9cdb4ff59135c90a38 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 7 Aug 2013 18:39:48 +0530 Subject: [PATCH 2/6] [IMP] remove invoice_state field from create,write methods and _default at stock.picking bzr revid: rma@tinyerp.com-20130807130948-vcvh73ufmv7zed7i --- addons/account_anglo_saxon/test/anglo_saxon.yml | 1 - addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml | 1 - addons/mrp_repair/mrp_repair.py | 1 - addons/point_of_sale/point_of_sale.py | 1 - addons/purchase/purchase.py | 1 - addons/sale_stock/sale_stock.py | 2 +- addons/sale_stock/stock.py | 3 --- addons/sale_stock/test/picking_order_policy.yml | 1 - addons/stock/test/shipment.yml | 3 --- addons/stock_invoice_directly/test/stock_invoice_directly.yml | 1 - 10 files changed, 1 insertion(+), 14 deletions(-) diff --git a/addons/account_anglo_saxon/test/anglo_saxon.yml b/addons/account_anglo_saxon/test/anglo_saxon.yml index 6e9ebc0068e..b6516f53b00 100644 --- a/addons/account_anglo_saxon/test/anglo_saxon.yml +++ b/addons/account_anglo_saxon/test/anglo_saxon.yml @@ -189,7 +189,6 @@ - !record {model: stock.picking, id: stock_picking_out001}: partner_id: base.res_partner_13 - invoice_state: 2binvoiced move_lines: - company_id: base.main_company location_id: stock.stock_location_stock diff --git a/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml b/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml index f7d52f4f5a8..8fba961f429 100644 --- a/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml +++ b/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml @@ -192,7 +192,6 @@ - !record {model: stock.picking, id: stock_picking_out001_fifo}: partner_id: base.res_partner_13 - invoice_state: 2binvoiced move_lines: - company_id: base.main_company location_id: stock.stock_location_stock diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index bf8aa3260e4..55fb41b9e6e 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -526,7 +526,6 @@ class mrp_repair(osv.osv): 'move_type': 'one', 'partner_id': repair.address_id and repair.address_id.id or False, 'note': repair.internal_notes, - 'invoice_state': 'none', 'picking_type_id': self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context).id }) move_id = move_obj.create(cr, uid, { diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 91a56e329ef..440c126e902 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -704,7 +704,6 @@ class pos_order(osv.osv): 'company_id': order.company_id.id, 'move_type': 'direct', 'note': order.note or "", - 'invoice_state': 'none', }, context=context) self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context) location_id = order.warehouse_id.lot_stock_id.id diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 31522c26dd9..00a62153865 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -659,7 +659,6 @@ class purchase_order(osv.osv): 'origin': order.name + ((order.origin and (':' + order.origin)) or ''), 'date': self.date_to_datetime(cr, uid, order.date_order, context), 'partner_id': order.dest_address_id.id or order.partner_id.id, - 'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none', 'partner_id': order.dest_address_id.id or order.partner_id.id, 'purchase_id': order.id, 'company_id': order.company_id.id, diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 707adb27a7e..33a7832b0a0 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -162,7 +162,7 @@ class sale_order(osv.osv): 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'}) + picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids)) return res def action_cancel(self, cr, uid, ids, context=None): diff --git a/addons/sale_stock/stock.py b/addons/sale_stock/stock.py index fc7fecba2d1..20ac9fc7e1d 100644 --- a/addons/sale_stock/stock.py +++ b/addons/sale_stock/stock.py @@ -57,9 +57,6 @@ class stock_picking(osv.osv): }, ), } - _defaults = { - 'invoice_state': lambda *args, **argv: 'none' - } def action_invoice_create(self, cr, uid, ids, journal_id=False, group=False, type='out_invoice', context=None): """ Creates invoice based on the invoice state selected for picking. diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml index e28b4b066d4..5fc40b3041a 100644 --- a/addons/sale_stock/test/picking_order_policy.yml +++ b/addons/sale_stock/test/picking_order_policy.yml @@ -61,7 +61,6 @@ assert picking.move_type == sale_order.picking_policy,"Delivery Method is not corresponding with delivery method of sale order." assert picking.partner_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order." assert picking.note == sale_order.note,"Note is not correspond with sale order." - assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order." assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines." location_id = sale_order.warehouse_id.lot_stock_id.id output_id = sale_order.warehouse_id.lot_output_id.id diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml index 70f9b14c57a..bf3472160c1 100644 --- a/addons/stock/test/shipment.yml +++ b/addons/stock/test/shipment.yml @@ -78,9 +78,6 @@ - I return last incomming shipment for 10 kgm Ice-cream. -- - !record {model: stock.return.picking, id: return_incomming}: - invoice_state: none - !python {model: stock.return.picking }: | # this work without giving the id of the picking to return, magically, thanks to the context diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml index 53ecee5be8d..a64171b7b3f 100644 --- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml +++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml @@ -6,7 +6,6 @@ - !record {model: stock.picking, id: stock_picking_out0}: partner_id: base.res_partner_address_22 - invoice_state: 2binvoiced move_lines: - company_id: base.main_company location_id: stock.stock_location_stock From 31327ae0bd481ac3adb0eb5467b3d85829da1d7a Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 7 Aug 2013 19:03:43 +0530 Subject: [PATCH 3/6] [IMP] change unnecessary code bzr revid: rma@tinyerp.com-20130807133343-jpz5p2t0bs8x3dm9 --- addons/sale_stock/sale_stock.py | 2 +- addons/sale_stock/test/picking_order_policy.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 33a7832b0a0..707adb27a7e 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -162,7 +162,7 @@ class sale_order(osv.osv): 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)) + picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'}) return res def action_cancel(self, cr, uid, ids, context=None): diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml index 5fc40b3041a..e28b4b066d4 100644 --- a/addons/sale_stock/test/picking_order_policy.yml +++ b/addons/sale_stock/test/picking_order_policy.yml @@ -61,6 +61,7 @@ assert picking.move_type == sale_order.picking_policy,"Delivery Method is not corresponding with delivery method of sale order." assert picking.partner_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order." assert picking.note == sale_order.note,"Note is not correspond with sale order." + assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order." assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines." location_id = sale_order.warehouse_id.lot_stock_id.id output_id = sale_order.warehouse_id.lot_output_id.id From 3dcf4dbca0e6e414e3415b645a75f2bf8a7e0b39 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Thu, 8 Aug 2013 16:15:11 +0530 Subject: [PATCH 4/6] [IMP] NO prodlot_id on mrp_repair anymore,so remove it temporary bzr revid: rma@tinyerp.com-20130808104511-9d9gq2f7mvpr9fn4 --- addons/mrp_repair/report/order.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index 202ed6e4684..1b0cbe99d4a 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -256,7 +256,7 @@ [[ o.product_id.name or '' ]] - [[ o.prodlot_id.name or ' ' ]] + [[ ' ' ]], [[ formatLang(o.guarantee_limit,date = True) ]] From 1de64720e5d0398b02c597e88fc2445887f206ea Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 4 Sep 2013 15:15:42 +0530 Subject: [PATCH 5/6] [IMP] remove extra changes bzr revid: rma@tinyerp.com-20130904094542-9jvq742bhcrf6frp --- addons/mrp_repair/report/order.rml | 2 +- addons/point_of_sale/point_of_sale.py | 1 + addons/purchase/purchase.py | 1 + addons/stock_invoice_directly/test/stock_invoice_directly.yml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index 1b0cbe99d4a..e0f89a14b73 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -256,7 +256,7 @@ [[ o.product_id.name or '' ]] - [[ ' ' ]], + [[ o.prodlot_id.name or ' ' ]] [[ formatLang(o.guarantee_limit,date = True) ]] diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 4f216106f28..4767d90f188 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -714,6 +714,7 @@ class pos_order(osv.osv): 'company_id': order.company_id.id, 'move_type': 'direct', 'note': order.note or "", + 'invoice_state': 'none', }, context=context) self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context) location_id = picking_type.default_location_src_id.id diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 41d946ba671..84c915bd130 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -672,6 +672,7 @@ class purchase_order(osv.osv): 'origin': order.name + ((order.origin and (':' + order.origin)) or ''), 'date': self.date_to_datetime(cr, uid, order.date_order, context), 'partner_id': order.dest_address_id.id or order.partner_id.id, + 'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none', 'partner_id': order.dest_address_id.id or order.partner_id.id, 'purchase_id': order.id, 'company_id': order.company_id.id, diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml index a061e41c095..5e2daaccf4f 100644 --- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml +++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml @@ -6,6 +6,7 @@ - !record {model: stock.picking, id: stock_picking_out0}: partner_id: base.res_partner_address_22 + invoice_state: 2binvoiced move_lines: - company_id: base.main_company location_id: stock.stock_location_stock From 8456731094b031ec67affe360fc31d1137b9dc8d Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 4 Sep 2013 15:22:28 +0530 Subject: [PATCH 6/6] [IMP] code optimize bzr revid: rma@tinyerp.com-20130904095228-66c98cs8xe9qhkm4 --- addons/mrp_repair/mrp_repair.py | 1 + addons/mrp_repair/report/order.rml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 6e747c9624c..7d4b96559f7 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -525,6 +525,7 @@ class mrp_repair(osv.osv): 'move_type': 'one', 'partner_id': repair.address_id and repair.address_id.id or False, 'note': repair.internal_notes, + 'invoice_state': 'none', 'picking_type_id': self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context).id }) move_id = move_obj.create(cr, uid, { diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index e0f89a14b73..202ed6e4684 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -256,7 +256,7 @@ [[ o.product_id.name or '' ]] - [[ o.prodlot_id.name or ' ' ]] + [[ o.prodlot_id.name or ' ' ]] [[ formatLang(o.guarantee_limit,date = True) ]]