[MERGE] forward port of branch 7.0 up to 529e920

diff --cc addons/account/project/project.py
index b4dcdde,e67a03c..5132604
--- 1/addons/account/project/project.py
--- 2/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@@ -38,6 -38,13 +38,12 @@@ class account_analytic_journal(osv.osv)
          'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
      }
  
+     def copy_data(self, cr, uid, id, default=None, context=None):
+         if not default:
+             default = {}
+         default.update({'line_ids': False})
+         return super(account_analytic_journal, self).copy_data(cr, uid, id, default, context)
+ 
 -account_analytic_journal()
  
  class account_journal(osv.osv):
      _inherit="account.journal"

diff --cc addons/mrp/stock.py
index c76b54d,d049aea..08a74b3
--- 1/addons/mrp/stock.py
--- 2/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@@ -96,9 -94,12 +93,12 @@@ class StockMove(osv.osv)
                      'picking_id': False,
                      'state': 'confirmed'
                  })
 -                for m in procurement_obj.search(cr, uid, [('move_id','=',move.id)], context):
 -                    wf_service.trg_validate(uid, 'procurement.order', m, 'button_confirm', cr)
 -                    wf_service.trg_validate(uid, 'procurement.order', m, 'button_wait_done', cr)
 +                procurement_ids = procurement_obj.search(cr, uid, [('move_id','=',move.id)], context)
 +                procurement_obj.signal_button_confirm(cr, uid, procurement_ids)
 +                procurement_obj.signal_button_wait_done(cr, uid, procurement_ids)
+         if processed_ids and move.state == 'assigned':
+             # Set the state of resulting moves according to 'assigned' as the original move is assigned
+             move_obj.write(cr, uid, list(set(processed_ids) - set([move.id])), {'state': 'assigned'}, context=context)
          return processed_ids
      
      def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None):