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

[IMP] Corrected typo and bring some consistency in phrasing. 

bzr revid: vmt@openerp.com-20111109123842-bfqhitqwl1i28f1x
This commit is contained in:
Vo Minh Thu 2011-11-09 13:38:42 +01:00
parent 5ae27e27e1
commit dc027540d0
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/purchase/purchase.py
View File

@ -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 = {

6
addons/purchase/purchase_view.xml
View File

@ -112,7 +112,7 @@
<field name="help">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.</field>
</record>
<menuitem name="From pre-generated draft invoice"
<menuitem name="Based on generated invoice"
id="menu_procurement_management_pending_invoice"
action="action_invoice_pending"
parent="menu_procurement_management_invoice"
@ -495,14 +495,14 @@
<record id="purchase_line_form_action2" model="ir.actions.act_window">
<field name="name">From Purchase Order lines</field>
<field name="name">Based on Purchase Order lines</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>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="purchase_order_line_search"/>
<field name="help">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.</field>
<field name="help">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.</field>
</record>
<record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>

4
addons/purchase/stock_view.xml
View File

@ -104,7 +104,7 @@
</record>
<record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
<field name="name">From Reception</field>
<field name="name">Based on receptions</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -112,7 +112,7 @@
<field name="domain">[('type','=','in')]</field>
<field name="context">{'contact_display': 'partner_address',"search_default_done":1, "search_default_to_invoice":1}</field>
<field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
<field name="help">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.</field>
<field name="help">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.</field>
</record>
<menuitem action="action_picking_tree4_picking_to_invoice"