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

[IMP]:improve title Based on receptions by Bases on incoming shipments in yml and xml files 

bzr revid: ssu@tinyerp.com-20120507054656-vgzgavr908v9y9mj
This commit is contained in:
Saurang Suthar (OpenERP) 2012-05-07 11:16:56 +05:30
parent f2c731459b
commit ecf4383009
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase/purchase.py
View File

@ -182,7 +182,7 @@ class purchase_order(osv.osv):
'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Bases on incoming shipments')], 'Invoicing Control', required=True,
help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from 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."
"Bases on incoming shipments: 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 = {

4
addons/purchase/stock_view.xml
View File

@ -100,7 +100,7 @@
</record>
<record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
<field name="name">Based on receptions</field>
<field name="name">Bases on incoming shipments</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -108,7 +108,7 @@
<field name="domain">[('type','=','in')]</field>
<field name="context">{"default_type": "in", "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">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>
<field name="help">If you set the Invoicing Control on a purchase order as "Bases on incoming shipments", you can track here all the product receptions and create invoices for those receptions.</field>
</record>
<menuitem action="action_picking_tree4_picking_to_invoice"

2
addons/purchase/test/process/generate_invoice_from_reception.yml
View File

@ -1,5 +1,5 @@
-
I confirm another order where invoice control is 'Based on receptions'.
I confirm another order where invoice control is 'Bases on incoming shipments'.
-
!workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase2}
-