From 9a2057c8018aedee7ce2073e23b78b0404b473fd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 00:20:15 +0200
Subject: [PATCH] fix

bzr revid: fp@tinyerp.com-20101011222015-yg8c5qfujutrrcei
---
 addons/product/product.py                          | 2 +-
 addons/stock/stock.py                              | 5 +++++
 addons/stock/stock_view.xml                        | 4 +---
 addons/stock_location/stock_location_demo_cpu1.xml | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 22f57ac981f..05ec8459bcd 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -386,7 +386,7 @@ class product_product(osv.osv):
     def _get_partner_code_name(self, cr, uid, ids, product, partner_id, context={}):
         for supinfo in product.seller_ids:
             if supinfo.name.id == partner_id:
-                return {'code': supinfo.product_code, 'name': supinfo.product_name, 'variants': ''}
+                return {'code': supinfo.product_code or product.default_code, 'name': supinfo.product_name or product.name, 'variants': ''}
         res = {'code': product.default_code, 'name': product.name, 'variants': product.variants}
         return res
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0d7767fe4c1..0b1bbe3695f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1655,6 +1655,11 @@ class stock_move(osv.osv):
                     self.write(cr, uid, [m.id], {
                         'date': newdate,
                         'location_dest_id': dest[0].id})
+                    if m.picking_id and (dest[3] or dest[5]):
+                        self.pool.get('stock.picking').write(cr, uid, [m.picking_id.id], {
+                            'stock_journal_id': dest[3] or m.picking_id.stock_journal_id.id,
+                            'type': dest[5] or m.picking_id.type
+                        }, context=context)
                     m.location_dest_id = dest[0]
                     res2 = self._chain_compute(cr, uid, [m], context=context)
                     for pick_id in res2.keys():
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dcee27a4b86..92d99c4bcc9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -652,7 +652,6 @@
                         <page string="Products">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
                                 <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="name" string="Move Name"/>
                                     <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="UoM"/>
@@ -682,7 +681,6 @@
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
-                                    <field name="date"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
@@ -1268,7 +1266,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner_address',"search_default_confirmed":1}</field>
+            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
 
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index d6306254ad8..01f711839d4 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -19,7 +19,7 @@
         </record>
         <record id="stock_location_path_4" model="stock.location.path">
             <field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
-            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="product_id" ref="product.product_product_cpu3"/>
             <field name="auto">transparent</field>
             <field name="invoice_state">none</field>
             <field eval="1" name="delay"/>
@@ -30,7 +30,7 @@
         </record>
         <record id="stock_location_path_5" model="stock.location.path">
             <field name="location_from_id" ref="stock_location_qualitytest0"/>
-            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="product_id" ref="product.product_product_cpu3"/>
             <field name="auto">manual</field>
             <field name="invoice_state">none</field>
             <field name="journal_id" ref="stock_journal_quality"/>