From b48925fb0627d3d3654adc4d25d57a9172c34f59 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 28 Aug 2012 11:11:11 +0530
Subject: [PATCH 01/16] [IMP]stock : set default location on location field
 ,set groups on some fields, remove icon on button,fix crm_claim error and
 traceability script error

bzr revid: mma@tinyerp.com-20120828054111-dy6k7vc63g7j47ac
---
 addons/crm_claim/crm_claim_menu.xml           |   2 +-
 addons/procurement/procurement.py             |   2 +-
 addons/stock/stock_view.xml                   | 217 +++++++++++++++++-
 addons/stock/wizard/stock_fill_inventory.py   |  10 +
 .../wizard/stock_fill_inventory_view.xml      |  24 +-
 addons/stock/wizard/stock_move_view.xml       |   2 +-
 addons/stock/wizard/stock_traceability.py     |   2 +-
 7 files changed, 236 insertions(+), 23 deletions(-)

diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 46f8760387a..bb881d62a58 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -50,9 +50,9 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
         <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
         <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
-        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
     </data>
 </openerp>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index d1fb3f8a395..ab8f2dabd5a 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -554,7 +554,7 @@ class stock_warehouse_orderpoint(osv.osv):
         'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
-        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
+        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','!=','service')]),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'product_min_qty': fields.float('Minimum Quantity', required=True,
             help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6927bf68c25..7584f239f34 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -106,6 +106,7 @@
             <field name="arch" type="xml">
                 <form string="Physical Inventory" version="7.0">
                 <header>
+                    <button name="%(action_view_stock_fill_inventory)d" string="Import Inventory" type="action" class="oe_highlight"/>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
@@ -812,9 +813,9 @@
                                 <form string="Stock Moves" version="7.0">
                                     <header>
                                         <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
                                         </span>
                                         <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
                                     </header>
@@ -880,12 +881,12 @@
                             <group>
                                 <group>
                                     <field name="move_type"/>
-                                    <field name="type" groups="base.group_user"/>
+                                    <field name="type" groups="base.group_no_one"/>
                                     <field name="auto_picking" groups="base.group_user"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    <field name="date_done"/>
+                                    <field name="date_done" groups="base.group_no_one"/>
                                 </group>
                             </group>
                         </page>
@@ -970,7 +971,7 @@
         
         <record id="view_picking_out_tree" model="ir.ui.view">
             <field name="name">stock.picking.out.tree</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
@@ -1000,7 +1001,7 @@
                         <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header//button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                        <button name="action_process" states="assigned" string="Deliver" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header//field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
@@ -1008,6 +1009,106 @@
                     <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
+                    <xpath expr="//field[@name='move_lines']" position="replace">
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'out'}">
+                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                    <field name="product_uos" groups="product.group_uos"/>
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned"
+                                        groups="base.group_user"/>
+                                    <field name="scrapped" invisible="1"/>
+                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
+                                    <button
+                                        name="%(stock.track_line)d"
+                                        string="Split in Serial Number"
+                                        groups="stock.group_production_lot"
+                                        type="action" icon="terp-stock_effects-object-colorize"
+                                        states="draft,waiting,confirmed,assigned"/>
+                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                    <button name="setlast_tracking" string="Put in current pack" type="object"
+                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        icon="terp-stock_effects-object-colorize"
+                                        groups="stock.group_tracking_lot"
+                                        states="draft,assigned,confirmed"/>
+                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                        groups="product.group_stock_packaging"
+                                        icon="terp-stock_effects-object-colorize"
+                                        states="draft,assigned,confirmed"/>
+                                    <field name="location_dest_id" groups="stock.group_locations"/>
+                                    <field name="state"/>
+                                </tree>
+                                <form string="Stock Moves" version="7.0">
+                                    <header>
+                                        <span groups="base.group_user">
+                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
+                                        </span>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
+                                    </header>
+                                    <group>
+                                        <group>
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned"
+                                                        groups="base.group_user"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div groups="product.group_uos">
+                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
+                                        <group>
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
+
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                                        </group>
+
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <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"/>
+                                            </div>
+
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                    </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -1131,6 +1232,106 @@
                     <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
+                    <xpath expr="//field[@name='move_lines']" position="replace">
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in'}">
+                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                    <field name="product_uos" groups="product.group_uos"/>
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned"
+                                        groups="base.group_user"/>
+                                    <field name="scrapped" invisible="1"/>
+                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
+                                    <button
+                                        name="%(stock.track_line)d"
+                                        string="Split in Serial Number"
+                                        groups="stock.group_production_lot"
+                                        type="action" icon="terp-stock_effects-object-colorize"
+                                        states="draft,waiting,confirmed,assigned"/>
+                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                    <button name="setlast_tracking" string="Put in current pack" type="object"
+                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        icon="terp-stock_effects-object-colorize"
+                                        groups="stock.group_tracking_lot"
+                                        states="draft,assigned,confirmed"/>
+                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                        groups="product.group_stock_packaging"
+                                        icon="terp-stock_effects-object-colorize"
+                                        states="draft,assigned,confirmed"/>
+                                    <field name="location_dest_id" groups="stock.group_locations"/>
+                                    <field name="state"/>
+                                </tree>
+                                <form string="Stock Moves" version="7.0">
+                                    <header>
+                                        <span groups="base.group_user">
+                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
+                                        </span>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
+                                    </header>
+                                    <group>
+                                        <group>
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned"
+                                                        groups="base.group_user"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div groups="product.group_uos">
+                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
+                                        <group>
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
+
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                                        </group>
+
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <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"/>
+                                            </div>
+
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                    </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -1205,7 +1406,7 @@
         </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
 
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2" groups="stock.group_locations"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 10a1d625e16..54b15719d45 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -25,11 +25,21 @@ from tools.translate import _
 class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
     _description = "Import Inventory"
+
+    def _default_location(self, cr, uid, ids, context=None):
+        location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
+        return location_id.id
+
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
         'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"),
     }
+
+    _defaults = {
+        'location_id': _default_location,
+    }
+
     def view_init(self, cr, uid, fields_list, context=None):
         """
          Creates view dynamically and adding fields at runtime.
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 47e6355bcdc..83becb351cc 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -8,8 +8,8 @@
               <form string="Import Inventory" version="7.0">
                   <separator string="Import current product inventory from the following location"/>
                   <group>
-                      <field name="location_id"/>
-                      <field name="recursive"/>
+                      <field name="location_id" groups="stock.group_locations"/>
+                      <field name="recursive" groups="stock.group_locations"/>
                       <field name="set_stock_zero"/>
                   </group>
                   <footer>
@@ -21,14 +21,16 @@
             </field>
         </record>
 
-         <act_window name="Import Inventory"
-            res_model="stock.fill.inventory"
-            src_model="stock.inventory"
-            view_mode="form"
-            target="new"
-            context="{'search_default_in_location':1}"
-            key2="client_action_multi"
-            id="action_view_stock_fill_inventory"/>
-
+        <record id="action_view_stock_fill_inventory" model="ir.actions.act_window">
+            <field name="name">Import Inventory</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.fill.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_fill_inventory"/>
+            <field name="target">new</field>
+            <field name="context">{'search_default_in_location':1}</field>
+        </record>
+            
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index b3a7fbee885..7f3f77538c2 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -48,7 +48,7 @@
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" readonly="1"/>
                         </div>
-                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
+                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 28007592f23..fbe91f3140f 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -42,7 +42,7 @@ class action_traceability(osv.osv_memory):
         lot_id = ids
         if context is None:
             context = {}
-        type1 = context.get('type', 'move_history_ids2')
+        type1 = 'type' in context and context['type'] or 'move_history_ids2'
         field = context.get('field', 'tracking_id')
         obj = self.pool.get('stock.move')
         ids = obj.search(cr, uid, [(field, 'in',lot_id)])

From f4300a8e183d245068bc96c4e3ccb29341c032a8 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 28 Aug 2012 15:45:28 +0530
Subject: [PATCH 02/16] [IMP]stock : make a tree and form view for move and set
 in move_line and its location depends on type

bzr revid: mma@tinyerp.com-20120828101528-m07x8zttze5isib5
---
 addons/stock/stock_view.xml | 409 ++++++++++--------------------------
 1 file changed, 115 insertions(+), 294 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7584f239f34..391b02fba9a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -778,104 +778,7 @@
                     </group>
                     <notebook>
                         <page string="Products">
-                            <field name="move_lines" context="{'address_in_id': partner_id}">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="product_uos" groups="product.group_uos"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"
-                                        groups="base.group_user"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                    <button
-                                        name="%(stock.track_line)d"
-                                        string="Split in Serial Number"
-                                        groups="stock.group_production_lot"
-                                        type="action" icon="terp-stock_effects-object-colorize"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        icon="terp-stock_effects-object-colorize"
-                                        groups="stock.group_tracking_lot"
-                                        states="draft,assigned,confirmed"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="product.group_stock_packaging"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves" version="7.0">
-                                    <header>
-                                        <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        </span>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
-                                    </header>
-                                    <group>
-                                        <group>
-                                            <field name="name" invisible="1"/>
-                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
-                                                <button name="%(stock.move_scrap)d"
-                                                        string="Scrap" type="action"
-                                                        icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned"
-                                                        groups="base.group_user"/>
-                                            </div>
-                                            <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div groups="product.group_uos">
-                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                            </div>
-                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
-                                        <group>
-                                            <field name="create_date" invisible="1"/>
-                                            <field name="date"/>
-                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                        </group>
-
-                                        <group string="Locations" groups="stock.group_locations">
-                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
-                                        </group>
-
-                                        <group groups="stock.group_tracking_lot" string="Traceability">
-                                            <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"/>
-                                            </div>
-
-                                            <label for="prodlot_id"/>
-                                            <div>
-                                                <field name="prodlot_id" groups="stock.group_production_lot"
-                                                    context="{'location_id':location_id, 'product_id':product_id}"
-                                                    domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
-                                                <button name="%(track_line)d"
-                                                    groups="stock.group_tracking_lot"
-                                                    states="draft,waiting,confirmed,assigned"
-                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            </div>
-                                        </group>
-                                    </group>
-                                </form>
-                            </field>
+                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                         </page>
                         <page string="Additional Info">
                             <group>
@@ -1010,104 +913,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="//field[@name='move_lines']" position="replace">
-                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'out'}">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="product_uos" groups="product.group_uos"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"
-                                        groups="base.group_user"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                    <button
-                                        name="%(stock.track_line)d"
-                                        string="Split in Serial Number"
-                                        groups="stock.group_production_lot"
-                                        type="action" icon="terp-stock_effects-object-colorize"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        icon="terp-stock_effects-object-colorize"
-                                        groups="stock.group_tracking_lot"
-                                        states="draft,assigned,confirmed"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="product.group_stock_packaging"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves" version="7.0">
-                                    <header>
-                                        <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        </span>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
-                                    </header>
-                                    <group>
-                                        <group>
-                                            <field name="name" invisible="1"/>
-                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
-                                                <button name="%(stock.move_scrap)d"
-                                                        string="Scrap" type="action"
-                                                        icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned"
-                                                        groups="base.group_user"/>
-                                            </div>
-                                            <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div groups="product.group_uos">
-                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                            </div>
-                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
-                                        <group>
-                                            <field name="create_date" invisible="1"/>
-                                            <field name="date"/>
-                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                        </group>
-
-                                        <group string="Locations" groups="stock.group_locations">
-                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
-                                        </group>
-
-                                        <group groups="stock.group_tracking_lot" string="Traceability">
-                                            <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"/>
-                                            </div>
-
-                                            <label for="prodlot_id"/>
-                                            <div>
-                                                <field name="prodlot_id" groups="stock.group_production_lot"
-                                                    context="{'location_id':location_id, 'product_id':product_id}"
-                                                    domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
-                                                <button name="%(track_line)d"
-                                                    groups="stock.group_tracking_lot"
-                                                    states="draft,waiting,confirmed,assigned"
-                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            </div>
-                                        </group>
-                                    </group>
-                                </form>
-                            </field>
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
@@ -1233,104 +1039,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="//field[@name='move_lines']" position="replace">
-                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in'}">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="product_uos" groups="product.group_uos"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"
-                                        groups="base.group_user"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                    <button
-                                        name="%(stock.track_line)d"
-                                        string="Split in Serial Number"
-                                        groups="stock.group_production_lot"
-                                        type="action" icon="terp-stock_effects-object-colorize"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        icon="terp-stock_effects-object-colorize"
-                                        groups="stock.group_tracking_lot"
-                                        states="draft,assigned,confirmed"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="product.group_stock_packaging"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves" version="7.0">
-                                    <header>
-                                        <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        </span>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
-                                    </header>
-                                    <group>
-                                        <group>
-                                            <field name="name" invisible="1"/>
-                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
-                                                <button name="%(stock.move_scrap)d"
-                                                        string="Scrap" type="action"
-                                                        icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned"
-                                                        groups="base.group_user"/>
-                                            </div>
-                                            <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div groups="product.group_uos">
-                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                            </div>
-                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
-                                        <group>
-                                            <field name="create_date" invisible="1"/>
-                                            <field name="date"/>
-                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                        </group>
-
-                                        <group string="Locations" groups="stock.group_locations">
-                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
-                                        </group>
-
-                                        <group groups="stock.group_tracking_lot" string="Traceability">
-                                            <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"/>
-                                            </div>
-
-                                            <label for="prodlot_id"/>
-                                            <div>
-                                                <field name="prodlot_id" groups="stock.group_production_lot"
-                                                    context="{'location_id':location_id, 'product_id':product_id}"
-                                                    domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
-                                                <button name="%(track_line)d"
-                                                    groups="stock.group_tracking_lot"
-                                                    states="draft,waiting,confirmed,assigned"
-                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            </div>
-                                        </group>
-                                    </group>
-                                </form>
-                            </field>
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
@@ -1450,6 +1159,44 @@
             </field>
         </record>
 
+        <record id="view_move_picking_tree" model="ir.ui.view">
+            <field name="name">stock.move.tree</field>
+            <field name="model">stock.move</field>
+            <field name="arch" type="xml">
+                <tree colors="grey:scrapped == True" string="Stock Moves">
+                    <field name="product_id"/>
+                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                    <field name="product_uos" groups="product.group_uos"/>
+                    <button name="%(stock.move_scrap)d"
+                       string="Scrap Products" type="action"
+                       icon="gtk-convert" context="{'scrap': True}"
+                       states="draft,waiting,confirmed,assigned"
+                       groups="base.group_user"/>
+                    <field name="scrapped" invisible="1"/>
+                    <field name="prodlot_id" groups="stock.group_production_lot"/>
+                    <button
+                       name="%(stock.track_line)d"
+                       string="Split in Serial Number"
+                       groups="stock.group_production_lot"
+                       type="action" icon="terp-stock_effects-object-colorize"
+                       states="draft,waiting,confirmed,assigned"/>
+                     <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                     <button name="setlast_tracking" string="Put in current pack" type="object"
+                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                        icon="terp-stock_effects-object-colorize"
+                        groups="stock.group_tracking_lot"
+                        states="draft,assigned,confirmed"/>
+                     <button name="%(split_into)d" string="Put in a new pack" type="action"
+                        groups="product.group_stock_packaging"
+                        icon="terp-stock_effects-object-colorize"
+                        states="draft,assigned,confirmed"/>
+                      <field name="location_dest_id" groups="stock.group_locations"/>
+                      <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
@@ -1528,6 +1275,80 @@
             </field>
         </record>
 
+        <record id="view_move_picking_form" model="ir.ui.view">
+            <field name="name">stock.move.form</field>
+            <field name="model">stock.move</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+            <form string="Stock Moves" version="7.0">
+                <header>
+                    <span groups="base.group_user">
+                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                        <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
+                    </span>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
+                </header>
+                <group>
+                    <group>
+                        <field name="name" invisible="1"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                            <button name="%(stock.move_scrap)d"
+                                string="Scrap" type="action"
+                                icon="gtk-convert" context="{'scrap': True}"
+                                states="draft,waiting,confirmed,assigned"
+                                groups="base.group_user"/>
+                        </div>
+                            <label for="product_uos_qty" groups="product.group_uos"/>
+                            <div groups="product.group_uos">
+                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            </div>
+                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                            </group>
+                            <group>
+                                <field name="create_date" invisible="1"/>
+                                <field name="date"/>
+                                <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                            </group>
+
+                            <group string="Locations" groups="stock.group_locations">
+                                <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                            </group>
+
+                            <group groups="stock.group_tracking_lot" string="Traceability">
+                                <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"/>
+                                 </div>
+
+                                  <label for="prodlot_id"/>
+                                  <div>
+                                        <field name="prodlot_id" groups="stock.group_production_lot"
+                                            context="{'location_id':location_id, 'product_id':product_id}"
+                                            domain="[('product_id','=?',product_id)]"
+                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                        <button name="%(track_line)d"
+                                            groups="stock.group_tracking_lot"
+                                            states="draft,waiting,confirmed,assigned"
+                                            string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                            </div>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="view_move_search" model="ir.ui.view">
             <field name="name">stock.move.search</field>
             <field name="model">stock.move</field>

From 99a105b699b3d483022c8181737cab5b4d077865 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Aug 2012 14:06:14 +0530
Subject: [PATCH 03/16] [IMP]stock : fixed delivery view error

bzr revid: mma@tinyerp.com-20120829083614-v9zkh79f4yhhmoy2
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6a68d1a979f..5f28cbd95f5 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -306,7 +306,7 @@
 
         <record id="view_delivery_order_inherit_stock" model="ir.ui.view">
             <field name="name">stock.picking.out.form</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/header//button[@string='Create Invoice/Refund']" position="after">

From 07ef966c5bb53841ce81180ca6b958f0cb19a71d Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Aug 2012 15:22:27 +0530
Subject: [PATCH 04/16] [IMP]stock : added a priority in tree view

bzr revid: mma@tinyerp.com-20120829095227-lx41lxyhg3tbyu4w
---
 addons/stock/stock_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 391b02fba9a..d6ae96cf121 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1162,6 +1162,7 @@
         <record id="view_move_picking_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
             <field name="model">stock.move</field>
+            <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:scrapped == True" string="Stock Moves">
                     <field name="product_id"/>

From 64423a44d96e54d323155e53b92683150a84ea4a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Aug 2012 15:48:31 +0530
Subject: [PATCH 05/16] [IMP]stock : improve inheited view with new one

bzr revid: mma@tinyerp.com-20120829101831-ra14hkmadr517y9q
---
 addons/delivery/delivery_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5f28cbd95f5..deb59983ef2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -259,10 +259,10 @@
 
         <record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.internal.move.form.view</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_picking_tree"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="//field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net" groups="base.group_no_one"/>
                 </xpath>

From b185760c7bf5531d61ab0f165ecffcf07ac779ae Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 30 Aug 2012 12:22:55 +0530
Subject: [PATCH 06/16] [IMP]stock : added a new filed type for set a location
 in or out and make a onchane & default method for it and set action of moves
 for its view

bzr revid: mma@tinyerp.com-20120830065255-ogmp9xytwd3kr8f8
---
 addons/stock/stock.py       | 38 +++++++++++++++++++++++++++++++++++++
 addons/stock/stock_view.xml | 20 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7f0a744a62e..e49cc0ffa5c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1653,6 +1653,7 @@ class stock_move(osv.osv):
 
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
     }
     def _check_location(self, cr, uid, ids, context=None):
         for record in self.browse(cr, uid, ids, context=context):
@@ -1732,10 +1733,27 @@ class stock_move(osv.osv):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.company_id.partner_id.id
 
+    def _default_move_type(self, cr, uid, context=None):
+        """ Gets default type of move 
+        @return: type
+        """
+        picking_type = context.get('picking_type')
+        type = False
+        if context is None:
+            context = {}
+        if picking_type == 'in':
+            type = 'in'
+        elif picking_type == 'out':
+            type = 'out'
+        else: 
+            type = 'internal'
+        return type
+
     _defaults = {
         'location_id': _default_location_source,
         'location_dest_id': _default_location_destination,
         'partner_id': _default_destination_address,
+        'type': _default_move_type,
         'state': 'draft',
         'priority': '1',
         'product_qty': 1.0,
@@ -1889,6 +1907,26 @@ class stock_move(osv.osv):
             result['location_dest_id'] = loc_dest_id
         return {'value': result}
 
+    def onchange_move_type(self, cr, uid, ids, type, context=None):
+        """ On change of move type gives sorce and destination location.
+        @param type: Move Type
+        @return: Dictionary of values
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        location_source_id = False
+        location_dest_id = False
+        if type == 'in':
+            location_source_id = 'stock_location_suppliers'
+            location_dest_id = 'stock_location_stock' 
+        elif type == 'out':
+            location_source_id = 'stock_location_stock' 
+            location_dest_id = 'stock_location_customers'
+        if location_source_id:
+            location_model, location_source_id = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
+        if location_dest_id:
+            location_model, location_dest_id = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
+        return {'value':{'location_id': location_source_id, 'location_dest_id': location_dest_id}}
+
     def onchange_date(self, cr, uid, ids, date, date_expected, context=None):
         """ On change of Scheduled Date gives a Move date.
         @param date_expected: Scheduled Date
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d6ae96cf121..cdce4c3dc94 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1126,6 +1126,7 @@
                     <field name="name"/>
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
+                    <field name="type" on_change="onchange_move_type(type)"/>
                     <field name="create_date" invisible="1" groups="base.group_no_one"/>
                     <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1239,6 +1240,7 @@
                         </group>
                         <group name="origin_grp" string="Origin">
                             <field name="picking_id"/>
+                             <field name="type" on_change="onchange_move_type(type)"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="create_date" groups="base.group_no_one"/>
                         </group>
@@ -1279,7 +1281,7 @@
         <record id="view_move_picking_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
-            <field eval="4" name="priority"/>
+            <field eval="2" name="priority"/>
             <field name="arch" type="xml">
             <form string="Stock Moves" version="7.0">
                 <header>
@@ -1294,6 +1296,7 @@
                     <group>
                         <field name="name" invisible="1"/>
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                        <field name="type" invisible="1"/>
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
@@ -1400,6 +1403,21 @@
               </p>
             </field>
         </record>
+        
+        <record model="ir.actions.act_window.view" id="action_stock_move_tree_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_stock_move_form_all">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_move_form"/>
+        <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
 
         <!--

From 5710f88977bc6ad3aa64702cff7d012518f86560 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 30 Aug 2012 18:19:52 +0530
Subject: [PATCH 07/16] [IMP]stock : pass a type of move in sale and purchase

bzr revid: mma@tinyerp.com-20120830124952-02bmcrfk33z0zff4
---
 addons/purchase/purchase.py | 1 +
 addons/sale/sale.py         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 756016d39e2..6d2997d4af6 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -543,6 +543,7 @@ class purchase_order(osv.osv):
             'partner_id': order.dest_address_id.id or order.partner_id.id,
             'move_dest_id': order_line.move_dest_id.id,
             'state': 'draft',
+            'type':'in',
             'purchase_line_id': order_line.id,
             'company_id': order.company_id.id,
             'price_unit': order_line.price_unit
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c525ba04df1..e3dd277f24c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -870,6 +870,7 @@ class sale_order(osv.osv):
             'sale_line_id': line.id,
             'tracking_id': False,
             'state': 'draft',
+            'type':'out',
             #'state': 'waiting',
             'note': '\n'.join(line.name.split('\n')[1:]),
             'company_id': order.company_id.id,

From 694a3ffced347f5e3a3e4c059ffc2ae0ce71ba34 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 30 Aug 2012 18:33:53 +0530
Subject: [PATCH 08/16] [IMP]stock : improve little bit code

bzr revid: mma@tinyerp.com-20120830130353-9pvgngbpoleef3f2
---
 addons/stock/stock.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e49cc0ffa5c..f4997178c5e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1738,15 +1738,13 @@ class stock_move(osv.osv):
         @return: type
         """
         picking_type = context.get('picking_type')
-        type = False
+        type = 'internal'
         if context is None:
             context = {}
         if picking_type == 'in':
             type = 'in'
         elif picking_type == 'out':
             type = 'out'
-        else: 
-            type = 'internal'
         return type
 
     _defaults = {

From 0dd1516ce2997371fc4a8b031cb17d3214849ec3 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 31 Aug 2012 11:52:01 +0530
Subject: [PATCH 09/16] [IMP]stock :set a appropriate access rights and groups
 for manager and user

bzr revid: mma@tinyerp.com-20120831062201-tyw9qvrf23eh8i3y
---
 addons/mrp/board_manufacturing_view.xml        | 3 ++-
 addons/purchase/board_purchase_view.xml        | 3 ++-
 addons/stock/report/report_stock_move_view.xml | 3 ++-
 addons/stock/security/ir.model.access.csv      | 4 ++--
 addons/stock/stock_view.xml                    | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index e7668517a70..12d2f96454f 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -31,7 +31,8 @@
                   icon="terp-graph"
                   id="menu_board_manufacturing"
                   parent="base.menu_reporting_dashboard"
-                  sequence="30"/>
+                  sequence="30"
+                  groups="group_mrp_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 67c3981f383..e41caddfd21 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -85,7 +85,8 @@
                   icon="terp-graph"
                   id="menu_board_purchase"
                   parent="base.menu_reporting_dashboard"
-                  sequence="20"/>
+                  sequence="20"
+                  groups="group_purchase_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a78a506cefe..4c911dd6e7c 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -6,7 +6,8 @@
         id="stock.next_id_61"
         name="Warehouse"
         sequence="15"
-        parent="base.menu_reporting"/>
+        parent="base.menu_reporting"
+        groups="group_stock_manager"/>
 
     <record id="view_stock_tree" model="ir.ui.view">
         <field name="name">report.stock.move.tree</field>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f56696bcbaa..5dbc66df39b 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -21,9 +21,9 @@ access_stock_production_lot_manager,stock.production.lot manager,model_stock_pro
 access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0
-access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,0,0,0
+access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,1,1,0
 access_stock_move_warehouse_manager,stock.move.manager,model_stock_move,stock.group_stock_manager,1,1,1,1
-access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,0,0,0
+access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,0
 access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
 access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0
 access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cdce4c3dc94..63b006e2369 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -107,8 +107,8 @@
                 <form string="Physical Inventory" version="7.0">
                 <header>
                     <button name="%(action_view_stock_fill_inventory)d" string="Import Inventory" type="action" class="oe_highlight"/>
-                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight"/>
-                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight"/>
+                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight" groups="stock.group_stock_user"/>
+                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight" groups="stock.group_stock_manager"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>

From 1ff9edff22276588a92ecdb276329e37bc8a76bf Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 31 Aug 2012 11:56:37 +0530
Subject: [PATCH 10/16] [IMP]stock : improve little bit

bzr revid: mma@tinyerp.com-20120831062637-ypnga3qcb0ab0bo7
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f4997178c5e..d8695752c46 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1737,10 +1737,10 @@ class stock_move(osv.osv):
         """ Gets default type of move 
         @return: type
         """
-        picking_type = context.get('picking_type')
-        type = 'internal'
         if context is None:
             context = {}
+        picking_type = context.get('picking_type')
+        type = 'internal'
         if picking_type == 'in':
             type = 'in'
         elif picking_type == 'out':

From 36874b2911e816920968e472d56847240c63a0ac Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 3 Sep 2012 17:00:15 +0530
Subject: [PATCH 11/16] [IMP]purchase : set group on warehouse filed

bzr revid: mma@tinyerp.com-20120903113015-ql8lpem6idnusp2r
---
 addons/purchase/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index ad1c26a84c1..ab649e37e47 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -31,7 +31,7 @@
                     <field name="purchase_id"/>
                 </xpath>
                 <xpath expr="//field[@name='company_id']" position="after">
-                    <field name="warehouse_id"/>
+                    <field name="warehouse_id" groups="stock.group_locations"/>
                 </xpath>
             </field>
         </record>

From 374dd5524de55d6e4f9167b37a16f773270ca053 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 4 Sep 2012 12:35:27 +0530
Subject: [PATCH 12/16] [IMP]stock : give a user access to create invenoty line

bzr revid: mma@tinyerp.com-20120904070527-da3xgu1sxrdrlp55
---
 addons/stock/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 5dbc66df39b..f0a3e68d810 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -25,7 +25,7 @@ access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1
 access_stock_move_warehouse_manager,stock.move.manager,model_stock_move,stock.group_stock_manager,1,1,1,1
 access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,0
 access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
-access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0
+access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,0
 access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1
 access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0
 access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0

From c5fa8a77c9e174fa4d4072b8b560126f8d934829 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 4 Sep 2012 14:05:29 +0530
Subject: [PATCH 13/16] [IMP]sale : give a user right to quotation menu

bzr revid: mma@tinyerp.com-20120904083529-qgo0fcvo1wqepc78
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a0e69efe849..cee4dc38bf4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -450,7 +450,7 @@
 
         <menuitem id="menu_sale_quotations"
         action="action_order_tree5" parent="base.menu_sales"
-        sequence="4"/>
+        sequence="4" groups="base.group_sale_salesman_all_leads"/>
 
         <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>

From cf42513f428319efe4cc9cd79dae0e9f72711255 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 6 Sep 2012 12:30:45 +0530
Subject: [PATCH 14/16] [IMP]stock : set button top right side

bzr revid: mma@tinyerp.com-20120906070045-1ff2sedb67t2s52w
---
 addons/stock/stock_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 63b006e2369..e78008d14bf 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -106,7 +106,6 @@
             <field name="arch" type="xml">
                 <form string="Physical Inventory" version="7.0">
                 <header>
-                    <button name="%(action_view_stock_fill_inventory)d" string="Import Inventory" type="action" class="oe_highlight"/>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight" groups="stock.group_stock_user"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight" groups="stock.group_stock_manager"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
@@ -114,6 +113,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div class="oe_right oe_button_box">
+                        <button name="%(action_view_stock_fill_inventory)d" string="Import Inventory" type="action" />
+                    </div>
                     <div>
                         <label for="name" class="oe_edit_only"/>
                         <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -

From 6a4d58ace80320db0b42bc86ab7877bcf14b1e47 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 13 Sep 2012 13:00:45 +0530
Subject: [PATCH 15/16] [IMP]stock : set group on warehouse user and default
 value in action

bzr revid: mma@tinyerp.com-20120913073045-ee9fidsc4inufjha
---
 addons/stock/board_warehouse_view.xml | 2 +-
 addons/stock/stock_view.xml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b223e731e8f..839a99c1fa7 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -61,7 +61,7 @@
                     parent="base.menu_reporting_dashboard" 
                     action="open_board_warehouse" 
                     sequence="25" 
-                    groups="group_stock_manager"/>
+                    groups="stock.group_stock_user"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f278edb0758..26616cca5a4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1496,7 +1496,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d, \'search_default_future\': 1}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
+            <field name="context">{'product_receive': True, 'search_default_future': True, 'picking_type': 'in'}</field>
             <field name="help" type="html">
               <p>
                 Click to register a product reception. 
@@ -1631,7 +1631,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d, \'search_default_future\': 1}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
+            <field name="context">{'picking_type': 'out', 'search_default_future': True}</field>
             <field name="help" type="html">
               <p>
                 You will find in this list all products you have to deliver to

From 7ee881b98d0af19f81888b967457873f785f922f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 13 Sep 2012 17:08:32 +0530
Subject: [PATCH 16/16] [IMP]stock : add button claim on right side of delivery
 order and added data file for claim and give a acces right of borad to
 warehouse user

bzr revid: mma@tinyerp.com-20120913113832-80jmjtoj83pjflra
---
 addons/claim_from_delivery/__openerp__.py     |  4 ++-
 .../claim_delivery_data.xml                   | 10 ++++++++
 .../claim_delivery_view.xml                   | 25 +++++++++++++++----
 addons/stock/security/ir.model.access.csv     |  3 ++-
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 addons/claim_from_delivery/claim_delivery_data.xml

diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 9c4395927af..9e3f7f59ca2 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -30,7 +30,9 @@ Create a claim from a delivery order.
 
 Adds a Claim link to the delivery order.
 """,
-    'data' : ['claim_delivery_view.xml'],
+    'data' : [
+              'claim_delivery_view.xml',
+              'claim_delivery_data.xml',],
     'auto_install': False,
     'installable': True,
     'certificate' : '001101649349223746957',
diff --git a/addons/claim_from_delivery/claim_delivery_data.xml b/addons/claim_from_delivery/claim_delivery_data.xml
new file mode 100644
index 00000000000..d5faa279434
--- /dev/null
+++ b/addons/claim_from_delivery/claim_delivery_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+    
+     <record model="res.request.link" id="request_link_claim_from_delivery">
+            <field name="name">Delivery Order</field>
+            <field name="object">stock.picking.out</field>
+     </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index f345484b4a9..17803b1f546 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -1,11 +1,26 @@
 <openerp>
     <data>
 
-        <act_window id="action_claim_from_delivery" name="Claim"
-            domain="[]" target="current"
-            context="{'default_partner_id': partner_id}"
-            view_mode="form" res_model="crm.claim"
-            src_model="stock.picking" />
+        <record id="action_claim_from_delivery" model="ir.actions.act_window">
+            <field name="name">Claim From Delivery</field>
+            <field name="res_model">crm.claim</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_claim.crm_case_claims_tree_view"/>
+            <field name="context">{}</field>
+        </record>
+
+        <record id="crm_claim_from_delivery" model="ir.ui.view">
+            <field name="name">crm.claim.from_delivery.form</field>
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/sheet/h1" position="before">
+                    <div class="oe_right oe_button_box">
+                        <button name="%(action_claim_from_delivery)d" string="Claim" type="action"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f0a3e68d810..67766519ff4 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -33,7 +33,7 @@ access_stock_location_stock_manager,stock.location stock manager,model_stock_loc
 access_stock_lines_date_user,report.stock.lines.date user,model_report_stock_lines_date,stock.group_stock_user,1,0,0,0
 access_stock_lines_date_manager,report.stock.lines.date manager,model_report_stock_lines_date,stock.group_stock_manager,1,1,1,1
 access_stock_report_tracklots,stock.report.tracklots,model_stock_report_tracklots,stock.group_stock_user,1,1,1,1
-access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,0,0,0
+access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,1,0,0
 access_report_stock_move_manager,report.stock.move manager,model_report_stock_move,stock.group_stock_manager,1,1,1,1
 access_report_stock_inventory_user,report.stock.inventory user,model_report_stock_inventory,stock.group_stock_user,1,1,1,1
 access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,0,0,0
@@ -61,3 +61,4 @@ access_product_group_res_partner_stock_manager,res_partner group_stock_manager,b
 access_product_pricelist_version_stock_manager,product.pricelist.version stock_manager,product.model_product_pricelist_version,stock.group_stock_manager,1,1,1,1
 access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1
 access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0
+access_board_stock_user,board.board user,board.model_board_board,stock.group_stock_user,1,1,0,0