Amit Bhavsar (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-polish2_purchase-amb into
lp:openobject-addons.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2_purchase-amb/+merge/81683
Hello sir,
In purchase task,
I have added the following this,
1. Rename the Invoice control from the P.O from view.
- Based on purchase order lines --> Based on Purchase Order lines
- Draft invoices pre-generated --> Based on pr-generated draft invoice
- Based on receptions --> Based on reception
2. Rename the Menu in Purchase/Invoice Control.
- Supplier Invoice to Receive --> From pre-generated draft invoice
- On Purchase Order --> From Purchase Order lines
- On incoming Shipment --> From Reception
Thanks,
Amit Bhavsar(amb)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2_purchase-amb/+merge/81683
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-polish2_purchase-amb.
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2011-11-01 06:06:29 +0000
+++ purchase/purchase.py 2011-11-09 07:08:25 +0000
@@ -188,10 +188,10 @@
'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','Draft invoices pre-generated'),('picking','Based on receptions')], 'Invoicing Control', required=True,
+ '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 receptions: a draft invoice will be generated based on validated receptions.\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."
),
'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.",
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2011-11-04 07:50:49 +0000
+++ purchase/purchase_view.xml 2011-11-09 07:08:25 +0000
@@ -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="Supplier Invoices to Receive"
+ <menuitem name="From pre-generated draft invoice"
id="menu_procurement_management_pending_invoice"
action="action_invoice_pending"
parent="menu_procurement_management_invoice"
@@ -495,7 +495,7 @@
<record id="purchase_line_form_action2" model="ir.actions.act_window">
- <field name="name">On Purchase Order Lines</field>
+ <field name="name">From 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','<>','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2011-10-02 17:31:16 +0000
+++ purchase/stock_view.xml 2011-11-09 07:08:25 +0000
@@ -104,7 +104,7 @@
</record>
<record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
- <field name="name">On Incoming Shipments</field>
+ <field name="name">From Reception</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-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
