[MERGE] merged fix of lp bug 715477

bzr revid: qdp-launchpad@openerp.com-20110309161249-klox9o64rmhhzg5x
This commit is contained in:
Quentin (OpenERP)
2011-03-09 17:12:49 +01:00
2 changed files with 7 additions and 7 deletions
+5 -5
View File
@@ -190,7 +190,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<record id="product_pricelist_type_view" model="ir.ui.view">
<!--<record id="product_pricelist_type_view" model="ir.ui.view">
<field name="name">product.pricelist.type.form</field>
<field name="model">product.pricelist.type</field>
<field name="type">form</field>
@@ -209,10 +209,10 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem
action="product_pricelist_type_action" id="menu_product_pricelist_type_action2"
parent="product.menu_product_pricelist_main" sequence="2"
groups="base.group_extended"/>
<menuitem
action="product_pricelist_type_action" id="menu_product_pricelist_type_action2"
parent="product.menu_product_pricelist_main" sequence="2"
groups="base.group_extended"/>-->
</data>
</openerp>
+2 -2
View File
@@ -24,10 +24,10 @@
action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
parent="menu_purchase_config_pricelist" sequence="10"/>
<menuitem
<!--<menuitem
action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type"
parent="menu_purchase_config_pricelist" sequence="2"
groups="base.group_extended"/>
groups="base.group_extended"/>-->
<menuitem
id="menu_product_in_config_purchase" name="Product"