Tejaskumar 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/62826
Hello,
For purchase improvement, below changes are applied,
1) In po, second tab, in the selection "Invoicing Control" rename "from
picking" into "from reception"
2) Rename menu entry "Purchase lines not invoiced" (Purchases/Invoice
Control/Purchase lines not invoiced) into "on purchase order line"
3) Rename menu entry "Picking to invoice" (Purchases/Invoice Control/Picking
to invoice) into "On Receptions"
Thanks,
Tejas
[email protected]
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62826
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-04-26 07:39:18 +0000
+++ purchase/purchase.py 2011-05-30 06:36:33 +0000
@@ -188,7 +188,7 @@
'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" \
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2011-03-09 16:12:49 +0000
+++ purchase/purchase_view.xml 2011-05-30 06:36:33 +0000
@@ -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','<>','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2011-05-26 07:43:35 +0000
+++ purchase/stock_view.xml 2011-05-30 06:36:33 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help : https://help.launchpad.net/ListHelp
