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

addons/account/project/project.py

@@ -38,6 +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)
+
 
 class account_journal(osv.osv):
     _inherit="account.journal"

addons/mrp/stock.py

@@ -54,9 +54,6 @@ class StockMove(osv.osv):
                 factor = move.product_qty
                 bom_point = bom_obj.browse(cr, uid, bis[0], context=context)
                 res = bom_obj._bom_explode(cr, uid, bom_point, factor, [])
-                state = 'confirmed'
-                if move.state == 'assigned':
-                    state = 'assigned'
                 for line in res[0]: 
                     valdef = {
                         'picking_id': move.picking_id.id,
@@ -66,7 +63,7 @@ class StockMove(osv.osv):
                         'product_uos': line['product_uos'],
                         'product_uos_qty': line['product_uos_qty'],
                         'move_dest_id': move.id,
-                        'state': state,
+                        'state': 'draft',  #will be confirmed below
                         'name': line['name'],
                         'move_history_ids': [(6,0,[move.id])],
                         'move_history_ids2': [(6,0,[])],
@@ -99,6 +96,9 @@ class StockMove(osv.osv):
                 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):

addons/point_of_sale/point_of_sale_sequence.xml

@@ -36,7 +36,7 @@
     <record model="ir.sequence" id="seq_pos_session">
         <field name="name">POS Session</field>
         <field name="code">pos.session</field>
-        <field name="prefix">POS/%(day)s/(month)s/%(year)s/</field>
+        <field name="prefix">POS/%(day)s/%(month)s/%(year)s/</field>
         <field name="padding">4</field>
     </record>