Merge lp:~unifield-team/unifield-wm/us-348-reset-copy-data into lp:unifield-wm

[jftempo]

=== modified file 'analytic_distribution/analytic_account.py'
--- analytic_distribution/analytic_account.py	2014-03-14 09:40:12 +0000
+++ analytic_distribution/analytic_account.py	2015-06-11 15:09:01 +0000
@@ -31,6 +31,24 @@
     _name = "account.analytic.account"
     _inherit = "account.analytic.account"
 
+
+    def copy_data(self, cr, uid, a_id, default=None, context=None):
+        """
+        Copy global distribution and give it to new invoice line
+        """
+        # Some verifications
+        if not context:
+            context = {}
+        if not default:
+            default = {}
+            
+        #US-348: Reset some values when duplicating an analytic account
+        default['tuple_destination_account_ids'] = []
+        default['destination_ids'] = []
+
+        # Copy analytic distribution
+        return super(analytic_account, self).copy_data(cr, uid, a_id, default, context)
+
     def _get_active(self, cr, uid, ids, field_name, args, context=None):
         '''
         If date out of date_start/date of given analytic account, then account is inactive.

=== modified file 'financing_contract/contract.py'
--- financing_contract/contract.py	2015-06-03 12:42:43 +0000
+++ financing_contract/contract.py	2015-06-11 15:09:01 +0000
@@ -69,7 +69,10 @@
         result = super(financing_contract_funding_pool_line, self).create(cr, uid, vals, context=context)
         # when a new funding pool is added to contract, then add all of the cost centers to the cost center tab, unless
         # the cost center is already there. No action is taken when a cost center is deleted
-        if 'contract_id' in vals and 'funding_pool_id' in vals:
+        
+        #US-345: the following block cannot be executed in the sync context, because it would then reset all costcenters from the funding pools!
+        # making that the deleted costcenters from the sender were not taken into account
+        if not context.get('sync_update_execution') and 'contract_id' in vals and 'funding_pool_id' in vals:
             # get the cc ids from for this funding pool
             quad_obj = self.pool.get('financing.contract.account.quadruplet')
             quad_ids = quad_obj.search(cr, uid, [('funding_pool_id','=',vals['funding_pool_id'])],context=context)

=== modified file 'register_accounting/account_bank_statement.py'
--- register_accounting/account_bank_statement.py	2015-06-04 16:46:25 +0000
+++ register_accounting/account_bank_statement.py	2015-06-11 15:09:01 +0000
@@ -1906,7 +1906,8 @@
         # Then update analytic distribution
         res = []
         must_return = False
-        if 'employee_id' or 'partner_type' in values:
+        # US-351: fixed the wrong condition
+        if 'employee_id' in values or 'partner_type' in values:
             must_return = True
             for line in self.read(cr, uid, ids, ['analytic_distribution_id', 'account_id', 'statement_id', 'first_move_line_id', 'move_ids']):
                 account_id = line.get('account_id')[0]
@@ -1922,8 +1923,9 @@
                 tmp = super(account_bank_statement_line, self).write(cr, uid, line.get('id'), values, context=context)
                 res.append(tmp)
 
-                new_distrib = values.get('analytic_distribution_id', False) 
-                if old_distrib != new_distrib and line.get('first_move_line_id', False) and line.get('move_ids', False):
+                new_distrib = values.get('analytic_distribution_id', False)
+                # US-351: Fixed the wrong condition 
+                if new_distrib and old_distrib != new_distrib and line.get('first_move_line_id', False) and line.get('move_ids', False):
                     first_move_line_id = line.get('first_move_line_id')[0]
                     move_ids = line.get('move_ids')[0]
                     if isinstance(move_ids, (int, long)):