diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index de236bb5d99..906ac653b3e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -475,7 +475,7 @@ class mrp_production(osv.osv):
             if production.move_created_ids:
                 self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in production.move_created_ids])
             self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in production.move_lines])
-        self.write(cr, uid, ids, {'state':'cancel','move_lines':[(6,0,[])]})
+        self.write(cr, uid, ids, {'state':'cancel'}) #,'move_lines':[(6,0,[])]})
         return True
 
     #XXX: may be a bug here; lot_lines are unreserved for a few seconds;
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c120ed706db..39ea34ed5bf 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -904,7 +904,6 @@ class sale_order_line(osv.osv):
                     }
             else:
                 result.update({'price_unit': price})
-        print result
         return {'value': result, 'domain': domain,'warning':warning}
 
     def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9ba8a1bc8a4..157aa9642e4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -595,7 +595,6 @@ class stock_picking(osv.osv):
 
     def action_invoice_create(self, cursor, user, ids, journal_id=False,
             group=False, type='out_invoice', context=None):
-        print "WW"*12,context
         '''Return ids of created invoices for the pickings'''
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
@@ -894,7 +893,7 @@ class stock_move(osv.osv):
 
         'note': fields.text('Notes'),
 
-        'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','cancel')], 'Status', readonly=True, select=True),
+        'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','Canceled')], 'Status', readonly=True, select=True),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }
@@ -1091,7 +1090,10 @@ class stock_move(osv.osv):
                 if move.picking_id:
                     pickings[move.picking_id.id] = True
         if move.move_dest_id and move.move_dest_id.state=='waiting':
-            self.write(cr, uid, [move.move_dest_id.id], {'state':'confirmed'})
+            self.write(cr, uid, [move.move_dest_id.id], {'state':'assigned'})
+            if move.move_dest_id.picking_id:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
         self.write(cr, uid, ids, {'state':'cancel', 'move_dest_id': False})
 
         #for pick_id in pickings:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a375850ed71..843daf2cee7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -517,7 +517,7 @@
                         <field name="date"/>
                         <field name="min_date" select="2"/>
                     </group>
-                    <notebook>
+                    <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
                                 <form string="Stock Moves">