Merge lp:~unifield-team/unifield-wm/UF_1746 into lp:unifield-wm

[Olivier DOSSMANN]

[lp:~unifield-team/unifield-wm/UF_1746]

1917. By Olivier DOSSMANN on 2014-05-02

UF-1746 [IMP] Correction - Change all move lines as "corrected_upstream" to disallow project users to change any other line if a coordo user have changed any move lines from a journal entry

1918. By Olivier DOSSMANN on 2014-05-09

UF-1746 [FIX] Bug on analytic lines that are corrected in closed period: No REV and COR lines.

This is due to the UF-1746 branch in which the "def corrected_upstream" make a write on account move line which delete and recreate analytic lines.

As this write permits to indicate synchronization that a change was done, I use "update_check=False, check=False" to avoid analytic lines deletion/recreation. Which solves the problem.

1919. By Olivier DOSSMANN on 2014-05-12

[MERGE] Last unifield trunk lp:unifield-wm

=== modified file 'account_corrections/account_move_line.py'
--- account_corrections/account_move_line.py	2014-04-29 14:46:07 +0000
+++ account_corrections/account_move_line.py	2014-05-12 12:56:18 +0000
@@ -42,13 +42,18 @@
          - The account is not the default credit/debit account of the attached statement (register)
          - All items attached to the entry have no reconcile_id on reconciliable account
          - The line doesn't come from a write-off
+         - The line is "corrected_upstream" that implies the line have been already corrected from a coordo or a hq to a level that is superior or equal to these instance.
         """
+        # Some checks
         if context is None:
             context = {}
+        # Prepare some values
         res = {}
         # Search all accounts that are used in bank, cheque and cash registers
         journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', 'in', ['bank', 'cheque', 'cash'])])
         account_ids = []
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+        level = company and company.instance_id and company.instance_id.level or ''
         for j in self.pool.get('account.journal').read(cr, uid, journal_ids, ['default_debit_account_id', 'default_credit_account_id']):
             if j.get('default_debit_account_id', False) and j.get('default_debit_account_id')[0] not in account_ids:
                 account_ids.append(j.get('default_debit_account_id')[0])
@@ -107,9 +112,14 @@
             if ml.account_id.id in account_ids:
                 res[ml.id] = False
                 continue
+            # False if "corrected_upstream" is True and that we come from project level
+            if ml.corrected_upstream and level == 'project':
+                res[ml.id] = False
+                continue
             # False if this line is a revaluation
             if ml.journal_id.type == 'revaluation':
                 res[ml.id] = False
+                continue
         return res
 
     _columns = {
@@ -761,6 +771,8 @@
                     al_obj.write(cr, uid, search_ids, search_data[1])
             # Add this line to succeded lines
             success_move_line_ids.append(ml.id)
+            # Mark it as "corrected_upstream" if needed
+            self.corrected_upstream_marker(cr, uid, [ml.id], context=context)
         return success_move_line_ids
 
     def correct_partner_id(self, cr, uid, ids, date=None, partner_id=None, context=None):
@@ -859,6 +871,25 @@
             success_move_line_ids.append(move_line.id)
         return success_move_line_ids
 
+    def corrected_upstream_marker(self, cr, uid, ids, context=None):
+        """
+        Check if we are in a COORDO / HQ instance. If yes, set move line(s) as corrected upstream.
+        """
+        # Some check
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # Prepare some values
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+        # Check if we come from COORDO/HQ instance
+        if company and company.instance_id and company.instance_id.level in ['section', 'coordo']:
+            # UF-1746: Set also all other move lines as corrected upstream to disallow projet user to correct any move line of this move.
+            move_ids = [x and x.get('move_id', False) and x.get('move_id')[0] for x in self.read(cr, uid, ids, ['move_id'], context=context)]
+            ml_ids = self.search(cr, uid, [('move_id', 'in', move_ids)])
+            self.write(cr, uid, ml_ids, {'corrected_upstream': True}, check=False, update_check=False, context=context)
+        return True
+
 account_move_line()
 
 class account_move(osv.osv):

=== modified file 'account_corrections/wizard/analytic_distribution_wizard.py'
--- account_corrections/wizard/analytic_distribution_wizard.py	2014-04-28 14:37:24 +0000
+++ account_corrections/wizard/analytic_distribution_wizard.py	2014-05-12 12:56:18 +0000
@@ -308,6 +308,12 @@
                 })
 
         #####
+        ## Set move line as corrected upstream if needed
+        ###
+        if to_reverse or to_override or to_create:
+            self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [ml.id], context=context)
+
+        #####
         ## FREE 1 / FREE 2
         ###
         for free in [('free.1', 'f1'), ('free.2', 'f2')]:
@@ -373,9 +379,9 @@
                     })
                 # create the ana line
                 self.pool.get(obj_name).create_analytic_lines(cr, uid, [new_distrib_line], ml.id, date=wizard.date, document_date=orig_document_date, source_date=orig_date)
-
-
-
+        # Set move line as corrected upstream if needed
+        if to_reverse or to_override or to_create:
+            self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [ml.id], context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
         """

=== modified file 'account_hq_entries/wizard/hq_entries_import.py'
--- account_hq_entries/wizard/hq_entries_import.py	2014-01-16 09:09:39 +0000
+++ account_hq_entries/wizard/hq_entries_import.py	2014-05-12 12:56:18 +0000
@@ -23,14 +23,12 @@
 
 from osv import osv
 from osv import fields
-import os.path
 from base64 import decodestring
 from tempfile import NamedTemporaryFile
 import csv
-from tools.misc import ustr
 from tools.translate import _
 import time
-import locale
+#import locale
 from account_override import ACCOUNT_RESTRICTED_AREA
 
 class hq_entries_import_wizard(osv.osv_memory):
@@ -45,7 +43,7 @@
     def parse_date(self, date):
         try:
             pdate = time.strptime(date, '%d/%m/%y')
-        except ValueError, e:
+        except ValueError:
             pdate = time.strptime(date, '%d/%m/%Y')
         return time.strftime('%Y-%m-%d', pdate)
 
@@ -94,7 +92,7 @@
                 vals.update({'document_date': dd})
             except ValueError, e:
                 raise osv.except_osv(_('Error'), _('Wrong format for date: %s: %s') % (document_date, e))
-        # [utp-928] 
+        # [utp-928]
         # Make it impossible to import HQ entries where Doc Date > Posting Date,
         # it will spare trouble at HQ entry validation.
         if dd and line_date and dd > line_date:
@@ -170,9 +168,9 @@
             free2_id = free2_id[0]
             aa_check_ids.append(free2_id)
         vals.update({'destination_id_first_value': destination_id, 'destination_id': destination_id, 'cost_center_id': cc_id, 'analytic_id': fp_id, 'cost_center_id_first_value': cc_id, 'analytic_id_first_value': fp_id, 'free_1_id': free1_id, 'free_2_id': free2_id,})
-        
-        # [utp-928] do not import line with a 
-        # 'Destination' or 'Cost Center' or 'Funding Pool', 
+
+        # [utp-928] do not import line with a
+        # 'Destination' or 'Cost Center' or 'Funding Pool',
         # of type 'view'
         aa_check_errors = []
         aa_check_category_map = {
@@ -193,7 +191,7 @@
                     aa_check_errors.append('%s"%s - %s" of type "view" is not allowed for import' % (category, aa_r['code'], aa_r['name']))
         if aa_check_errors:
             raise osv.except_osv(_('Error'), ", ".join(aa_check_errors))
-        
+
         # Fetch description
         if description:
             vals.update({'name': description})
@@ -259,23 +257,21 @@
         # Do verifications
         if not context:
             context = {}
-        
+
         # Verify that an HQ journal exists
         journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'hq'),
                                                                         ('is_current_instance', '=', True)])
         if not journal_ids:
             raise osv.except_osv(_('Error'), _('You cannot import HQ entries because no HQ Journal exists.'))
-        
+
         # Prepare some values
-        file_ext_separator = '.'
-        file_ext = "csv"
         message = _("HQ Entries import failed.")
         res = False
         created = 0
         processed = 0
         errors = []
         filename = ""
-        
+
         # Browse all given wizard
         for wiz in self.browse(cr, uid, ids):
             if not wiz.file:
@@ -296,7 +292,6 @@
                 if filename.split('.')[-1] != 'csv':
                     raise osv.except_osv(_('Warning'), _('You are trying to import a file with the wrong file format; please import a CSV file.'))
             res = True
-            amount = 0.0
             # Omit first line that contains columns ' name
             try:
                 reader.next()
@@ -307,28 +302,28 @@
                 nbline += 1
                 processed += 1
                 try:
-                    update = self.update_hq_entries(cr, uid, line)
+                    self.update_hq_entries(cr, uid, line)
                     created += 1
                 except osv.except_osv, e:
                     errors.append('Line %s, %s'%(nbline, e.value))
             fileobj.close()
-        
+
         if res:
             message = _("HQ Entries import successful")
         context.update({'message': message})
-        
+
         if errors:
             cr.rollback()
             view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_homere_interface', 'payroll_import_error')
         else:
             view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_homere_interface', 'payroll_import_confirmation')
         view_id = view_id and view_id[1] or False
-        
+
         # This is to redirect to HQ Entries Tree View
         context.update({'from': 'hq_entries_import'})
-        
+
         res_id = self.pool.get('hr.payroll.import.confirmation').create(cr, uid, {'filename': filename, 'created': created, 'total': processed, 'state': 'hq', 'errors': "\n".join(errors), 'nberrors': len(errors)}, context=context)
-        
+
         return {
             'name': 'HQ Entries Import Confirmation',
             'type': 'ir.actions.act_window',

=== modified file 'account_hq_entries/wizard/hq_entries_unsplit.py'
--- account_hq_entries/wizard/hq_entries_unsplit.py	2013-11-22 13:55:21 +0000
+++ account_hq_entries/wizard/hq_entries_unsplit.py	2014-05-12 12:56:18 +0000
@@ -23,7 +23,6 @@
 
 from osv import osv
 from osv import fields
-from tools.translate import _
 
 class hq_entries_unsplit(osv.osv_memory):
     _name = 'hq.entries.unsplit'

=== modified file 'account_override/account_move_line.py'
--- account_override/account_move_line.py	2014-03-19 13:40:41 +0000
+++ account_override/account_move_line.py	2014-05-12 12:56:18 +0000
@@ -260,6 +260,7 @@
         ),
         'is_reconciled': fields.function(_get_is_reconciled, fnct_search=_search_is_reconciled, type='boolean', method=True, string="Is reconciled", help="Is that line partially/totally reconciled?"),
         'balance_currency': fields.function(_balance_currency, fnct_search=_balance_currency_search, method=True, string='Balance Booking'),
+        'corrected_upstream': fields.boolean('Corrected from CC/HQ', readonly=True, help='This line have been corrected from Coordo or HQ level to a cost center that have the same level or superior.'),
         'line_number': fields.integer(string='Line Number'),
         'invoice_partner_link': fields.many2one('account.invoice', string="Invoice partner link", readonly=True,
             help="This link implies this line come from the total of an invoice, directly from partner account.", ondelete="cascade"),
@@ -273,6 +274,7 @@
         'document_date': lambda self, cr, uid, c: c.get('document_date', False) or strftime('%Y-%m-%d'),
         'date': lambda self, cr, uid, c: c.get('date', False) or strftime('%Y-%m-%d'),
         'exported': lambda *a: False,
+        'corrected_upstream': lambda *a: False,
         'line_number': lambda *a: 0,
     }
 

=== modified file 'analytic_distribution/analytic_line.py'
--- analytic_distribution/analytic_line.py	2014-03-28 15:22:54 +0000
+++ analytic_distribution/analytic_line.py	2014-05-12 12:56:18 +0000
@@ -279,6 +279,8 @@
             else:
                 # Update account
                 self.write(cr, uid, [aline.id], {'account_id': account_id}, context=context)
+            # Set line as corrected upstream if we are in COORDO/HQ instance
+            self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [aline.move_id.id], context=context)
         return True
 
     def check_analytic_account(self, cr, uid, ids, account_id, context=None):

=== modified file 'analytic_distribution/wizard/mass_reallocation_wizard.py'
--- analytic_distribution/wizard/mass_reallocation_wizard.py	2014-01-13 14:57:01 +0000
+++ analytic_distribution/wizard/mass_reallocation_wizard.py	2014-05-12 12:56:18 +0000
@@ -120,11 +120,11 @@
     _columns = {
         'account_id': fields.many2one('account.analytic.account', string="Analytic Account", required=True),
         'date': fields.date('Posting date', required=True),
-        'line_ids': fields.many2many('account.analytic.line', 'mass_reallocation_rel', 'wizard_id', 'analytic_line_id', 
+        'line_ids': fields.many2many('account.analytic.line', 'mass_reallocation_rel', 'wizard_id', 'analytic_line_id',
             string="Analytic Journal Items", required=True),
         'state': fields.selection([('normal', 'Normal'), ('blocked', 'Blocked')], string="State", readonly=True),
         'display_fp': fields.boolean('Display FP'),
-        'other_ids': fields.many2many('account.analytic.line', 'mass_reallocation_other_rel', 'wizard_id', 'analytic_line_id', 
+        'other_ids': fields.many2many('account.analytic.line', 'mass_reallocation_other_rel', 'wizard_id', 'analytic_line_id',
             string="Non eligible analytic journal items", required=False, readonly=True),
     }
 
@@ -163,7 +163,7 @@
         if fields is None:
             fields = []
         # Some verifications
-        if not context:
+        if context is None:
             context = {}
         # Default behaviour
         res = super(mass_reallocation_wizard, self).default_get(cr, uid, fields, context=context)
@@ -173,7 +173,7 @@
             res['account_id'] =  context['analytic_account_from']
         if context.get('active_ids', False) and context.get('active_model', False) == 'account.analytic.line':
             res['line_ids'] = context.get('active_ids')
-            # Search which lines are eligible
+            # Search which lines are eligible (add another criteria if we come from project)
             search_args = [
                 ('id', 'in', context.get('active_ids')), '|', '|', '|', '|', '|', '|',
                 ('commitment_line_id', '!=', False), ('is_reallocated', '=', True),
@@ -183,6 +183,19 @@
                 ('move_state', '=', 'draft'),
                 ('account_id.category', 'in', ['FREE1', 'FREE2'])
             ]
+            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+            if company and company.instance_id and company.instance_id.level == 'project':
+                search_args = [
+                    ('id', 'in', context.get('active_ids')), '|', '|', '|', '|', '|', '|', '|',
+                    ('commitment_line_id', '!=', False), ('is_reallocated', '=', True),
+                    ('is_reversal', '=', True),
+                    ('journal_id.type', 'in', ['engagement', 'revaluation']),
+                    ('from_write_off', '=', True),
+                    ('move_state', '=', 'draft'),
+                    ('account_id.category', 'in', ['FREE1', 'FREE2']),
+                    ('move_id.corrected_upstream', '=', True)
+                ]
+
             search_ns_ids = self.pool.get('account.analytic.line').search(cr, uid, search_args, context=context)
             # Process lines if exist
             if search_ns_ids:
@@ -231,7 +244,7 @@
         Launch mass reallocation process
         """
         # Some verifications
-        if not context:
+        if context is None:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -241,6 +254,8 @@
         process_ids = []
         account_id = False
         date = False
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+        level = company and company.instance_id and company.instance_id.level or ''
         # Browse given wizard
         for wiz in self.browse(cr, uid, ids, context=context):
             to_process = [x.id for x in wiz.line_ids] or []
@@ -266,6 +281,17 @@
                 ('move_state', '=', 'draft'),
                 ('account_id.category', 'in', ['FREE1', 'FREE2'])
             ]
+            if level == 'project':
+                search_args = [
+                    ('id', 'in', context.get('active_ids')), '|', '|', '|', '|', '|', '|', '|',
+                    ('commitment_line_id', '!=', False), ('is_reallocated', '=', True),
+                    ('is_reversal', '=', True),
+                    ('journal_id.type', 'in', ['engagement', 'revaluation']),
+                    ('from_write_off', '=', True),
+                    ('move_state', '=', 'draft'),
+                    ('account_id.category', 'in', ['FREE1', 'FREE2']),
+                    ('move_id.corrected_upstream', '=', True)
+                ]
             search_ns_ids = self.pool.get('account.analytic.line').search(cr, uid, search_args)
             if search_ns_ids:
                 non_supported_ids.extend(search_ns_ids)