[FIX] stock

bzr revid: hmo@tinyerp.com-20100707090522-xthwqspg9vh4e46j

7 files changed, 10 insertions, 8 deletions

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 405bd165106..dfe6f82c30d 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -170,8 +170,8 @@ class product_product(osv.osv):
             context = {}
         res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
         if res: return res
-        if (context.get('location', False)):
-            return _('Products: ')+self.pool.get('stock.location').browse(cr, user, context['location'], context).name
+        if (context.get('active_id', False)) and (context.get('active_model') == 'stock.location'):
+            return _('Products: ')+self.pool.get('stock.location').browse(cr, user, context['active_id'], context).name
         return res
 
     def get_product_available(self, cr, uid, ids, context=None):
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 97510e31a64..68bae72ba84 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -208,7 +208,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ picking.weight or '']] </para>
+          <para style="terp_default_Centre_8">[[ 'weight' in picking._columns.keys() and picking.weight or '']] </para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
index 8dff4acf528..81f20ed8906 100644
--- a/addons/stock/report/report_stock_picking.py
+++ b/addons/stock/report/report_stock_picking.py
@@ -72,6 +72,7 @@ class report_stock_picking(osv.osv):
                     sp.address_id as partner_id,
                     to_date(to_char(sp.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as date,
                     count(sm.id) as nbr,
+                    count(sp.id) as nbp,
                     sum(sm.product_qty*u.factor) as product_qty,
                     sum(sm.product_uos_qty) as product_uos_qty,
                     sm.product_id as product_id,
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 30a7610d81a..86d9cac4337 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -22,3 +22,4 @@
 "access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,1,1,1
 "access_report_stock_move","report.stock.move","model_report_stock_move","stock.group_stock_user",1,1,1,1
 "access_report_stock_inventory","report.stock.inventory","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
+"access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e3b49ea2a83..9bc40a1e691 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1008,6 +1008,9 @@ class stock_picking(osv.osv):
         return res
 
     def test_done(self, cr, uid, ids, context=None):
+        """ Test whether the move lines are done or not.
+        @return: True or False
+        """
         ok = False
         for pick in self.browse(cr, uid, ids, context=context):
             if not pick.move_lines:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 63e39bca629..2f9fe026a61 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1630,9 +1630,6 @@
                                   icon="terp-stock_effects-object-colorize"
                                   states="draft,assigned,confirmed,done"/>
                               <label/>
-                              <button name="%(track_line)d" string="Split in production lots"
-                                  groups="base.group_extended"
-                                  type="action" icon="terp-stock_effects-object-colorize"/>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
                             <group col="5" colspan="2">
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 9f91a47c9a5..b07d27c7656 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -44,8 +44,8 @@ class stock_inventory_line_split(osv.osv_memory):
         @return: A dictionary which of fields with values. 
         """        
         record_id = context and context.get('active_id',False)
-        res = super(stock_inventory_line_split, self).default_get(cr, uid, fields, context=context)
-        line=  self.pool.get('stock.inventory.line').browse(cr, uid, record_id)        
+        res = {}
+        line = self.pool.get('stock.inventory.line').browse(cr, uid, record_id)        
         if 'product_id' in fields:
             res.update({'product_id':line.product_id.id})       
         return res