Tejas Tank (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into
lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/68655
Hello,
All required new changes are applied.
Thanks,
Tejas - [email protected]
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/68655
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2011-07-08 09:22:32 +0000
+++ purchase/purchase.py 2011-07-21 10:28:16 +0000
@@ -188,7 +188,7 @@
'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 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" \
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2011-05-30 06:23:09 +0000
+++ purchase/stock_view.xml 2011-07-21 10:28:16 +0000
@@ -103,7 +103,7 @@
</record>
<record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
- <field name="name">On Receptions</field>
+ <field name="name">Picking to Invoice</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@@ -111,7 +111,7 @@
<field name="domain">[('type','=','in')]</field>
<field name="context">{'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 picking. If you selected this invoice method in the purchase order, all reception done are available here to be invoiced.</field>
+ <field name="help">Create invoice from reception of products. If you selected this invoice control method in the purchase order, all reception done are available here to be invoiced.</field>
</record>
<menuitem action="action_picking_tree4_picking_to_invoice"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
