Merge lp:~julie-w/unifield-server/US-5376 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_corrections/wizard/journal_items_corrections.py'
--- bin/addons/account_corrections/wizard/journal_items_corrections.py	2018-10-11 10:21:46 +0000
+++ bin/addons/account_corrections/wizard/journal_items_corrections.py	2019-01-31 13:38:39 +0000
@@ -462,12 +462,38 @@
         :param account: new account selected in the Correction Wizard
         :param aml: Journal Item with the Third Party to check
         """
+        if context is None:
+            context = {}
         acc_obj = self.pool.get('account.account')
+        employee_obj = self.pool.get('hr.employee')
+        partner_obj = self.pool.get('res.partner')
+        journal_obj = self.pool.get('account.journal')
         acc_type = account.type_for_register
         if acc_type != 'none':
+            # get the right Third Party to check if there is a partner_txt ONLY (e.g.: correction made on HQ entry)
+            partner_txt = aml.partner_txt
+            partner_id = aml.partner_id and aml.partner_id.id or False
+            employee_id = aml.employee_id and aml.employee_id.id or False
+            partner_journal = aml.transfer_journal_id
+            if partner_txt and not partner_id and not employee_id and not partner_journal:
+                employee_ids = employee_obj.search(cr, uid, [('name', '=', partner_txt)], limit=1, context=context)
+                if employee_ids:
+                    employee_id = employee_ids[0]
+                else:
+                    partner_ids = partner_obj.search(cr, uid, [('name', '=', partner_txt), ('active', 'in', ['t', 'f'])],
+                                                     limit=1, context=context)
+                    if partner_ids:
+                        partner_id = partner_ids[0]
+                    else:
+                        journal_ids = journal_obj.search(cr, uid, [('code', '=', partner_txt)], limit=1, context=context)
+                        if journal_ids:
+                            partner_journal = journal_obj.browse(cr, uid, journal_ids[0], context=context)
+                # if there is a partner_txt but no related Third Party found:
+                # ignore the check if "ignore_non_existing_tp" is in context (e.g. when validating HQ entries)
+                if not partner_id and not employee_id and not partner_journal and context.get('ignore_non_existing_tp', False):
+                    return True
             # Check the compatibility with the "Type For Specific Treatment" of the account
             if acc_type in ['transfer', 'transfer_same']:
-                partner_journal = aml.transfer_journal_id
                 is_liquidity = partner_journal and partner_journal.type in ['cash', 'bank', 'cheque'] and partner_journal.currency
                 if acc_type == 'transfer_same' and (not is_liquidity or partner_journal.currency.id != aml.currency_id.id):
                     raise osv.except_osv(_('Warning'),
@@ -477,13 +503,13 @@
                     raise osv.except_osv(_('Warning'),
                                          _('The account "%s - %s" is only compatible with a Liquidity Journal Third Party\n'
                                            'having a currency different from the booking one.') % (account.code, account.name))
-            elif acc_type == 'advance' and not aml.employee_id:
+            elif acc_type == 'advance' and not employee_id:
                 raise osv.except_osv(_('Warning'), _('The account "%s - %s" is only compatible '
                                                      'with an Employee Third Party.') % (account.code, account.name))
-            elif acc_type == 'down_payment' and not aml.partner_id:
+            elif acc_type == 'down_payment' and not partner_id:
                 raise osv.except_osv(_('Warning'), _('The account "%s - %s" is only compatible '
                                                      'with a Partner Third Party.') % (account.code, account.name))
-            elif acc_type == 'payroll' and not aml.partner_id and not aml.employee_id:
+            elif acc_type == 'payroll' and not partner_id and not employee_id:
                 raise osv.except_osv(_('Warning'), _('The account "%s - %s" is only compatible '
                                                      'with a Partner or an Employee Third Party.') % (account.code, account.name))
         else:
@@ -492,6 +518,7 @@
             acc_obj.is_allowed_for_thirdparty(cr, uid, [account.id], partner_type=aml.partner_type or False, partner_txt=aml.partner_txt or False,
                                               employee_id=aml.employee_id or False, transfer_journal_id=aml.transfer_journal_id or False,
                                               partner_id=aml.partner_id or False, raise_it=True, context=context)
+        return True
 
     def correct_manually(self, cr, uid, ids, context=None):
         """

=== modified file 'bin/addons/account_hq_entries/account_view.xml'
--- bin/addons/account_hq_entries/account_view.xml	2018-08-17 08:28:25 +0000
+++ bin/addons/account_hq_entries/account_view.xml	2019-01-31 13:38:39 +0000
@@ -9,20 +9,36 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="HQ Entries List" editable="top" noteditable="user_validated==True or is_original==True" hide_new_button="1" colors="black: analytic_state=='valid' and is_split==True;blue:analytic_state in ('valid') and is_original==False and is_split==False;gray:is_original==True;red:analytic_state in ('invalid')" limit="50">
+                    <field name="current_instance_level" invisible="1"/>
+                    <field name="account_user_type_code" invisible="1"/>
                     <field name="name"/>
-                    <field name="ref"/>
+                    <field name="ref" attrs="{'readonly': ['|', ('current_instance_level', '=', 'section'), ('account_user_type_code', 'not in', ['expense', 'income'])]}"/>
                     <field name="document_date"/>
                     <field name="date"/>
                     <field name="period_id"/>
-                    <field name="account_id" domain="[('type', '!=', 'view'), ('restricted_area', '=', 'hq_lines'), ('is_not_hq_correctible', '=', False), ('filter_active', '=', True)]" context="{'date': date}"/>
+                    <field name="account_id"
+                           domain="[('restricted_area', '=', 'hq_lines_correction'), ('filter_active', '=', True)]"
+                           context="{'date': date}"
+                           attrs="{'readonly': ['|', ('current_instance_level', '=', 'section'), ('account_user_type_code', 'not in', ['expense', 'income'])]}"/>
                     <field name="partner_txt"/>
                     <field name="amount"/>
                     <field name="currency_id"/>
-                    <field name="destination_id" on_change="onchange_destination(destination_id, analytic_id, account_id)" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': date}"/>
-                    <field name="cost_center_id" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': date}"/>
-                    <field name="analytic_id" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': document_date}"/>
-                    <field name="free_1_id" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': date}"/>
-                    <field name="free_2_id" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': date}"/>
+                    <field name="destination_id"
+                           on_change="onchange_destination(destination_id, analytic_id, account_id)"
+                           context="{'search_default_active': 1, 'hide_inactive': 1, 'date': date}"
+                           attrs="{'readonly': ['|', ('current_instance_level', '=', 'section'), ('account_user_type_code', 'not in', ['expense', 'income'])]}"/>
+                    <field name="cost_center_id"
+                           context="{'search_default_active': 1, 'hide_inactive': 1, 'date': date}"
+                           attrs="{'readonly': ['|', ('current_instance_level', '=', 'section'), ('account_user_type_code', 'not in', ['expense', 'income'])]}"/>
+                    <field name="analytic_id"
+                           context="{'search_default_active': 1, 'hide_inactive': 1, 'date': document_date}"
+                           attrs="{'readonly': ['|', ('current_instance_level', '=', 'section'), ('account_user_type_code', 'not in', ['expense', 'income'])]}"/>
+                    <field name="free_1_id"
+                           context="{'search_default_active': 1, 'hide_inactive': 1, 'date': date}"
+                           attrs="{'readonly': ['|', ('current_instance_level', '=', 'section'), ('account_user_type_code', 'not in', ['expense', 'income'])]}"/>
+                    <field name="free_2_id"
+                           context="{'search_default_active': 1, 'hide_inactive': 1, 'date': date}"
+                           attrs="{'readonly': ['|', ('current_instance_level', '=', 'section'), ('account_user_type_code', 'not in', ['expense', 'income'])]}"/>
                     <field name="user_validated" invisible="1"/>
                     <field name="analytic_state" invisible="1"/>
                     <field name="is_original" invisible="1"/>

=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2018-08-17 10:08:35 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2019-01-31 13:38:39 +0000
@@ -67,8 +67,8 @@
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = 'valid' # by default
             #### SOME CASE WHERE DISTRO IS OK
-            # if account is not expense, so it's valid
-            if line.account_id and line.account_id.user_type_code and line.account_id.user_type_code != 'expense':
+            # if it's neither an expense nor an income account, the AD is valid
+            if line.account_id and line.account_id.user_type_code not in ['expense', 'income']:
                 continue
             # Date checks
             # F Check
@@ -176,18 +176,45 @@
         account_obj = self.pool.get('account.account')
 
         for r in self.browse(cr, uid, ids, context=context):
-            res[r.id] = True
+            is_compatible = True
             if r.account_id:
-                res[r.id] = account_obj.is_allowed_for_thirdparty(cr, uid,
-                                                                  r.account_id.id, partner_txt=r.partner_txt or False,
-                                                                  context=context)[r.account_id.id]
+                # check the Allowed Partner Types
+                is_compatible = account_obj.is_allowed_for_thirdparty(cr, uid, r.account_id.id,
+                                                                      partner_txt=r.partner_txt or False,
+                                                                      context=context)[r.account_id.id]
+                # if the partner type compatibility is OK: also check the "Type for specific treatment"
+                if is_compatible:
+                    # will raise an error if the Third Party exists in Unifield, and isn't compatible with the account
+                    context.update({'ignore_non_existing_tp': True})
+                    account_obj.check_type_for_specific_treatment(cr, uid, r.account_id.id,
+                                                                  partner_txt=r.partner_txt or False,
+                                                                  currency_id=r.currency_id.id,
+                                                                  context=context)
+
+            res[r.id] = is_compatible
         return res
 
+    def _get_current_instance_level(self, cr, uid, ids, name, args, context=None):
+        """
+        Returns a String with the level of the current instance (section, coordo, project)
+        """
+        if context is None:
+            context = {}
+        levels = {}
+        user_obj = self.pool.get('res.users')
+        company = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id'], context=context).company_id
+        level = company.instance_id and company.instance_id.level or ''
+        for hq_entry_id in ids:
+            levels[hq_entry_id] = level
+        return levels
+
     _columns = {
         'account_id': fields.many2one('account.account', "Account", required=True),
-        'destination_id': fields.many2one('account.analytic.account', string="Destination", required=True, domain="[('category', '=', 'DEST'), ('type', '!=', 'view'), ('state', '=', 'open')]"),
+        'account_user_type_code': fields.related('account_id', 'user_type_code', string="Account Type",
+                                                 type='char', size=32, readonly=True, store=False),
+        'destination_id': fields.many2one('account.analytic.account', string="Destination", domain="[('category', '=', 'DEST'), ('type', '!=', 'view'), ('state', '=', 'open')]"),
         'cost_center_id': fields.many2one('account.analytic.account', "Cost Center", required=False, domain="[('category','=','OC'), ('type', '!=', 'view'), ('state', '=', 'open')]"),
-        'analytic_id': fields.many2one('account.analytic.account', "Funding Pool", required=True, domain="[('category', '=', 'FUNDING'), ('type', '!=', 'view'), ('state', '=', 'open')]"),
+        'analytic_id': fields.many2one('account.analytic.account', "Funding Pool", domain="[('category', '=', 'FUNDING'), ('type', '!=', 'view'), ('state', '=', 'open')]"),
         'free_1_id': fields.many2one('account.analytic.account', "Free 1", domain="[('category', '=', 'FREE1'), ('type', '!=', 'view'), ('state', '=', 'open')]"),
         'free_2_id': fields.many2one('account.analytic.account', "Free 2", domain="[('category', '=', 'FREE2'), ('type', '!=', 'view'), ('state', '=', 'open')]"),
         'user_validated': fields.boolean("User validated?", help="Is this line validated by a user in a OpenERP field instance?", readonly=True),
@@ -201,8 +228,8 @@
         'amount': fields.float('Amount', readonly=True),
         'account_id_first_value': fields.many2one('account.account', "Account @import", required=True, readonly=True),
         'cost_center_id_first_value': fields.many2one('account.analytic.account', "Cost Center @import", required=False, readonly=False),
-        'analytic_id_first_value': fields.many2one('account.analytic.account', "Funding Pool @import", required=True, readonly=True),
-        'destination_id_first_value': fields.many2one('account.analytic.account', "Destination @import", required=True, readonly=True),
+        'analytic_id_first_value': fields.many2one('account.analytic.account', "Funding Pool @import", readonly=True),
+        'destination_id_first_value': fields.many2one('account.analytic.account', "Destination @import", readonly=True),
         'analytic_state': fields.function(_get_analytic_state, type='selection', method=True, readonly=True, string="Distribution State",
                                           selection=[('none', 'None'), ('valid', 'Valid'), ('invalid', 'Invalid')], help="Give analytic distribution state"),
         'is_original': fields.boolean("Is Original HQ Entry?", help="This line was split into other one.", readonly=True),
@@ -212,6 +239,8 @@
         'cc_changed': fields.function(_get_cc_changed, method=True, type='boolean', string='Have Cost Center changed?', help="When you change the cost center from the initial value (from a HQ Entry or a Split line), so the Cost Center changed is True."),
         'account_changed': fields.function(_get_account_changed, method=True, type='boolean', string='Have account changed?', help="When your entry have a different account from the initial one or from the original one."),
         'is_account_partner_compatible': fields.function(_get_is_account_partner_compatible, method=True, type='boolean', string='Account and partner compatible ?'),
+        'current_instance_level': fields.function(_get_current_instance_level, method=True, type='char',
+                                                  string='Current Instance Level', store=False, readonly=True),
     }
 
     _defaults = {
@@ -565,8 +594,9 @@
         # US-306: forbid to validate mission closed or + entries
         # => at coordo level you can not validate entries since field closed
         # period; but they can come from HQ mission opened via SYNC)
+        hq_entries = self.browse(cr, uid, ids, context=context)
         period_ids = list(set([ he.period_id.id \
-                                for he in self.browse(cr, uid, ids, context=context) ]))
+                                for he in hq_entries ]))
         # warning if an HQ Entry is in a non-opened period
         if period_ids:
             periods = self.pool.get("account.period").browse(cr, uid, period_ids, context)
@@ -578,6 +608,13 @@
                 elif p.number == 12 and not self._is_dec_period_open(cr, uid, context):
                     raise mission_closed_except
 
+        # block edition and split on B/S entries
+        if wizard_model in ['hq.entries.split', 'hq.analytic.reallocation', 'hq.reallocation']:
+            for hq_entry in hq_entries:
+                if hq_entry.account_id.user_type_code not in ['expense', 'income']:
+                    raise osv.except_osv(_("Warning"),
+                                         _("You can not perform this action on a B/S line."))
+
     def check_ad_change_allowed(self, cr, uid, ids, vals, context=None):
         """
         Raises a warning if the HQ entry Analytic Distribution is about to be modified although the general account is

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_import.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_import.py	2018-08-17 08:28:25 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_import.py	2019-01-31 13:38:39 +0000
@@ -105,7 +105,7 @@
             account_code = account_data and account_data[0] or False
             if not account_code:
                 raise osv.except_osv(_('Error'), _('No account code found!'))
-            account_ids = acc_obj.search(cr, uid, [('code', '=', account_code)] + ACCOUNT_RESTRICTED_AREA['hq_lines'])
+            account_ids = acc_obj.search(cr, uid, [('code', '=', account_code)] + ACCOUNT_RESTRICTED_AREA['hq_lines_import'])
             if not account_ids:
                 raise osv.except_osv(_('Error'), _('Account code %s doesn\'t exist or is not allowed in HQ Entries!') % (account_code,))
 
@@ -115,14 +115,24 @@
             vals.update({'account_id': account_ids[0], 'account_id_first_value': account_ids[0]})
         else:
             raise osv.except_osv(_('Error'), _('No account code found!'))
-        # Retrieve Destination
         aa_check_ids = []
         destination_id = False
+        fp_id = False
+        free1_id = False
+        free2_id = False
         account = acc_obj.browse(cr, uid, account_ids[0])
-        if account.user_type.code == 'expense':
+        if not cost_center:
+            # CC is needed for synchro (and usually it can't be added after the import in HQ because of the user rights)
+            raise osv.except_osv(_('Error'), _('Cost Center is missing for the account %s.') % (account_description,))
+        if account.user_type.code not in ['expense', 'income']:  # B/S accounts
+            if destination or funding_pool or free1 or free2:
+                raise osv.except_osv(_('Error'), _('The B/S account %s cannot have an Analytic Distribution. '
+                                                   'Only a Cost Center should be given.') % (account_description,))
+        else:  # expense or income accounts
+            # Retrieve Destination
             # Set default destination
             if not account.default_destination_id:
-                raise osv.except_osv(_('Warning'), _('No default Destination defined for expense account: %s') % (account.code or '',))
+                raise osv.except_osv(_('Warning'), _('No default Destination defined for account: %s') % (account.code or '',))
             destination_id = account.default_destination_id and account.default_destination_id.id or False
             # But use those from CSV file if given
             if destination:
@@ -133,7 +143,34 @@
                     raise osv.except_osv(_('Error'), _('Destination "%s" doesn\'t exist!') % (destination,))
             if destination_id:
                 aa_check_ids.append(destination_id)
-        # Retrieve Cost Center and Funding Pool
+            # Retrieve Funding Pool
+            if funding_pool:
+                fp_id = anacc_obj.search(cr, uid, ['|', ('code', '=', funding_pool), ('name', '=', funding_pool), ('category', '=', 'FUNDING')])
+                if not fp_id:
+                    raise osv.except_osv(_('Error'), _('Funding Pool "%s" doesn\'t exist!') % (funding_pool,))
+                fp_id = fp_id[0]
+            else:
+                try:
+                    fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
+                except ValueError:
+                    fp_id = 0
+            if fp_id:
+                aa_check_ids.append(fp_id)
+            # Retrieve Free 1 / Free 2
+            if free1:
+                free1_id = anacc_obj.search(cr, uid, ['|', ('code', '=', free1), ('name', '=', free1), ('category', '=', 'FREE1')])
+                if not free1_id:
+                    raise osv.except_osv(_('Error'), _('Free 1 "%s" doesn\'t exist!') % (free1,))
+                free1_id = free1_id[0]
+                aa_check_ids.append(free1_id)
+            if free2:
+                free2_id = anacc_obj.search(cr, uid, ['|', ('code', '=', free2), ('name', '=', free2), ('category', '=', 'FREE2')])
+                if not free2_id:
+                    raise osv.except_osv(_('Error'), _('Free 2 "%s" doesn\'t exist!') % (free2,))
+                free2_id = free2_id[0]
+                aa_check_ids.append(free2_id)
+
+        # Retrieve Cost Center
         cc_id = False
         if cost_center:
             cc_id = anacc_obj.search(cr, uid, ['|', ('code', '=', cost_center), ('name', '=', cost_center), ('category', '=', 'OC')])
@@ -142,35 +179,7 @@
             cc_id = cc_id[0]
             if cc_id:
                 aa_check_ids.append(cc_id)
-        # Retrieve Funding Pool
-        if funding_pool:
-            fp_id = anacc_obj.search(cr, uid, ['|', ('code', '=', funding_pool), ('name', '=', funding_pool), ('category', '=', 'FUNDING')])
-            if not fp_id:
-                raise osv.except_osv(_('Error'), _('Funding Pool "%s" doesn\'t exist!') % (funding_pool,))
-            fp_id = fp_id[0]
-        else:
-            try:
-                fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
-            except ValueError:
-                fp_id = 0
-        if fp_id:
-            aa_check_ids.append(fp_id)
 
-        # Retrive Free 1 / Free 2
-        free1_id = False
-        free2_id = False
-        if free1:
-            free1_id = anacc_obj.search(cr, uid, ['|', ('code', '=', free1), ('name', '=', free1), ('category', '=', 'FREE1')])
-            if not free1_id:
-                raise osv.except_osv(_('Error'), _('Free 1 "%s" doesn\'t exist!') % (free1,))
-            free1_id = free1_id[0]
-            aa_check_ids.append(free1_id)
-        if free2:
-            free2_id = anacc_obj.search(cr, uid, ['|', ('code', '=', free2), ('name', '=', free2), ('category', '=', 'FREE2')])
-            if not free2_id:
-                raise osv.except_osv(_('Error'), _('Free 2 "%s" doesn\'t exist!') % (free2,))
-            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
@@ -187,12 +196,13 @@
         if aa_check_ids:
             for aa_r in anacc_obj.read(cr, uid, aa_check_ids,
                                        ['code', 'name', 'type', 'category']):
-                if aa_r['type'] and aa_r['type'] == 'view':
+                if aa_r['type'] and aa_r['type'] == 'view' and account.user_type_code in ['expense', 'income']:
                     category = ''
                     if aa_r['category']:
                         if aa_r['category'] in aa_check_category_map:
                             category += aa_check_category_map[aa_r['category']] + ' '
-                    aa_check_errors.append('%s"%s - %s" of type "view" is not allowed for import' % (category, aa_r['code'], aa_r['name']))
+                    aa_check_errors.append(_('%s "%s - %s" of type "view" is not allowed '
+                                           'for the account "%s - %s"') % (category, aa_r['code'], aa_r['name'], account.code, account.name))
         if aa_check_errors:
             raise osv.except_osv(_('Error'), ", ".join(aa_check_errors))
 

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_validation.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2018-05-28 10:19:58 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2019-01-31 13:38:39 +0000
@@ -176,9 +176,12 @@
             for line in hqentries_obj.browse(cr, uid, ids, context=context):
                 if not line.account_id_first_value:
                     raise osv.except_osv(_('Error'), _('An account is missing!'))
-                # create new distribution (only for expense accounts)
+                # create new distribution (only for expense or income accounts)
                 line_account = split and line.account_id or line.account_id_first_value
-                distrib_id = self.create_distribution_id(cr, uid, currency_id, line, line_account, split=split)
+                if line_account.user_type_code in ['income', 'expense']:
+                    distrib_id = self.create_distribution_id(cr, uid, currency_id, line, line_account, split=split)
+                else:
+                    distrib_id = False
                 vals = {
                     'account_id': line_account.id,
                     'period_id': period_id,
@@ -316,7 +319,7 @@
             # Create also the AD from the original line and update it into the counterpart move
             if not line.account_id_first_value:
                 raise osv.except_osv(_('Error'), _('An account is missing!'))
-            # create new distribution (only for expense accounts)
+            # create new distribution
             distrib_id = self.create_distribution_id(cr, uid, line.currency_id.id, line, line.account_id_first_value)
             aml_obj.write(cr, uid, counterpart_id, {
                 'reversal': True,
@@ -460,6 +463,22 @@
                     elif line.cost_center_id.id != line.cost_center_id_first_value.id or line.destination_id.id != line.destination_id_first_value.id:
                         if line.cost_center_id_first_value and line.cost_center_id_first_value.id:
                             cc_change.append(line)
+                    if line in account_change or line in cc_account_change:
+                        # non-correctable accounts should neither be corrected nor used in the correction lines
+                        non_correctable_account = (line.account_id_first_value.is_not_hq_correctible and line.account_id_first_value) or \
+                                                  (line.account_id.is_not_hq_correctible and line.account_id) or False
+                        if non_correctable_account:
+                            raise osv.except_osv(_('Warning'), _('The account %s - %s should neither be corrected nor be used in '
+                                                                 'correction lines.') % (non_correctable_account.code,
+                                                                                         non_correctable_account.name))
+                    if line in cc_change or line in cc_account_change:
+                        # accounts "non correctable on AD" should neither be corrected on AD nor used in the AD corr. lines
+                        ad_non_correctable_account = (line.account_id_first_value.is_not_ad_correctable and line.account_id_first_value) or \
+                                                     (line.account_id.is_not_ad_correctable and line.account_id) or False
+                        if ad_non_correctable_account:
+                            raise osv.except_osv(_('Warning'), _('The account %s - %s should not be used in '
+                                                                 'AD corrections.') % (ad_non_correctable_account.code,
+                                                                                       ad_non_correctable_account.name))
             all_lines = {}
             for currency in to_write:
                 for period in to_write[currency]:

=== modified file 'bin/addons/account_hq_entries/wizard/hq_reallocation.py'
--- bin/addons/account_hq_entries/wizard/hq_reallocation.py	2015-05-27 15:54:46 +0000
+++ bin/addons/account_hq_entries/wizard/hq_reallocation.py	2019-01-31 13:38:39 +0000
@@ -138,7 +138,8 @@
     _description = 'HQ reallocation wizard'
 
     _columns = {
-        'account_id': fields.many2one('account.account', string="Account", required=True, domain="[('type', '!=', 'view'), ('user_type.code', '=', 'expense')]"),
+        'account_id': fields.many2one('account.account', string="Account", required=True,
+                                      domain="[('restricted_area', '=', 'hq_lines_correction')]"),
     }
 
     def default_get(self, cr, uid, fields, context=None):

=== modified file 'bin/addons/account_hq_entries/wizard/wizard_view.xml'
--- bin/addons/account_hq_entries/wizard/wizard_view.xml	2018-08-17 08:28:25 +0000
+++ bin/addons/account_hq_entries/wizard/wizard_view.xml	2019-01-31 13:38:39 +0000
@@ -45,7 +45,8 @@
                             <field name="account_hq_correctible" invisible="1"/>
                             <field name="is_not_ad_correctable" invisible="1"/>
                             <field name="account_id" attrs="{'readonly': [('account_hq_correctible', '=', True)]}"
-                                   domain="[('type', '!=', 'view'), ('restricted_area', '=', 'hq_lines'), ('is_not_hq_correctible', '=', False), ('filter_active', '=', True)]" />
+                                   domain="[('restricted_area', '=', 'hq_lines_correction'), ('filter_active', '=', True)]"
+                            />
                             <field name="amount"/>
                             <field name="destination_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/>
                             <field name="cost_center_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/>

=== modified file 'bin/addons/account_override/__init__.py'
--- bin/addons/account_override/__init__.py	2018-08-27 14:53:15 +0000
+++ bin/addons/account_override/__init__.py	2019-01-31 13:38:39 +0000
@@ -138,12 +138,23 @@
         ('accrual_account', '=', True),
     ],
     # HQ ENTRIES
-    'hq_lines': [
+    # /!\ The accounts allowed at import are different from the ones allowed for correction
+    'hq_lines_import': [
         ('type', '!=', 'view'),
-        ('user_type_code', '=', 'expense'),
-        '|', ('user_type_code', '!=', 'expense'), ('user_type.report_type', '!=', 'none'), # Exclude non-extra accounting expense accounts
+        '|', ('user_type_code', '!=', 'expense'), ('user_type.report_type', '!=', 'none'),  # Exclude extra-accounting expense accounts
+        ('type_for_register', '!=', 'donation'),
         #('is_not_hq_correctible', '=', False), # UF-2312: not possibleto add this domain because WE SHOULD ALLOW "Not HQ Correctible" account during the import
     ],
+    'hq_lines_correction': [
+        ('type', '!=', 'view'),
+        ('type_for_register', '!=', 'donation'),
+        ('is_not_hq_correctible', '=', False),
+        '|',
+        ('user_type.code', '=', 'income'),
+        '&', ('user_type.code', '=', 'expense'), ('user_type.report_type', '!=', 'none'),  # Exclude extra-accounting expense accounts
+        # note : filter_active isn't set to True here as that would prevent to "Change Account" to an account
+        # currently inactive but active at the date of the entry
+    ],
     # MANUEL JOURNAL ENTRIES
     'account_move_lines': [
         ('type', 'not in', ['view', 'consolidation', 'closed']),

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2019-01-10 10:47:12 +0000
+++ bin/addons/account_override/account.py	2019-01-31 13:38:39 +0000
@@ -576,6 +576,7 @@
                 # existing partner
                 emp_obj = self.pool.get('hr.employee')
                 partner_obj = self.pool.get('res.partner')
+                journal_obj = self.pool.get('account.journal')
                 if partner_type:
                     pt_model, pt_id = tuple(partner_type.split(',')) if from_vals \
                         else (partner_type._name, partner_type.id, )
@@ -589,15 +590,18 @@
                     elif pt_model == 'res.partner':
                         partner_id = pt_id
                 elif partner_txt:
-                    employee_ids = emp_obj.search(cr, uid, [('name', '=', partner_txt)],
-                                                  order='NO_ORDER', limit=1, context=context)
+                    employee_ids = emp_obj.search(cr, uid, [('name', '=', partner_txt)], limit=1, context=context)
                     if employee_ids:
                         employee_id = employee_ids[0]
                     else:
-                        partner_ids = partner_obj.search(cr, uid, [('name', '=', partner_txt)],
-                                                         order='NO_ORDER', limit=1, context=context)
+                        partner_ids = partner_obj.search(cr, uid, [('name', '=', partner_txt), ('active', 'in', ['t', 'f'])],
+                                                         limit=1, context=context)
                         if partner_ids:
                             partner_id = partner_ids[0]
+                        else:
+                            transfer_journal_ids = journal_obj.search(cr, uid, [('code', '=', partner_txt)], limit=1, context=context)
+                            if transfer_journal_ids:
+                                transfer_journal_id = transfer_journal_ids[0]
                 if employee_id:
                     tp_rec = emp_obj.browse(cr, uid, employee_id, fields_to_fetch=['employee_type'], context=context)
                     # note: allowed for employees with no type
@@ -632,24 +636,55 @@
             raise osv.except_osv(_('Error'), error_msg)
 
     def check_type_for_specific_treatment(self, cr, uid, account_ids, partner_id=False, employee_id=False,
-                                          journal_id=False, context=None):
+                                          journal_id=False, partner_txt=False, currency_id=False, context=None):
         """
         Checks if the Third parties and accounts in parameter are compatible regarding the "Type for specific treatment"
-        of the accounts (raises an error if not)
+        of the accounts (raises an error if not).
+        Note that the currency_id is the one of the entry to be checked and is used ONLY for the checks on
+        transfer journals (if a currency is given).
         """
         if isinstance(account_ids, (int, long)):
             account_ids = [account_ids]
         if context is None:
             context = {}
         acc_obj = self.pool.get('account.account')
+        employee_obj = self.pool.get('hr.employee')
+        partner_obj = self.pool.get('res.partner')
+        journal_obj = self.pool.get('account.journal')
         not_compatible_ids = []
         for acc_id in acc_obj.browse(cr, uid, account_ids, fields_to_fetch=['type_for_register'], context=context):
+            # get the right Third Party if a partner_txt only has been given
+            if partner_txt and not partner_id and not employee_id and not journal_id:
+                employee_ids = employee_obj.search(cr, uid, [('name', '=', partner_txt)], limit=1, context=context)
+                if employee_ids:
+                    employee_id = employee_ids[0]
+                else:
+                    partner_ids = partner_obj.search(cr, uid, [('name', '=', partner_txt), ('active', 'in', ['t', 'f'])],
+                                                     limit=1, context=context)
+                    if partner_ids:
+                        partner_id = partner_ids[0]
+                    else:
+                        journal_ids = journal_obj.search(cr, uid, [('code', '=', partner_txt)], limit=1, context=context)
+                        if journal_ids:
+                            journal_id = journal_ids[0]
+                # if there is a partner_txt but no related Third Party found:
+                # ignore the check if "ignore_non_existing_tp" is in context (e.g. when validating HQ entries)
+                if not partner_id and not employee_id and not journal_id and context.get('ignore_non_existing_tp', False):
+                    continue
             acc_type = acc_id.type_for_register
-            transfer_not_ok = acc_type in ['transfer', 'transfer_same'] and (not journal_id or partner_id or employee_id)
             advance_not_ok = acc_type == 'advance' and (not employee_id or journal_id or partner_id)
             dp_not_ok = acc_type == 'down_payment' and (not partner_id or journal_id or employee_id)
             payroll_not_ok = acc_type == 'payroll' and ((not partner_id and not employee_id) or journal_id)
-            if transfer_not_ok or advance_not_ok or dp_not_ok or payroll_not_ok:
+            transfer_not_ok = acc_type in ['transfer', 'transfer_same'] and (not journal_id or partner_id or employee_id)
+            if currency_id and journal_id and not transfer_not_ok:
+                # check the journal type and currency
+                journal = journal_obj.browse(cr, uid, journal_id, fields_to_fetch=['type', 'currency'], context=context)
+                is_liquidity = journal and journal.type in ['cash', 'bank', 'cheque'] and journal.currency
+                if acc_type == 'transfer_same' and (not is_liquidity or journal.currency.id != currency_id):
+                    transfer_not_ok = True
+                elif acc_type == 'transfer' and (not is_liquidity or journal.currency.id == currency_id):
+                    transfer_not_ok = True
+            if advance_not_ok or dp_not_ok or payroll_not_ok or transfer_not_ok:
                 not_compatible_ids.append(acc_id.id)
         if not_compatible_ids:
             self._display_account_partner_compatibility_error(cr, uid, not_compatible_ids, context, type_for_specific_treatment=True)
@@ -686,7 +721,7 @@
                 allowed_partner_field = self._get_allowed_partner_field(cr, uid, partner_type, partner_txt, employee_id,
                                                                         transfer_journal_id, partner_id, from_vals, context)
                 if not allowed_partner_field:
-                    res[r.id] = True  # allowed with no specific field
+                    res[r.id] = True  # allowed with no specific field (e.g. don't block validation of HQ entries with non-existing 3d Party)
                 else:
                     res[r.id] = hasattr(r, allowed_partner_field) and getattr(r, allowed_partner_field) or False
         # once the checks are done, remove allowed_partner_field from context so as not to reuse it for another record

=== modified file 'bin/addons/finance/cash_request_view.xml'
--- bin/addons/finance/cash_request_view.xml	2018-10-04 13:56:00 +0000
+++ bin/addons/finance/cash_request_view.xml	2019-01-31 13:38:39 +0000
@@ -28,13 +28,13 @@
                                     <field name="current_instance_level" invisible="1"/>
                                     <field name="name"/>
                                     <field name="state"/>
-                                    <field name="request_date" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '==', 'project')]}"/>
-                                    <field name="month_period_id" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '==', 'project')]}"/>
+                                    <field name="request_date" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '=', 'project')]}"/>
+                                    <field name="month_period_id" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '=', 'project')]}"/>
                                     <field name="mission"/>
                                     <field name="prop_instance_id"/>
-                                    <field name="transfer_account_id" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '==', 'project')]}"/>
-                                    <field name="bank_journal_id" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '==', 'project')]}"/>
-                                    <field name="transfer_currency_ids" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '==', 'project')]}">
+                                    <field name="transfer_account_id" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '=', 'project')]}"/>
+                                    <field name="bank_journal_id" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '=', 'project')]}"/>
+                                    <field name="transfer_currency_ids" attrs="{'readonly': ['|', ('state', '=', 'done'), ('current_instance_level', '=', 'project')]}">
                                         <tree string="Currencies" editable="bottom">
                                             <field name="currency_id"/>
                                             <field name="percentage"/>
@@ -51,7 +51,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group colspan="4" col="4" attrs="{'invisible': [('current_instance_level', '==', 'project')]}">
+                                <group colspan="4" col="4" attrs="{'invisible': [('current_instance_level', '=', 'project')]}">
                                     <separator colspan="4" string="Recap"/>
                                     <button name="compute_recap_and_total" type="object"
                                             string="Compute recap lines &amp; total to transfer" icon="gtk-refresh"
@@ -92,7 +92,7 @@
                                 </group>
                             </page>
                             <!-- BANKING TAB -->
-                            <page string="Banking" attrs="{'invisible': [('current_instance_level', '==', 'project')]}">
+                            <page string="Banking" attrs="{'invisible': [('current_instance_level', '=', 'project')]}">
                                 <separator colspan="4" string="Banking references"/>
                                 <field name="journal_name"/>
                                 <field name="journal_code"/>
@@ -102,7 +102,7 @@
                                 <field name="bank_address"/>
                             </page>
                             <!-- LIQUIDITY POSITION TAB -->
-                            <page string="Liquidity Position" attrs="{'invisible': [('current_instance_level', '==', 'project')]}">
+                            <page string="Liquidity Position" attrs="{'invisible': [('current_instance_level', '=', 'project')]}">
                                 <!-- CASH -->
                                 <group colspan="4" col="2">
                                     <button name="display_details_cash" type="object" colspan="1"
@@ -182,7 +182,7 @@
                                 </group>
                             </page>
                             <!-- PAYABLES TAB -->
-                            <page string="Payables" attrs="{'invisible': [('current_instance_level', '==', 'project')]}">
+                            <page string="Payables" attrs="{'invisible': [('current_instance_level', '=', 'project')]}">
                                 <field name="payable_ids" nolabel="1">
                                     <tree string="Payables">
                                         <field name="instance_id"/>
@@ -193,7 +193,7 @@
                                 </field>
                             </page>
                             <!-- COMMITMENT TAB -->
-                            <page string="Commitment" attrs="{'invisible': [('current_instance_level', '==', 'project')]}">
+                            <page string="Commitment" attrs="{'invisible': [('current_instance_level', '=', 'project')]}">
                                 <separator colspan="4" string="Commitment"/>
                                 <field name="commitment_ids" nolabel="1">
                                     <tree string="Engagement Entries in func. currency">
@@ -206,7 +206,7 @@
                             <!-- PLANNED EXPENSE TAB -->
                             <page string="Planned Expense">
                                 <separator colspan="4" string="Planned expense for the coming period"/>
-                                <group colspan="4" col="2" attrs="{'invisible': [('current_instance_level', '==', 'project')]}">
+                                <group colspan="4" col="2" attrs="{'invisible': [('current_instance_level', '=', 'project')]}">
                                     <field name="recap_expense_ids" nolabel="1">
                                         <tree string="Recap Planned Expenses in func. currency">
                                             <field name="instance_id"/>
@@ -238,7 +238,7 @@
                                 </group>
                             </page>
                             <!-- TRANSFERS FOLLOW-UP TAB -->
-                            <page string="Transfers Follow-up" attrs="{'invisible': [('current_instance_level', '==', 'project')]}">
+                            <page string="Transfers Follow-up" attrs="{'invisible': [('current_instance_level', '=', 'project')]}">
                                 <field name="past_transfer_ids" nolabel="1">
                                     <tree string="Past Transfers">
                                         <field name="instance_id"/>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-01-17 15:11:02 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-01-31 13:38:39 +0000
@@ -26809,8 +26809,8 @@
 #. module: account_hq_entries
 #: code:addons/account_hq_entries/wizard/hq_entries_import.py:121
 #, python-format
-msgid "No default Destination defined for expense account: %s"
-msgstr "Pas de Destination par défaut définie pour le compte de charge: %s"
+msgid "No default Destination defined for account: %s"
+msgstr "Pas de Destination par défaut définie pour le compte : %s"
 
 #. module: sales_followup
 #: model:ir.model,name:sales_followup.model_sale_order_followup_test
@@ -91895,9 +91895,10 @@
 msgid "Unit price"
 msgstr "Prix unitaire"
 
-#. modules: msf_instance, finance
+#. modules: msf_instance, finance, account_hq_entries
 #: field:cash.request,current_instance_level:0
 #: field:msf.instance,current_instance_level:0
+#: field:hq.entries,current_instance_level:0
 msgid "Current Instance Level"
 msgstr "Niveau de l'Instance Actuelle"
 
@@ -93247,7 +93248,7 @@
 msgid "Periodical Processing"
 msgstr "Traitements Périodiques"
 
-#. modules: account_override, account, res_currency_functional, account_mcdb, analytic_distribution
+#. modules: account_override, account, res_currency_functional, account_mcdb, analytic_distribution, account_hq_entries
 #: selection:account.journal.column,field:0
 #: view:account.account:0
 #: field:account.account,user_type:0
@@ -93263,6 +93264,7 @@
 #: model:ir.model,name:account_override.model_account_account_type
 #: view:account.analytic.account:0
 #: field:account.move.line,account_type:0
+#: field:hq.entries,account_user_type_code:0
 #: code:addons/account/report/account_general_ledger.py:526
 #, python-format
 msgid "Account Type"
@@ -103798,6 +103800,7 @@
 #, python-format
 msgid "Source Location %s is inactive"
 msgstr "La Zone Source %s est inactive"
+<<<<<<< TREE
 
 #. module: msf_homere_interface
 #: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:428
@@ -103843,3 +103846,41 @@
 #, python-format
 msgid "Partner %s (%s): you can not use %s currency"
 msgstr "Partenaire %s (%s): vous ne pouvez pas utiliser la devise %s"
+=======
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/hq_entries_import.py:195
+#, python-format
+msgid "%s \"%s - %s\" of type \"view\" is not allowed for the account \"%s - %s\""
+msgstr "%s \"%s - %s\" de type \"vue\" n'est pas autorisé pour le compte \"%s - %s\""
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/hq_entries.py:607
+#, python-format
+msgid "You can not perform this action on a B/S line."
+msgstr "Vous ne pouvez pas effectuer cette action sur une ligne de bilan."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/hq_entries_import.py:126
+#, python-format
+msgid "The B/S account %s cannot have an Analytic Distribution. Only a Cost Center should be given."
+msgstr "Le compte de bilan %s ne peut pas avoir de Distribution Analytique. Seul un Centre de Coût doit être indiqué."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/hq_entries_import.py:126
+#, python-format
+msgid "Cost Center is missing for the account %s."
+msgstr "Il manque le Centre de Coût pour le compte %s."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:479
+#, python-format
+msgid "The account %s - %s should not be used in AD corrections."
+msgstr "Le compte %s - %s ne doit pas être utilisé dans les corrections analytiques."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:471
+#, python-format
+msgid "The account %s - %s should neither be corrected nor be used in correction lines."
+msgstr "Le compte %s - %s ne doit ni être corrigé ni être utilisé dans les lignes de correction."
+>>>>>>> MERGE-SOURCE