bugfixes

bzr revid: fp@tinyerp.com-20081214172347-r767d3ekkgb2xhxd

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index b0c917f..16537a4 100644 (file)
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -639,7 +639,7 @@ class account_move_line(osv.osv):
         return False
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False):
-        result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context)
+        result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar)
         if view_type=='tree' and 'journal_id' in context:
             title = self.view_header_get(cr, uid, view_id, view_type, context)
             journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b024ee3..e74165e 100644 (file)
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -465,15 +465,19 @@ class stock_picking(osv.osv):
         for pick in self.browse(cr, uid, ids):
             wf_service.trg_validate(uid, 'stock.picking', pick.id,
                 'button_confirm', cr)
-            move_ids = [x.id for x in pick.move_lines]
-            self.pool.get('stock.move').force_assign(cr, uid, move_ids)
-            wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+            #move_ids = [x.id for x in pick.move_lines]
+            #self.pool.get('stock.move').force_assign(cr, uid, move_ids)
+            #wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
 
     def draft_validate(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         self.draft_force_assign(cr, uid, ids)
         for pick in self.browse(cr, uid, ids):
+            move_ids = [x.id for x in pick.move_lines]
+            self.pool.get('stock.move').force_assign(cr, uid, move_ids)
+            wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+
             self.action_move(cr, uid, [pick.id])
             wf_service.trg_validate(uid, 'stock.picking', pick.id , 'button_done', cr)
         return True