Merge lp:~unifield-team/unifield-wm/us-960-delete-regline into lp:unifield-wm

[jftempo]

Unmerged revisions

2772. By dvo@dvo on 2016-02-25

US-671: Search for the cost center from codeterrain and set this value, if not, set empty

=== modified file 'msf_homere_interface/wizard/hr_payroll_employee_import.py'
--- msf_homere_interface/wizard/hr_payroll_employee_import.py	2015-05-28 12:04:30 +0000
+++ msf_homere_interface/wizard/hr_payroll_employee_import.py	2016-02-26 09:22:42 +0000
@@ -385,9 +385,17 @@
                 # Check job
                 if contract.job_id:
                     vals.update({'job_id': contract.job_id.id})
+                    
             # Desactivate employee if no current contract
             if not current_contract:
                 vals.update({'active': False})
+
+            # US-671: Search for the cost center from codeterrain and set this value, if not, set empty
+            account_analytic_obj = self.pool.get('account.analytic.account')
+            cc_ids = account_analytic_obj.search(cr, uid,[('code', '=', codeterrain)])
+            if cc_ids and len(cc_ids) == 1:
+                vals.update({'cost_center_id': cc_ids[0],})
+            
             if not e_ids:
                 res = self.pool.get('hr.employee').create(cr, uid, vals, {'from': 'import'})
                 if res:

=== modified file 'register_accounting/account_bank_statement.py'
--- register_accounting/account_bank_statement.py	2016-01-25 11:23:45 +0000
+++ register_accounting/account_bank_statement.py	2016-02-26 09:22:42 +0000
@@ -2383,7 +2383,8 @@
                 if st_line.state == "hard":
                     raise osv.except_osv(_('Error'), _('You are not allowed to delete hard posting lines!'))
                 else:
-                    self.pool.get('account.move').unlink(cr, uid, [x.id for x in st_line.move_ids])
+                    #US-960: No need to set the check flag to True when unlink a reg line, otherwise it could regenerate wrongly new AJIs!
+                    self.pool.get('account.move').unlink(cr, uid, [x.id for x in st_line.move_ids], context=context, check=False) 
             # Delete direct invoice if exists
             if st_line.direct_invoice and st_line.invoice_id and not context.get('from_direct_invoice', False):
                 # unlink moves and analytic lines before deleting the line