[IMP]:improved receive product view

bzr revid: apa@tinyerp.com-20120626061447-c9q5eubc5t9tgb6s

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b700d48..45bab3d 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1442,30 +1442,26 @@
                         <div>
                             <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
                                 on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
-                            <field name="product_uos" groups="product.group_uos"/>
+                            <field name="product_uos" groups="product.group_uos" class="oe_inline"/>
                         </div>
                         <field name="name" string="Reason"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="location_id" groups="stock.group_locations"/>
+                        <field name="location_dest_id" groups="stock.group_locations"/>
+                        <field name="partner_id" groups="stock.group_locations"/>
                     </group>
                     <group>
                         <field name="picking_id"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" string="Move Date"/>
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                    </group>
-                    <group>
-                        <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" groups="stock.group_locations"/>
-                    </group>
-                    <group>
                         <label for="tracking_id"/>
                         <div>
                             <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                             <button name="%(split_into)d" string="New Pack" type="action"
                               groups="product.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed,done" colspan="1"/>
+                              states="draft,assigned,confirmed,done" class="oe_inline"/>
                         </div>
                         <label for="prodlot_id"/>
                         <div>
@@ -1474,9 +1470,9 @@
                                 domain="[('product_id','=?',product_id)]" class="oe_inline"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                             <button name="%(track_line)d"
-                                  groups="stock.group_tracking_lot" class="oe_inline"
-                                  states="draft,waiting,confirmed,assigned,done"
-                                  string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                groups="stock.group_tracking_lot" class="oe_inline"
+                                states="draft,waiting,confirmed,assigned,done"
+                                string="Split" type="action" icon="terp-stock_effects-object-colorize" />
                         </div>
                     </group>
                 </group>