From ba60391f0725af2e46e6cb972750eff3b1793928 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 23 Sep 2013 17:37:56 +0200
Subject: [PATCH] [FIX]work on picking reception view, remove some fields and
 improvement in usability

bzr revid: csn@openerp.com-20130923153756-mg9euscs0kvoixnr
---
 addons/delivery/delivery_view.xml         | 31 +++++++++++++----------
 addons/sale_journal/sale_journal_view.xml | 11 --------
 addons/stock/stock.py                     |  2 +-
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index c50c20b7a48..237d18b5b49 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -229,19 +229,24 @@
                     <button name="%(report_shipping)d" string="Print Delivery Order" states="confirmed,assigned" type="action"/>
                     <button name="%(report_shipping)d" string="Print Delivery Order" states="done" type="action" class="oe_highlight"/>
                 </xpath>
-                <field name="min_date" position="after">
-                    <field name="carrier_id"/>
-                    <field name="carrier_tracking_ref"/>
-                    <field name="number_of_packages"/>
-                </field>
-                <field name="company_id" position="before">
-                    <label for="weight" string="Weight"/>
-                    <div>
-                        <field name="weight" class="oe_inline"/>
-                        <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
-                    </div>
-                    <field name="weight_net" groups="base.group_no_one"/>
-               </field>
+                <xpath expr="//page[@string='Additional Info']/group[last()]" position="after">
+                <separator string="Carrier Informations"/>
+                <group>
+                    <group>
+                        <field name="carrier_id"/>
+                        <field name="carrier_tracking_ref"/>
+                        <field name="number_of_packages"/>
+                    </group>
+                    <group>
+                        <label for="weight" string="Weight"/>
+                        <div>
+                            <field name="weight" class="oe_inline"/>
+                            <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+                        </div>
+                        <field name="weight_net" groups="base.group_no_one"/>
+                    </group>
+                </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 0c11029b48b..d5867cb749a 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -85,17 +85,6 @@
 
 <!--  Inherit stock picking's tree view  -->
 
-        <record model="ir.ui.view" id="sale_journal_picking_order_tree">
-            <field name="name">stock.picking.journal.view.tree</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.vpicktree"/>
-            <field name="arch" type="xml">
-                <field name="state" position="before">
-                    <field name="invoice_type_id"/>
-                </field>
-            </field>
-        </record>
-
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.journal.property.form.inherit</field>
             <field name="model">res.partner</field>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4efc81d7bd6..b5bfd103141 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -541,7 +541,7 @@ class stock_picking(osv.osv):
             * Cancelled: has been cancelled, can't be confirmed anymore"""
         ),
         'min_date': fields.function(get_min_max_date, multi="min_max_date",
-                 store={'stock.move': (_get_pickings, ['state', 'date_expected'], 20)}, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the first part of the shipment to be processed"),
+                 store={'stock.move': (_get_pickings, ['state', 'date_expected'], 20)}, type='datetime', string='Scheduled Date', select=1, help="Scheduled time for the first part of the shipment to be processed"),
         'max_date': fields.function(get_min_max_date, multi="min_max_date",
                  store={'stock.move': (_get_pickings, ['state', 'date_expected'], 20)}, type='datetime', string='Max. Expected Date', select=2, help="Scheduled time for the last part of the shipment to be processed"),
         'date': fields.datetime('Commitment Date', help="Date promised for the completion of the transfer order, usually set the time of the order and revised later on.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),