[MERGE] lp:~openerp-dev/openobject-addons/trunk-usability-purchase_order_invoice_control-han
bzr revid: stw@openerp.com-20110914151430-l2190z4f02wfmjjk
This commit is contained in:
@@ -188,7 +188,7 @@ 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','Manual'),('order','From Order'),('picking','From Reception')], 'Invoicing Control', required=True,
|
||||
'invoice_method': fields.selection([('manual','From PO/PO lines'),('order','Draft invoices pre-generated'),('picking','From receptions')], 'Invoicing Control', required=True,
|
||||
help="From Order: a draft invoice will be generated based on the purchase order. The accountant " \
|
||||
"will just have to validate this invoice for control.\n" \
|
||||
"From Reception: a draft invoice will be generated based on validated receptions.\n" \
|
||||
|
||||
Reference in New Issue
Block a user