From 5ae27e27e13e13d5d71881cee3612793b830779b Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Wed, 9 Nov 2011 12:21:27 +0530 Subject: [PATCH 1/2] [polish2_purchase],rename the invoice control from PO and rename the menu from purchase/invoice control bzr revid: amb@tinyerp.com-20111109065127-e9zl9xor5j2djive --- addons/purchase/purchase.py | 4 ++-- addons/purchase/purchase_view.xml | 4 ++-- addons/purchase/stock_view.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 4c48d971d47..b58f54dfb09 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -188,10 +188,10 @@ class purchase_order(osv.osv): 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'), 'invoiced': fields.function(_invoiced, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"), 'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'), - 'invoice_method': fields.selection([('manual','Based on purchase order lines'),('order','Draft invoices pre-generated'),('picking','Based on receptions')], 'Invoicing Control', required=True, + 'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on pr-generated draft invoice'),('picking','Based on reception')], 'Invoicing Control', required=True, help="Based on orders: a draft invoice will be generated based on the purchase order. The accountant " \ "will just have to validate this invoice for control.\n" \ - "Based on receptions: a draft invoice will be generated based on validated receptions.\n" \ + "Based on reception: a draft invoice will be generated based on validated receptions.\n" \ "Pre-generate Invoice: allows you to generate draft suppliers invoices on validation of the PO." ), 'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.", diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 3e9a6d97ddf..83c14b251d4 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -112,7 +112,7 @@ Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it. - - On Purchase Order Lines + From Purchase Order lines 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 5b9901a9a49..f4187907085 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -104,7 +104,7 @@ - On Incoming Shipments + From Reception stock.picking ir.actions.act_window form From dc027540d0380f8775a8451436d69d3ae498f97f Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 9 Nov 2011 13:38:42 +0100 Subject: [PATCH 2/2] [IMP] Corrected typo and bring some consistency in phrasing. bzr revid: vmt@openerp.com-20111109123842-bfqhitqwl1i28f1x --- addons/purchase/purchase.py | 9 ++++----- addons/purchase/purchase_view.xml | 6 +++--- addons/purchase/stock_view.xml | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index b58f54dfb09..eb372301d06 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -188,11 +188,10 @@ class purchase_order(osv.osv): 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'), 'invoiced': fields.function(_invoiced, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"), 'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'), - 'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on pr-generated draft invoice'),('picking','Based on reception')], 'Invoicing Control', required=True, - help="Based on orders: a draft invoice will be generated based on the purchase order. The accountant " \ - "will just have to validate this invoice for control.\n" \ - "Based on reception: a draft invoice will be generated based on validated receptions.\n" \ - "Pre-generate Invoice: allows you to generate draft suppliers invoices on validation of the PO." + 'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated invoice'),('picking','Based on receptions')], 'Invoicing Control', required=True, + help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' frow where you can selectively create an invoice.\n" \ + "Based on generated invoice: create a draft invoice you can validate later.\n" \ + "Based on receptions: let you create an invoice when receptions are validated." ), 'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.", store = { diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 83c14b251d4..45732b99173 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -112,7 +112,7 @@ Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it. - - From Purchase Order lines + Based on Purchase Order lines ir.actions.act_window purchase.order.line [('order_id.invoice_method','<>','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)] form tree,form - If you set the invoicing control on a purchase order as "Based on Purchase Order Lines", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu. + If you set the Invoicing Control on a purchase order as "Based on Purchase Order lines", you can track here all the purchase order lines for which you have not yet received the supplier invoice. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu. diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index f4187907085..0e2a1852eca 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -104,7 +104,7 @@ - From Reception + Based on receptions stock.picking ir.actions.act_window form @@ -112,7 +112,7 @@ [('type','=','in')] {'contact_display': 'partner_address',"search_default_done":1, "search_default_to_invoice":1} - Create invoice from reception of products. If you selected this invoice control method in the purchase order, all receptions done are available here to be invoiced. + If you set the Invoicing Control on a purchase order as "Based on receptions", you can track here all the product receptions and create invoices for those receptions.