diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 6f6ab0c1b44..01f5c9faf11 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -188,7 +188,7 @@ class purchase_order(osv.osv): 'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'), 'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"), 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'), - 'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True, + 'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Reception')], 'Invoicing Control', required=True, help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \ "will just have to validate this invoice for control.\n" \ "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \ diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index bc74fc852c1..fc990ecefee 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -455,7 +455,7 @@ - Purchase Lines Not Invoiced + On Purchase Order Line ir.actions.act_window purchase.order.line [('order_id.invoice_method','<>','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)] diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index e3ff3247430..084e8761650 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -103,7 +103,7 @@ - Picking to Invoice + On Receptions stock.picking ir.actions.act_window form