From b07ab3f329379263eb3cc0681544bc0c9b3022ce Mon Sep 17 00:00:00 2001
From: sus <tiny@tiny-desktop>
Date: Mon, 22 Nov 2010 16:54:38 +0530
Subject: [PATCH 1/4] change group in stock_view.xml file

lp bug: https://launchpad.net/bugs/676491 fixed

bzr revid: tiny@tiny-desktop-20101122112438-lnn4n937fk2eekj6
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9e3de5fca7c..3a4dc785172 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1354,8 +1354,8 @@
                     <group colspan="2" col="2">
                         <separator colspan="2" string="Move Information"/>
                         <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
-                        <field name="product_uos" groups="product.product_uos" colspan="4"/>
+                        <field name="product_uos_qty" groups="product.group_uos" colspan="4"/>
+                        <field name="product_uos" groups="product.group_uos" colspan="4"/>
                     </group>
 
                     <group colspan="2" col="2">

From 864423b1f469586ca8747fc16b98ecd7240e0981 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 22 Nov 2010 18:38:29 +0530
Subject: [PATCH 2/4] [IMP] inmprovement in sale for Logistics and  in
 sale/stock.py

bzr revid: aag@tinyerp.co.in-20101122130829-y2vwtrtndgy1s4ne
---
 addons/sale/i18n/de.po | 2 +-
 addons/sale/stock.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index e725e5fac59..fece92aa489 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -1512,7 +1512,7 @@ msgstr "Verkäufe je Verkäufer"
 #. module: sale
 #: view:sale.order:0
 
-msgid "Logistic"
+msgid "Logistics"
 msgstr "Logistik"
 
 #. module: sale
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index c020389ba19..622c4917d7d 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -70,7 +70,7 @@ class stock_picking(osv.osv):
     def _get_price_unit_invoice(self, cursor, user, move_line, type):
         if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
             from_uom_id = move_line.product_id.uom_id.id
-            to_uom_id = move_line.product_id.uos_id.id
+            to_uom_id = move_line.product_id.uos_id and move_line.product_id.uos_id.id or False
             price = move_line.sale_line_id.price_unit
             coeff = move_line.product_id.uos_coeff
             if from_uom_id != to_uom_id  and coeff != 0:

From cd021c59fad26ae1949fb27cc4fb449a858e71ae Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 22 Nov 2010 19:13:26 +0100
Subject: [PATCH 3/4] [FIX] mrp, mrp_view.xml: remove the widget='selection' on
 the location fields

bzr revid: qdp-launchpad@tinyerp.com-20101122181326-ml0d64alqqmwnqg6
---
 addons/mrp/mrp_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index adc517f1b7c..4f6f0c88d54 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -583,8 +583,8 @@
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
                             <field name="routing_id" groups="base.group_extended" select="1" widget="selection"/>
-                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)" widget="selection"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <separator string="" colspan="4"/>
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
@@ -593,7 +593,7 @@
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
                                     <field name="product_uom"  string="UOM" widget="selection"/>
-                                    <field name="location_id"  string="Source Loc." widget="selection"/>
+                                    <field name="location_id"  string="Source Loc."/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.move_consume)d"
                                         string="Consume Products" type="action"
@@ -612,7 +612,7 @@
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
                                        <field name="product_uom" readonly="1" string="UOM" widget="selection"/>
-                                       <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
+                                       <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
                                        <field name="scrapped" invisible="1"/>
@@ -647,7 +647,7 @@
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
                                     <field name="product_uom"  string="UOM" widget="selection"/>
-                                    <field name="location_id"  string="Source Loc." widget="selection"/>
+                                    <field name="location_id"  string="Source Loc." />
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.action_partial_move)d" 
                                         string="Partial" 

From 7d8d3d33b40cbe0b2d1ec361ee5385c1905c64a0 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 22 Nov 2010 19:15:53 +0100
Subject: [PATCH 4/4] [FIX] stock, physical inventory: display split button on
 confirmed state too

bzr revid: qdp-launchpad@tinyerp.com-20101122181553-rj2dm1ciuyhz200p
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c9be557d9a3..6fa7a7950bc 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -100,7 +100,7 @@
                                 <field name="prod_lot_id" groups="base.group_extended"/>
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="base.group_extended"
-                                    type="action" icon="terp-stock_effects-object-colorize" states="draft"/>
+                                    type="action" icon="terp-stock_effects-object-colorize" states="draft,confirm"/>
                                 <field name="state" invisible="True"/>
                             </tree>
                             <form string="Products ">