From 6370744fe614c84dc17eda13e80342a799b85bdf Mon Sep 17 00:00:00 2001
From: husen daudi <hda@hda>
Date: Wed, 17 Jun 2009 19:43:23 +0530
Subject: [PATCH] [FIX] Module: scrum,stock create task wizard in scrum and
 unreceived product wizard create new entry in stock

bzr revid: hda@hda-20090617141323-ee4lm48j4fas5d40
---
 addons/scrum/scrum_view.xml            |  2 +-
 addons/scrum/wizard/backlog_to_task.py |  3 ++-
 addons/stock/stock.py                  | 16 ++++++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 116dd7bed13..9133f40d242 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -316,7 +316,7 @@
             <field name="name">View sprint Tasks</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('product_backlog_id', '=', 'S('+str(active_id)+')')]</field>
+            <field name="domain">[('product_backlog_id', '=', active_id)]</field>
         </record>
         <record id="ir_scrum_sprint_open_task" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>
diff --git a/addons/scrum/wizard/backlog_to_task.py b/addons/scrum/wizard/backlog_to_task.py
index 4f578494428..4701b95ce29 100644
--- a/addons/scrum/wizard/backlog_to_task.py
+++ b/addons/scrum/wizard/backlog_to_task.py
@@ -46,7 +46,8 @@ def _do_create(self, cr, uid, data, context):
             'description': backlog.note,
             'project_id': backlog.project_id.id,
             'user_id': (backlog.user_id and backlog.user_id.id) or uid,
-            'priority': backlog.priority
+            'priority': backlog.priority,
+            'planned_hours': backlog.planned_hours
         }))
 
     value = {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e32bdcf3c07..3d6e9c46d68 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1405,12 +1405,16 @@ class stock_picking_move_wizard(osv.osv_memory):
         for act in self.read(cr,uid,ids):
             move_lines=move_obj.browse(cr,uid,act['move_ids'])
             for line in move_lines:
-                 picking_obj.write(cr,uid,[line.picking_id.id],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
-                 picking_obj.write(cr,uid,[act['picking_id']],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
-                 cr.commit()
-                 old_picking=picking_obj.read(cr,uid,[line.picking_id.id])[0]
-                 if not len(old_picking['move_lines']):
-                    picking_obj.write(cr,uid,[old_picking['id']],{'state':'done'})
+                if line.picking_id:
+                    picking_obj.write(cr,uid,[line.picking_id.id],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
+                    picking_obj.write(cr,uid,[act['picking_id']],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
+                    cr.commit()
+                    old_picking=picking_obj.read(cr,uid,[line.picking_id.id])[0]
+                    if not len(old_picking['move_lines']):
+                        picking_obj.write(cr,uid,[old_picking['id']],{'state':'done'})
+                else:
+                    raise osv.except_osv(_('UserError'),
+                        _('You can not create new moves.'))
         return {'type':'ir.actions.act_window_close' }
 
 stock_picking_move_wizard()