bugfix

bzr revid: fp@tinyerp.com-20090205171104-4lqkjij8ooewts4x

diff --git a/addons/account/product.py b/addons/account/product.py
index b053a6e..b26d9b1 100644 (file)
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -34,7 +34,7 @@ class product_category(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            help="This account will be used instead of the default one to value incoming stock for the current product category"),
+            help="This account will be used to value incoming stock for the current product category"),
         'property_account_expense_categ': fields.property(
             'account.account',
             type='many2one',
@@ -42,7 +42,7 @@ class product_category(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            help="This account will be used instead of the default one to value outgoing stock for the current product category"),
+            help="This account will be used to value outgoing stock for the current product category"),
     }
 product_category()
 

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index afcc1ce..92fa50d 100644 (file)
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -432,7 +432,7 @@ class stock_picking(osv.osv):
             select=True, required=True, readonly=True, states={'draft':[('readonly',False)]}),
     }
     _defaults = {
-        #'name': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'stock.picking'),
+        'name': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'stock.picking'),
         'active': lambda *a: 1,
         'state': lambda *a: 'draft',
         'move_type': lambda *a: 'direct',
@@ -454,8 +454,7 @@ class stock_picking(osv.osv):
         return moves
 
     def action_confirm(self, cr, uid, ids, context={}):
-        val = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
-        self.write(cr, uid, ids, {'name': val, 'state': 'confirmed'})
+        self.write(cr, uid, ids, {'state': 'confirmed'})
         todo = []
         for picking in self.browse(cr, uid, ids):
             for r in picking.move_lines: