[IMP] error messages during database creation failure, with thanks to Serpent Consulting

[odoo/odoo.git] / addons / product_margin / product_margin_view.xml

diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 34ce72e..87022bd 100644 (file)
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-
-    <wizard id="action_open_margin" menu="False" model="product.product" name="product.margins" string="Product Margins"/>
-
-    <menuitem id="menu_product_reporting" name="Reporting" parent ="product.menu_main_product" />
-
-    <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />
-
     <record model="ir.ui.view" id="view_product_margin_graph">
             <field name="name">product.margin.graph</field>
             <field name="model">product.product</field>
             <field name="type">graph</field>
-            <field name="sequence" eval="50"/>
+            <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <graph string="Product Margins" type="bar">
                     <field name="name"/>
@@ -26,8 +19,7 @@
             <field name="name">product.margin.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
-            <field name="priority">5</field>
-            <field name="sequence" eval="50"/>
+            <field name="priority">50</field>
             <field name="arch" type="xml">
                  <form string="Product Margins">
                     <group col="6" colspan="4">
@@ -46,7 +38,7 @@
                         <field name="sale_avg_price"/>
                         <field name="list_price" string="Catalog Price" readonly="1"/>
                         <field name="sale_num_invoiced" />
-                          <field name="sales_gap" />
+                        <field name="sales_gap" />
                         <field name="turnover" />
                         <field name="sale_expected" />
 
@@ -54,16 +46,15 @@
                         <field name="purchase_avg_price"/>
                         <field name="standard_price" string="Standard Price" readonly="1"/>
                         <field name="purchase_num_invoiced" />
-                       <field name="purchase_gap" />
-                       <field name="total_cost" />
-                       <field name="normal_cost" />
+                        <field name="purchase_gap" />
+                        <field name="total_cost" />
+                        <field name="normal_cost" />
 
                         <separator string="Margins" colspan="4"/>
                         <field name="total_margin"/>
                         <field name="expected_margin"/>
                         <field name="total_margin_rate" widget="progressbar"/>
                         <field name="expected_margin_rate" widget="progressbar"/>
-
                     </page>
                     </notebook>
                 </form>
@@ -74,7 +65,7 @@
             <field name="name">product.margin.tree</field>
             <field name="model">product.product</field>
             <field name="type">tree</field>
-            <field name="sequence" eval="50"/>
+            <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <tree string="Product Margins">
                     <field name="name" select="1"/>
@@ -89,9 +80,14 @@
                     <field name="expected_margin"/>
                     <field name="total_margin_rate"  widget="progressbar"/>
                     <field name="expected_margin_rate" widget="progressbar"/>
+                    <field name="categ_id" invisible="1"/>
+                    <field name="uom_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
             </tree>
             </field>
         </record>
 
+  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product"/>
+
 </data>
 </openerp>