Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons9-apa-product-fka into
lp:~openerp-dev/openobject-addons/trunk-addons9-product-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-apa-product-fka/+merge/123735
Hello Sir,
- change tab name to "Procurements" insted of 'Procurement & Locations' in
warning
- in product inventory tab, on update link, change wizard name
- when product type = service -> display the procurement method
- Add supply method field when project_mrp installed
- display kanban view in purchase
- add access rights in purchase for account.invoice
Thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-apa-product-fka/+merge/123735
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons9-product-apa.
=== modified file 'procurement/board_mrp_procurement_view.xml'
--- procurement/board_mrp_procurement_view.xml 2012-08-09 06:05:16 +0000
+++ procurement/board_mrp_procurement_view.xml 2012-09-11 13:00:30 +0000
@@ -15,7 +15,7 @@
<field name="model">board.board</field>
<field name="inherit_id" ref="stock.board_warehouse_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/board/column/action[@string='Incoming Shipments']" position="before">
+ <xpath expr="/form/board/column/action[@string='Incoming Products']" position="before">
<action name="%(procurement_action_board)d" string="Procurements in Exception"/>
</xpath>
</field>
=== modified file 'product/product.py'
--- product/product.py 2012-09-07 09:51:55 +0000
+++ product/product.py 2012-09-11 13:00:30 +0000
@@ -346,7 +346,7 @@
for product in self.browse(cr, uid, ids, context=context):
old_uom = product.uom_po_id
if old_uom.category_id.id != new_uom.category_id.id:
- raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
+ raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurements' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
return super(product_template, self).write(cr, uid, ids, vals, context=context)
_defaults = {
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-09-10 16:35:01 +0000
+++ product/product_view.xml 2012-09-11 13:00:30 +0000
@@ -105,7 +105,7 @@
<page string="Procurements" groups="base.group_user">
<group name="procurement">
<group>
- <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
+ <field name="procure_method" groups="base.group_user"/>
<field name="cost_method" groups="product.group_costing_method"/>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
</group>
@@ -291,9 +291,9 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">product.product</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,form,kanban</field>
+ <field name="view_mode">kanban,tree,form</field>
<field name="context">{"search_default_filter_to_purchase":1}</field>
- <field name="view_id" ref="product_product_tree_view"/>
+ <field name="view_id" ref="product_kanban_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
=== modified file 'project_mrp/project_mrp_view.xml'
--- project_mrp/project_mrp_view.xml 2012-08-31 16:40:18 +0000
+++ project_mrp/project_mrp_view.xml 2012-09-11 13:00:30 +0000
@@ -31,6 +31,16 @@
</field>
</field>
</record>
+ <record id="view_product_form" model="ir.ui.view">
+ <field name="name">product.form.view</field>
+ <field name="model">product.product</field>
+ <field name="inherit_id" ref="product.product_normal_form_view"/>
+ <field name="arch" type="xml">
+ <field name="uom_po_id" position="before">
+ <field name="supply_method" />
+ </field>
+ </field>
+ </record>
</data>
</openerp>
=== modified file 'purchase/security/ir.model.access.csv'
--- purchase/security/ir.model.access.csv 2012-08-22 13:37:29 +0000
+++ purchase/security/ir.model.access.csv 2012-09-11 13:00:30 +0000
@@ -22,11 +22,11 @@
access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
access_product_template_purchase_user,product.template purchase_user,product.model_product_template,group_purchase_user,1,0,0,0
access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,group_purchase_manager,1,0,0,0
-access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,1,1,1
-access_account_invoice_line_purchase,account_invoice.line purchase,account.model_account_invoice_line,group_purchase_user,1,1,1,1
+access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,0,0,0
+access_account_invoice_line_purchase,account_invoice.line purchase,account.model_account_invoice_line,group_purchase_user,1,0,0,0
access_account_invoice_purchase_manager,account_invoice purchase manager,account.model_account_invoice,group_purchase_manager,1,0,0,0
access_account_invoice_line_purchase_manager,account_invoice.line purchase manager,account.model_account_invoice_line,group_purchase_manager,1,0,0,0
-access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_account_invoice_tax,group_purchase_user,1,1,1,1
+access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_account_invoice_tax,group_purchase_user,1,0,0,0
access_account_fiscal_position_purchase_user,account.fiscal.position purchase,account.model_account_fiscal_position,group_purchase_user,1,0,0,0
access_account_sequence_fiscalyear_purchase_user,account.sequence.fiscalyear purchase,account.model_account_sequence_fiscalyear,group_purchase_user,1,1,1,1
access_res_partner_purchase_user,res.partner purchase,base.model_res_partner,group_purchase_user,1,0,0,0
=== modified file 'stock/wizard/stock_change_product_qty_view.xml'
--- stock/wizard/stock_change_product_qty_view.xml 2012-08-09 06:05:16 +0000
+++ stock/wizard/stock_change_product_qty_view.xml 2012-09-11 13:00:30 +0000
@@ -5,8 +5,8 @@
<field name="name">Change Product Quantity</field>
<field name="model">stock.change.product.qty</field>
<field name="arch" type="xml">
- <form string="Change Product Quantity" version="7.0">
- <group string="Select Quantity">
+ <form string="Update Product Quantity" version="7.0">
+ <group>
<field name="new_quantity" />
<field name="product_id" invisible="1"/>
<field name="location_id" groups="stock.group_locations"/>
@@ -22,7 +22,7 @@
</record>
<record id="action_view_change_product_quantity" model="ir.actions.act_window">
- <field name="name">Change Product Quantity</field>
+ <field name="name">Update Product Quantity</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.change.product.qty</field>
<field name="view_type">form</field>
_______________________________________________
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
