[MERGE] New menus. Get rid of jQuery accordion. Added folding and floating menus.

[odoo/odoo.git] / addons / mrp_repair / mrp_repair_view.xml

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 4bb5bbd..69782e0 100644 (file)
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -79,6 +79,7 @@
                                 <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
                                 <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
                                 <field name='name'/>
+                                <field name="prodlot_id" />
                                 <field name="location_id"/>
                                 <field name="location_dest_id"/>
                                 <field name="product_uom_qty" string="Qty"/>
@@ -115,7 +116,7 @@
                     <page string="Invoicing">
                         <field name="invoice_method" colspan="4"/>
                         <field
-                            name="pricelist_id" context="product_id=product_id"
+                            name="pricelist_id" context="{'product_id':product_id}"
                             attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                         <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                         <!-- <field name="invoice_id"/> -->
@@ -148,7 +149,6 @@
                                 <field name="product_uom_qty" string="Qty"/>
                                 <field name="product_uom" string="UoM"/>
                                 <field name="price_unit"/>
-                                <field name="tax_id"/>
                                 <field name="to_invoice"/>
                                 <field name="price_subtotal"/>
                             </tree>
@@ -179,7 +179,7 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
-                  <group col='4' colspan='4'>
+                  <group>
                        <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
@@ -192,7 +192,7 @@
                        <field name="state" />
                   </group>
                   <newline/>
-                  <group expand="0" string="Group By..." colspan="10" col="8">
+                  <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>