odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[Usability] changes with purchase, renaming field name and menu name 

bzr revid: tta@openerp.com-20110530062309-gp9ltvu3pmhcdk90
This commit is contained in:
Tejas (OpenERP) 2011-05-30 11:53:09 +05:30
parent baed775786
commit f375570a9c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase/purchase.py
View File

@ -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" \

2
addons/purchase/purchase_view.xml
View File

@ -455,7 +455,7 @@
<record id="purchase_line_form_action2" model="ir.actions.act_window">
<field name="name">Purchase Lines Not Invoiced</field>
<field name="name">On Purchase Order Line</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order.line</field>
<field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>

2
addons/purchase/stock_view.xml
View File

@ -103,7 +103,7 @@
</record>
<record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
<field name="name">Picking to Invoice</field>
<field name="name">On Receptions</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>