Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-first_10_clicks-purchase-mma into
lp:openobject-addons.
Requested reviews:
Purnendu Singh (OpenERP) (psi-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first_10_clicks-purchase-mma/+merge/106570
Hello Sir,
I have improved the following things:
1] Added status bar and action buttons on the top bar above the form and
the history and comments on the bottom bar below the form.
2] Improved the menu-tips & menu String.
3] Restricted some fields to appropriate groups.
Thanks.
mma
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first_10_clicks-purchase-mma/+merge/106570
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-first_10_clicks-purchase-mma.
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-06-19 08:56:18 +0000
+++ purchase/purchase_view.xml 2012-06-21 08:16:24 +0000
@@ -70,6 +70,7 @@
parent="base.menu_purchase_root" sequence="6"/>
<record id="action_invoice_pending" model="ir.actions.act_window">
+ <field name="name">Based on Draft Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
@@ -77,10 +78,14 @@
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
<field name="search_view_id" ref="account.view_account_invoice_filter"/>
- <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>
+ <field name="help">
+ Use this menu to control the invoices to be received from your supplier.
+ OpenERP generates 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="Based on draft invoices"
+ <menuitem name="Based on Draft Invoices"
id="menu_procurement_management_pending_invoice"
action="action_invoice_pending"
parent="menu_procurement_management_invoice"
@@ -194,7 +199,7 @@
<group string="Invoice Control">
<field name="invoice_method"/>
<field name="fiscal_position" widget="selection"/>
- <field name="invoiced"/>
+ <field name="invoiced" groups="base.group_no_one"/>
</group>
<group groups="base.group_no_one" string="Purchase Control">
<field name="validator"/>
@@ -308,7 +313,15 @@
<field name="context">{'search_default_draft': 1}</field>
<field name="view_mode">tree,form,graph,calendar</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
- <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
+ <field name="help">
+ Create a request for quotation when you want to buy products from a supplier.
+ You can also use this menu to review requests for quotation created automatically
+ (based on logistic rules, like minimum stock, MTO, etc.)
+ <p>
+ Once confirmed, a request for quotation becomes a purchase order.
+ In the Purchase Settings, you can select the way to control supplier invoicing:
+ based on the order, based on receptions, or manual.
+ </field>
</record>
<menuitem action="purchase_rfq" id="menu_purchase_rfq"
parent="menu_procurement_management"
@@ -476,14 +489,18 @@
<record id="purchase_line_form_action2" model="ir.actions.act_window">
- <field name="name">Based on 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','<>','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 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>
+ <field name="help">
+ Here you can track all the lines of purchase orders where the invoicing is "Based on Purchase Order Lines",
+ and for which you have not received a supplier invoice yet.
+ You can generate a draft supplier invoice based on the lines from this list.
+ </field>
</record>
<record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
=== modified file 'purchase/res_config.py'
--- purchase/res_config.py 2012-05-14 12:18:27 +0000
+++ purchase/res_config.py 2012-06-21 08:16:24 +0000
@@ -40,6 +40,9 @@
'group_uom':fields.boolean("Manage Different Units of Measure for Products",
implied_group='product.group_uom',
help="""Allows you to select and maintain different units of measure for products."""),
+ 'group_purchase_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice",
+ implied_group='purchase.group_delivery_invoice_address',
+ help="Allows you to specify different delivery and invoice addresses on a purchase order."),
'module_purchase_analytic_plans': fields.boolean('Use Multiple Analytic Accounts on Purchases',
help ="""Allows the user to maintain several analysis plans. These let you split
lines on a purchase order between several accounts and analytic plans.
=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml 2012-06-15 06:44:06 +0000
+++ purchase/res_config_view.xml 2012-06-21 08:16:24 +0000
@@ -19,6 +19,7 @@
<separator string="Purchase Order" colspan="4"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
+ <field name="group_purchase_delivery_address"/>
<field name="module_purchase_double_validation"/>
<field name="module_purchase_requisition"/>
<field name="module_warning"/>
=== modified file 'purchase/security/purchase_security.xml'
--- purchase/security/purchase_security.xml 2012-04-04 09:08:30 +0000
+++ purchase/security/purchase_security.xml 2012-06-21 08:16:24 +0000
@@ -14,6 +14,11 @@
<field name="users" eval="[(4, ref('base.user_root'))]"/>
</record>
+ <record id="group_delivery_invoice_address" model="res.groups">
+ <field name="name">Addresses in Purchase Orders</field>
+ <field name="category_id" ref="base.module_category_hidden"/>
+ </record>
+
<record id="group_analytic_accounting" model="res.groups">
<field name="name">Analytic Accounting for Purchases</field>
<field name="category_id" ref="base.module_category_hidden"/>
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2012-05-22 16:10:55 +0000
+++ purchase/stock_view.xml 2012-06-21 08:16:24 +0000
@@ -100,7 +100,7 @@
</record>
<record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
- <field name="name">Bases on incoming shipments</field>
+ <field name="name">Based 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,11 @@
<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 "Bases on incoming shipments", you can track here all the product receptions and create invoices for those receptions.</field>
+ <field name="help">
+ Here you can track all the product receptions of purchase orders where the invoicing is "Based on Incoming Shipments",
+ and for which you have not received a supplier invoice yet.
+ You can generate a supplier invoice based on those receptions.
+ </field>
</record>
<menuitem action="action_picking_tree4_picking_to_invoice"
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-06-20 12:02:18 +0000
+++ stock/stock_view.xml 2012-06-21 08:16:24 +0000
@@ -740,7 +740,7 @@
<group>
<group>
<field name="backorder_id" readonly="1"/>
- <field name="invoice_state" string="Invoice Control"/>
+ <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
<field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
</group>
<group>
@@ -817,7 +817,7 @@
<group string="Locations" groups="stock.group_locations">
<field name="location_id" domain="[('usage','<>','view')]"/>
- <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+ <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
</group>
<group groups="stock.group_tracking_lot" string="Traceability">
@@ -1061,8 +1061,8 @@
<field name="origin"/>
<field name="date"/>
<field name="min_date"/>
- <field name="invoice_state"/>
- <field name="stock_journal_id" widget="selection"/>
+ <field name="invoice_state" groups="account.group_account_invoice"/>
+ <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
<field name="state"/>
</tree>
</field>
@@ -1436,7 +1436,7 @@
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="location_dest_id" groups="stock.group_locations"/>
- <field name="partner_id"/>
+ <field name="partner_id" groups="stock.group_locations"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" />
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
=== modified file 'stock/wizard/stock_partial_move_view.xml'
--- stock/wizard/stock_partial_move_view.xml 2012-06-09 22:28:49 +0000
+++ stock/wizard/stock_partial_move_view.xml 2012-06-21 08:16:24 +0000
@@ -39,10 +39,10 @@
<tree editable="bottom" string="Product Moves">
<field name="product_id" />
<field name="quantity" />
- <field name="product_uom" />
+ <field name="product_uom" groups="product.group_uom"/>
<field name="location_id" />
<field name="location_dest_id" />
- <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
+ <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="stock.group_production_lot"/>
<field name="update_cost" invisible="1"/>
<field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
<field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
=== modified file 'stock/wizard/stock_partial_picking_view.xml'
--- stock/wizard/stock_partial_picking_view.xml 2012-06-10 08:35:15 +0000
+++ stock/wizard/stock_partial_picking_view.xml 2012-06-21 08:16:24 +0000
@@ -26,7 +26,7 @@
<tree editable="bottom" string="Product Moves">
<field name="product_id" />
<field name="quantity" />
- <field name="product_uom" />
+ <field name="product_uom" groups="product.group_uom"/>
<field name="tracking" invisible="1"/>
<field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
<!-- Removed as this feature is not logic: price must be updated upon reception of 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
