Merge lp:~vauxoo/account-management/account-management-fix-ap-joyza into lp:account-management

[Joyza Carrasquero]

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

review: Approve

=== modified file 'account_management/model/account_partner.py'
--- account_management/model/account_partner.py	2012-05-14 14:52:27 +0000
+++ account_management/model/account_partner.py	2013-06-25 20:44:28 +0000
@@ -308,6 +308,7 @@
                 vals.update({attr:False})
         vals.update(self._update_code(cr, uid, None, vals, context=context))
         return super(res_partner, self).create(cr, uid, vals, context)
+        
 
     def _switch_accounts(self, cr, uid, ids, k,vals, context=None):
         prod_id = None
@@ -323,10 +324,27 @@
         if context.get('previous_accounts',False):
             previous_accounts = context['previous_accounts']
         
-        aml_ids = aml_obj.search(cr, uid, [('account_id','=',previous_accounts[__ACC__[k][0]]),('partner_id','in',ids)],context=context)
-        ai_ids = ai_obj.search(cr, uid, [('account_id','=',previous_accounts[__ACC__[k][0]]),('partner_id','in',ids)],context=context)
-        avl_ids = avl_obj.search(cr, uid, [('account_id','=',previous_accounts[__ACC__[k][0]]),('partner_id','in',ids)],context=context)
-        
+        per_obj = self.pool.get('account.period')
+        period_ids = per_obj.search(cr, uid, [('special','=',False),
+                                    ('state', '=', 'draft')],
+                                    context=context)
+
+        search_criteria = \
+            [('account_id','=',previous_accounts[__ACC__[k][0]]),
+             ('partner_id','in',ids),
+             ('period_id', 'in', period_ids)]
+
+        aml_ids = period_ids and \
+            aml_obj.search( cr, uid, search_criteria, context=context) \
+            or False
+        ai_ids = period_ids and \
+            ai_obj.search( cr, uid, search_criteria, context=context) \
+            or False
+        search_criteria.pop()   
+        avl_ids = period_ids and \
+            avl_obj.search( cr, uid, search_criteria, context=context) \
+            or False 
+
         if aml_ids: 
             cr.execute('UPDATE account_move_line SET account_id = %s WHERE id in (%s)'%(vals[__ACC__[k][0]],', '.join([str(i) for i in aml_ids])))