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

[jftempo]

=== modified file 'bin/addons/account/project/project.py'
--- bin/addons/account/project/project.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account/project/project.py	2020-01-27 10:41:30 +0000
@@ -39,8 +39,63 @@
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
 
+    def _check_corr_type(self, cr, uid, ids, context=None):
+        """
+        Check that only one "Correction" and one "Correction HQ" analytic journals exist per instance
+        """
+        if context is None:
+            context = {}
+        for analytic_journal in self.browse(cr, uid, ids, fields_to_fetch=['type', 'instance_id'], context=context):
+            if analytic_journal.type in ('correction', 'correction_hq'):
+                analytic_journal_dom = [('type', '=', analytic_journal.type),
+                                        ('instance_id', '=', analytic_journal.instance_id.id),
+                                        ('id', '!=', analytic_journal.id)]
+                if self.search_exist(cr, uid, analytic_journal_dom, context=context):
+                    return False
+        return True
+
+    def _check_hq_corr(self, cr, uid, ids, context=None):
+        """
+        Check that the prop. instance of the "Correction HQ" analytic journal is a coordo
+        """
+        if context is None:
+            context = {}
+        for analytic_journal in self.browse(cr, uid, ids, fields_to_fetch=['type', 'instance_id'], context=context):
+            if analytic_journal.type == 'correction_hq' and analytic_journal.instance_id.level != 'coordo':
+                return False
+        return True
+
+    _constraints = [
+        (_check_corr_type, 'An analytic journal with this type already exists for this instance.', ['type', 'instance_id']),
+        (_check_hq_corr, 'The prop. instance of the "Correction HQ" analytic journal must be a coordination.', ['type', 'instance_id']),
+    ]
+
+    def get_correction_analytic_journal(self, cr, uid, corr_type=False, context=None):
+        """
+        Returns the correction analytic journal of the current instance (or False if not found):
+        - by default => standard Correction journal
+        - corr_type 'hq' => Correction HQ journal
+        - corr_type 'extra' => OD-Extra Accounting journal
+        - corr_type 'manual' => Correction Manual journal
+        """
+        if context is None:
+            context = {}
+        if corr_type == 'hq':
+            analytic_journal_type = 'correction_hq'
+        elif corr_type == 'extra':
+            analytic_journal_type = 'extra'
+        elif corr_type == 'manual':
+            analytic_journal_type = 'correction_manual'
+        else:
+            analytic_journal_type = 'correction'
+        analytic_journal_ids = self.search(cr, uid, [('type', '=', analytic_journal_type), ('is_current_instance', '=', True)],
+                                           order='id', limit=1, context=context)
+        return analytic_journal_ids and analytic_journal_ids[0] or False
+
+
 account_analytic_journal()
 
+
 class account_journal(osv.osv):
     _inherit="account.journal"
 
 
=== modified file 'bin/addons/account_corrections/account_move_line.py'
--- bin/addons/account_corrections/account_move_line.py	2019-10-30 16:33:21 +0000
+++ bin/addons/account_corrections/account_move_line.py	2020-01-27 10:41:30 +0000
@@ -448,19 +448,11 @@
         ana_j_obj = self.pool.get('account.analytic.journal')
         aal_obj = self.pool.get('account.analytic.line')
         # Search correction journal
-        j_corr_ids = j_obj.search(cr, uid, [('type', '=', 'correction'),
-                                            ('is_current_instance', '=', True)], order='id', limit=1, context=context)
-        j_corr_id = j_corr_ids and j_corr_ids[0] or False
-        j_ana_corr_ids = ana_j_obj.search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)],
-                                          order='id', limit=1, context=context)
-        j_ana_corr_id = j_ana_corr_ids and j_ana_corr_ids[0] or False
+        j_corr_id = j_obj.get_correction_journal(cr, uid, context=context)
+        j_ana_corr_id = ana_j_obj.get_correction_analytic_journal(cr, uid, context=context)
         # Search extra-accounting journal
-        j_extra_ids = j_obj.search(cr, uid, [('type', '=', 'extra'),
-                                             ('is_current_instance', '=', True)], order='id', limit=1)
-        j_extra_id = j_extra_ids and j_extra_ids[0] or False
-        j_ana_extra_ids = ana_j_obj.search(cr, uid, [('type', '=', 'extra'), ('is_current_instance', '=', True)],
-                                           order='id', limit=1, context=context)
-        j_ana_extra_id = j_ana_extra_ids and j_ana_extra_ids[0] or False
+        j_extra_id = j_obj.get_correction_journal(cr, uid, corr_type='extra', context=context)
+        j_ana_extra_id = ana_j_obj.get_correction_analytic_journal(cr, uid, corr_type='extra', context=context)
 
         # Search attached period
         period_ids = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)], context=context,
@@ -662,14 +654,13 @@
                                                               new_account_id, context=context)
 
         # Search correction journal
-        j_corr_ids = j_obj.search(cr, uid, [('type', '=', 'correction'),
-                                            ('is_current_instance', '=', True)], order='id', limit=1, context=context)
-        j_corr_id = j_corr_ids and j_corr_ids[0] or False
+        j_corr_id = j_obj.get_correction_journal(cr, uid, context=context)
 
         # Search extra-accounting journal
-        j_extra_ids = j_obj.search(cr, uid, [('type', '=', 'extra'),
-                                             ('is_current_instance', '=', True)], order='id', limit=1)
-        j_extra_id = j_extra_ids and j_extra_ids[0] or False
+        j_extra_id = j_obj.get_correction_journal(cr, uid, corr_type='extra', context=context)
+
+        # Search for the "Correction HQ" journal
+        hq_corr_journal_id = j_obj.get_correction_journal(cr, uid, corr_type='hq', context=context)
 
         # Search attached period
         period_obj = self.pool.get('account.period')
@@ -718,6 +709,13 @@
                     raise osv.except_osv(_('Error'), _('No OD-Extra Accounting Journal found!'))
                 if new_account.type_for_register != 'donation':
                     raise osv.except_osv(_('Error'), _('You come from a donation account. And new one is not a Donation account. You should give a Donation account!'))
+
+            # Correction: of an HQ entry, or of a correction of an HQ entry
+            if ml.journal_id.type in ('hq', 'correction_hq'):
+                journal_id = hq_corr_journal_id
+                if not journal_id:
+                    raise osv.except_osv(_('Error'), _('No "correction HQ" journal found!'))
+
             if not journal_id:
                 raise osv.except_osv(_('Error'), _('No correction journal found!'))
 
 
=== modified file 'bin/addons/account_corrections/wizard/analytic_distribution_wizard.py'
--- bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2019-10-31 14:53:19 +0000
+++ bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2020-01-27 10:41:30 +0000
@@ -150,6 +150,8 @@
         wizard = self.browse(cr, uid, wizard_id)
         ad_obj = self.pool.get('analytic.distribution')
         ana_line_obj = self.pool.get('account.analytic.line')
+        journal_obj = self.pool.get('account.journal')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
         company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
         ml = wizard.move_line_id
         # US-5848: orig_date left unchanged not to break historical behavior,
@@ -176,12 +178,12 @@
                 entry_seq_data['sequence'] = biggest_reversal_aji.entry_sequence
 
         jtype = 'correction'
-        if wizard.move_line_id.account_id and wizard.move_line_id.account_id.type_for_register == 'donation':
+        if ml.account_id.type_for_register == 'donation':
             jtype = 'extra'
-        correction_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid,
-                                                                                  [('type', '=', jtype), ('is_current_instance', '=', True)],
-                                                                                  order='id', limit=1)
-        correction_journal_id = correction_journal_ids and correction_journal_ids[0] or False
+        # Correction: of an HQ entry, or of a correction of an HQ entry
+        elif ml.journal_id.type in ('hq', 'correction_hq'):
+            jtype = 'hq'
+        correction_journal_id = analytic_journal_obj.get_correction_analytic_journal(cr, uid, corr_type=jtype, context=context)
         if not correction_journal_id:
             raise osv.except_osv(_('Error'), _('No analytic journal found for corrections!'))
         to_create = []
@@ -191,19 +193,11 @@
         old_line_ok = []
         any_reverse = False
         # Prepare journal and period information for entry sequences
-        journal_sql = """
-            SELECT id, code
-            FROM account_journal
-            WHERE type = %s 
-            AND is_current_instance = true
-            ORDER BY id
-            LIMIT 1;
-            """
-        cr.execute(journal_sql, (jtype,))
-        journal_sql_res = cr.fetchone()
-        journal_id = journal_sql_res[0]
-        code = journal_sql_res[1]
-        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+        journal_id = journal_obj.get_correction_journal(cr, uid, corr_type=jtype, context=context)
+        if not journal_id:
+            raise osv.except_osv(_('Error'), _('No journal found for corrections!'))
+        journal = journal_obj.browse(cr, uid, journal_id, context=context)
+        code = journal.code
         period_ids = self.pool.get('account.period').get_period_from_date(cr, uid, date=posting_date, context=context)
         if not period_ids:
             raise osv.except_osv(_('Warning'), _('No period found for creating sequence on the given date: %s') % (posting_date or ''))
@@ -248,8 +242,7 @@
                         # US-1343/2: flag that the chain origin is an HQ
                         # entry: in other terms OD AJI from a HQ JI
                     is_HQ_origin = {
-                        'from_od': \
-                        original_al.journal_id.type == 'correction',
+                        'from_od': original_al.journal_id.type in ('correction', 'correction_hq'),
                     }
                     break
 
 
=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_validation.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2019-10-30 16:33:21 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2020-01-27 10:41:30 +0000
@@ -262,12 +262,9 @@
         original_lines = set()
         original_move_ids = []
         ana_line_obj = self.pool.get('account.analytic.line')
-        od_journal_ids = self.pool.get('account.journal').search(cr, uid,
-                                                                 [('type', '=', 'correction'), ('is_current_instance', '=', True)],
-                                                                 order='id', limit=1)
-        if not od_journal_ids:
-            raise osv.except_osv(_('Error'), _('No correction journal found!'))
-        od_journal_id = od_journal_ids[0]
+        odhq_journal_id = self.pool.get('account.journal').get_correction_journal(cr, uid, corr_type='hq', context=context)
+        if not odhq_journal_id:
+            raise osv.except_osv(_('Error'), _('No "correction HQ" journal found!'))
         all_lines = set()
         pure_ad_cor_ji_ids = []
         original_aji_ids = []
@@ -302,7 +299,7 @@
             curr_date = currency_date.get_date(self, cr, line.document_date or line.date, line.date)
             new_res_move = self.create_move(cr, uid, [x.id for x in line.split_ids], line.period_id.id,
                                             line.currency_id.id, date=line.date, doc_date=line.document_date, source_date=curr_date,
-                                            journal=od_journal_id, orig_acct=original_account_id, split=True, context=context)
+                                            journal=odhq_journal_id, orig_acct=original_account_id, split=True, context=context)
             # original move line
             original_ml_result = res_move[line.id]
             # Mark new journal items as corrections for the first one
@@ -343,14 +340,10 @@
             initial_ana_ids = ana_line_obj.search(cr, uid, [('move_id.move_id', '=', move_id)])  # original move_id
             original_aji_ids += initial_ana_ids
             res_reverse = ana_line_obj.reverse(cr, uid, initial_ana_ids, posting_date=line.date, context=context)
-            acor_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid,
-                                                                                [('type', '=', 'correction'), ('is_current_instance', '=', True)],
-                                                                                order='id', limit=1)
-            if not acor_journal_ids:
-                raise osv.except_osv(_('Error'), _('No correction journal found!'))
-            acor_journal_id = acor_journal_ids[0]
+            acor_journal_id = self.pool.get('account.analytic.journal').get_correction_analytic_journal(cr, uid,
+                                                                                                        corr_type='hq', context=context)
             if not acor_journal_id:
-                raise osv.except_osv(_('Warning'), _('No analytic correction journal found!'))
+                raise osv.except_osv(_('Error'), _('No "correction HQ" analytic journal found!'))
             ana_line_obj.write(cr, uid, res_reverse, {'journal_id': acor_journal_id, 'move_id': counterpart_id[0]}) # UTP-1106: change move_id link as it's wrong one
 
             # Mark new analytic items as correction for original line
@@ -368,7 +361,7 @@
             for aal in browse_aals:
                 cor_name = 'COR1 - ' + aal.name
                 ana_line_obj.write(cr, uid, aal.id, {'last_corrected_id': original_aal_ids[0],'name': cor_name, 'ref': cor_ref})
-            # also write the OD entry_sequence to the REV aal
+            # also write the ODHQ entry_sequence to the REV aal
             # ana_line_obj.write(cr, uid, res_reverse, {'journal_id': acor_journal_id, 'entry_sequence': aal.entry_sequence})
             cr.execute('''UPDATE account_analytic_line SET entry_sequence=%s WHERE id=%s''', (aal.entry_sequence, res_reverse[0]))
 
@@ -408,13 +401,10 @@
             ana_line_obj = self.pool.get('account.analytic.line')
             distrib_fp_line_obj = self.pool.get('funding.pool.distribution.line')
             distrib_cc_line_obj = self.pool.get('cost.center.distribution.line')
-            # Search an analytic correction journal
-            acor_journal_id = False
-            acor_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'correction'),
-                                                                                          ('is_current_instance', '=', True)],
-                                                                                order='id', limit=1)
-            if acor_journal_ids:
-                acor_journal_id = acor_journal_ids[0]
+            journal_obj = self.pool.get('account.journal')
+            analytic_journal_obj = self.pool.get('account.analytic.journal')
+            # Search for the "Correction HQ" analytic journal
+            acor_journal_id = analytic_journal_obj.get_correction_analytic_journal(cr, uid, corr_type='hq', context=context)
             # Tag active_ids as user validated
             account_change = []
             cc_change = []
@@ -529,7 +519,7 @@
                 # Give them analytic correction journal (UF-1385 in comments)
                 if not acor_journal_id:
                     self.write(cr, uid, [wiz.id], {'running': False})
-                    raise osv.except_osv(_('Warning'), _('No analytic correction journal found!'))
+                    raise osv.except_osv(_('Warning'), _('No "correction HQ" analytic journal found!'))
                 ana_line_obj.write(cr, uid, res_reverse, {'journal_id': acor_journal_id})
                 # create new lines
                 if not fp_old_lines: # UTP-546 - this have been added because of sync that break analytic lines generation
@@ -560,14 +550,11 @@
                 if isinstance(cor_ids, (int, long)):
                     cor_ids = [cor_ids]
                 cor_ids += res_reverse
-
-                gl_journal_ids = self.pool.get('account.journal').search(cr, uid,
-                                                                         [('type', '=', 'correction'), ('is_current_instance', '=', True)],
-                                                                         order='id', limit=1)
-                if not gl_journal_ids:
+                odhq_journal_id = journal_obj.get_correction_journal(cr, uid, corr_type='hq', context=context)
+                if not odhq_journal_id:
                     self.write(cr, uid, [wiz.id], {'running': False})
-                    raise osv.except_osv(_('Error'), _('No correction journal found!'))
-                gl_journal_obj = self.pool.get('account.journal').browse(cr, uid, gl_journal_ids[0], context=context)
+                    raise osv.except_osv(_('Error'), _('No "correction HQ" journal found!'))
+                gl_journal_obj = journal_obj.browse(cr, uid, odhq_journal_id, fields_to_fetch=['sequence_id', 'code'], context=context)
                 journal_sequence_id = gl_journal_obj.sequence_id.id
                 journal_code = gl_journal_obj.code
                 seq_obj = self.pool.get('ir.sequence')
 
=== modified file 'bin/addons/account_journal/account_journal.py'
--- bin/addons/account_journal/account_journal.py	2017-08-03 19:14:48 +0000
+++ bin/addons/account_journal/account_journal.py	2020-01-27 10:41:30 +0000
@@ -60,7 +60,9 @@
                 ('bank', 'Bank'),
                 ('cash','Cash'),
                 ('cheque', 'Cheque'),
-                ('correction','Correction'),
+                ('correction', 'Correction Auto'),
+                ('correction_hq', 'Correction HQ'),
+                ('correction_manual', 'Correction Manual'),
                 ('cur_adj', 'Currency Adjustment'),
                 ('depreciation', 'Depreciation'),
                 ('general', 'General'),
@@ -111,6 +113,51 @@
         'group_invoice_lines': False,
     }
 
+    def _check_correction_type(self, cr, uid, ids, context=None):
+        """
+        Check that only one "Correction" and one "Correction HQ" journals exist per instance
+        """
+        if context is None:
+            context = {}
+        for journal in self.browse(cr, uid, ids, fields_to_fetch=['type', 'instance_id'], context=context):
+            if journal.type in ('correction', 'correction_hq') and journal.instance_id:
+                journal_dom = [('type', '=', journal.type), ('instance_id', '=', journal.instance_id.id), ('id', '!=', journal.id)]
+                if self.search_exist(cr, uid, journal_dom, context=context):
+                    return False
+        return True
+
+    def _check_correction_analytic_journal(self, cr, uid, ids, context=None):
+        """
+        In case of Correction journal or Correction HQ journal, check that the analytic journal selected is the right one
+        """
+        if context is None:
+            context = {}
+        for journal in self.browse(cr, uid, ids, fields_to_fetch=['type', 'analytic_journal_id', 'instance_id'], context=context):
+            if journal.type in ('correction', 'correction_hq'):
+                if not journal.analytic_journal_id:
+                    return False
+                elif journal.type != journal.analytic_journal_id.type or journal.instance_id != journal.analytic_journal_id.instance_id:
+                    return False
+        return True
+
+    def _check_hq_correction(self, cr, uid, ids, context=None):
+        """
+        Check that the prop. instance of the "Correction HQ" journal is a coordo
+        """
+        if context is None:
+            context = {}
+        for journal in self.browse(cr, uid, ids, fields_to_fetch=['type', 'instance_id'], context=context):
+            if journal.type == 'correction_hq' and (not journal.instance_id or journal.instance_id.level != 'coordo'):
+                return False
+        return True
+
+    _constraints = [
+        (_check_correction_type, 'A journal with this type already exists for this instance.', ['type', 'instance_id']),
+        (_check_correction_analytic_journal, 'The analytic journal selected must have the same type and prop. instance as this journal.',
+                                             ['type', 'analytic_journal_id', 'instance_id']),
+        (_check_hq_correction, 'The prop. instance of the "Correction HQ" journal must be a coordination.', ['type', 'instance_id']),
+    ]
+
     def get_current_period(self, cr, uid, context=None):
         periods = self.pool.get('account.period').find(cr, uid, datetime.date.today())
         if periods:
@@ -397,5 +444,28 @@
             'target': 'crush',
         }
 
+    def get_correction_journal(self, cr, uid, corr_type=False, context=None):
+        """
+        Returns the correction journal of the current instance (or False if not found):
+        - by default => standard Correction journal
+        - corr_type 'hq' => Correction HQ journal
+        - corr_type 'extra' => OD-Extra Accounting journal
+        - corr_type 'manual' => Correction Manual journal
+        """
+        if context is None:
+            context = {}
+        if corr_type == 'hq':
+            journal_type = 'correction_hq'
+        elif corr_type == 'extra':
+            journal_type = 'extra'
+        elif corr_type == 'manual':
+            journal_type = 'correction_manual'
+        else:
+            journal_type = 'correction'
+        journal_ids = self.search(cr, uid, [('type', '=', journal_type), ('is_current_instance', '=', True)],
+                                  order='id', limit=1, context=context)
+        return journal_ids and journal_ids[0] or False
+
+
 account_journal()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/account_journal/project/project.py'
--- bin/addons/account_journal/project/project.py	2019-05-07 16:21:42 +0000
+++ bin/addons/account_journal/project/project.py	2020-01-27 10:41:30 +0000
@@ -37,7 +37,9 @@
         """
         return [
             ('cash','Cash'),
-            ('correction', 'Correction'),
+            ('correction', 'Correction Auto'),
+            ('correction_hq', 'Correction HQ'),
+            ('correction_manual', 'Correction Manual'),
             ('cur_adj', 'Currency Adjustment'),
             ('engagement', 'Engagement'),
             ('general','General'),
 
=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2019-10-31 15:54:47 +0000
+++ bin/addons/account_override/account.py	2020-01-27 10:41:30 +0000
@@ -887,7 +887,9 @@
                                      domain="[('state', '=', 'draft')]", hide_default_menu=True),
         'journal_id': fields.many2one('account.journal', 'Journal',
                                       required=True, states={'posted':[('readonly',True)]},
-                                      domain="[('type', 'not in', ['accrual', 'hq', 'inkind', 'cur_adj', 'system', 'extra']), ('instance_filter', '=', True)]",
+                                      domain="[('type', 'not in', "
+                                             " ['accrual', 'hq', 'inkind', 'cur_adj', 'system', 'extra', 'correction', 'correction_hq']),"
+                                             "('instance_filter', '=', True)]",
                                       hide_default_menu=True),
         'document_date': fields.date('Document Date', size=255, required=True, help="Used for manual journal entries"),
         'journal_type': fields.related('journal_id', 'type', type='selection', selection=_journal_type_get, string="Journal Type", \
@@ -1192,6 +1194,8 @@
                 # UFTP-105: Do not permit to validate a journal entry on a period that is not open
                 if m.period_id and m.period_id.state != 'draft':
                     raise osv.except_osv(_('Warning'), _('You cannot post entries in a non-opened period: %s') % (m.period_id.name))
+                if m.journal_id.type in ('correction', 'correction_hq'):
+                    raise osv.except_osv(_('Warning'), _('The journal %s is forbidden in manual entries.') % (m.journal_id.code))
                 prev_currency_id = False
                 for ml in m.line_id:
                     # Check that the currency and type of the (journal) third party is correct
 
=== modified file 'bin/addons/analytic_distribution/analytic_line.py'
--- bin/addons/analytic_distribution/analytic_line.py	2019-10-30 16:33:21 +0000
+++ bin/addons/analytic_distribution/analytic_line.py	2020-01-27 10:41:30 +0000
@@ -282,24 +282,23 @@
         context.update({'from': 'mass_reallocation'}) # this permits reallocation to be accepted when rewrite analaytic lines
         move_prefix = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.instance_id.move_prefix
 
+        ir_seq_obj = self.pool.get('ir.sequence')
+
         aaj_obj = self.pool.get('account.analytic.journal')
-        correction_journal_ids = aaj_obj.search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)],
-                                                order='id', limit=1)
-        correction_journal_id = correction_journal_ids and correction_journal_ids[0] or False
-        if not correction_journal_id:
+        od_analytic_journal_id = aaj_obj.get_correction_analytic_journal(cr, uid, context=context)
+        if not od_analytic_journal_id:
             raise osv.except_osv(_('Error'), _('No analytic journal found for corrections!'))
 
         # sequence info from GL journal
         aj_obj = self.pool.get('account.journal')
-        gl_correction_journal_ids = aj_obj.search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)],
-                                                  order='id', limit=1)
-        gl_correction_journal_id = gl_correction_journal_ids and gl_correction_journal_ids[0] or False
+        gl_correction_journal_id = aj_obj.get_correction_journal(cr, uid, context=context)
         if not gl_correction_journal_id:
             raise osv.except_osv(_('Error'), _('No GL journal found for corrections!'))
         gl_correction_journal_rec = aj_obj.browse(cr, uid, gl_correction_journal_id, context=context)
 
         is_donation = {}
         gl_correction_odx_journal_rec = False
+        gl_correction_odhq_journal_rec = False
         # Process lines
         for aline in self.browse(cr, uid, ids, context=context):
             curr_date = currency_date.get_date(self, cr, aline.document_date, aline.date, source_date=aline.source_date)
@@ -336,28 +335,36 @@
 
                     if is_donation[aline.move_id.account_id.id]:
                         if not gl_correction_odx_journal_rec:
-                            odx_aji = aj_obj.search(cr, uid, [('type', '=', 'extra'), ('is_current_instance', '=', True)],
-                                                    order='id', limit=1)
-                            if not odx_aji:
+                            gl_correction_odx_journal_id = aj_obj.get_correction_journal(cr, uid, corr_type='extra', context=context)
+                            if not gl_correction_odx_journal_id:
                                 raise osv.except_osv(_('Error'), _('No GL journal found for ODX'))
-                            gl_correction_odx_journal_id = odx_aji[0]
                             gl_correction_odx_journal_rec = aj_obj.browse(cr, uid, gl_correction_odx_journal_id, context=context)
-
-                            correction_odx_journal_ids = aaj_obj.search(cr, uid, [('type', '=', 'extra'), ('is_current_instance', '=', True)],
-                                                                        order='id', limit=1)
-                            correction_odx_journal_id = correction_odx_journal_ids and correction_odx_journal_ids[0] or False
-                            if not correction_odx_journal_id:
+                            odx_analytic_journal_id = aaj_obj.get_correction_analytic_journal(cr, uid, corr_type='extra', context=context)
+                            if not odx_analytic_journal_id:
                                 raise osv.except_osv(_('Error'), _('No analytic journal found for ODX!'))
 
-
-                        seqnum = self.pool.get('ir.sequence').get_id(cr, uid, gl_correction_odx_journal_rec.sequence_id.id, context=seq_num_ctx)
+                        seqnum = ir_seq_obj.get_id(cr, uid, gl_correction_odx_journal_rec.sequence_id.id, context=seq_num_ctx)
                         entry_seq = "%s-%s-%s" % (move_prefix, gl_correction_odx_journal_rec.code, seqnum)
-                        corr_j = correction_odx_journal_id
+                        corr_j = odx_analytic_journal_id
+                    # Correction: of an HQ entry, or of a correction of an HQ entry
+                    elif aline.journal_id.type in ('hq', 'correction_hq'):
+                        if not gl_correction_odhq_journal_rec:
+                            gl_correction_odhq_journal_id = aj_obj.get_correction_journal(cr, uid, corr_type='hq', context=context)
+                            if not gl_correction_odhq_journal_id:
+                                raise osv.except_osv(_('Error'), _('No "correction HQ" journal found!'))
+                            gl_correction_odhq_journal_rec = aj_obj.browse(cr, uid, gl_correction_odhq_journal_id,
+                                                                           fields_to_fetch=['sequence_id', 'code'], context=context)
+                            odhq_analytic_journal_id = aaj_obj.get_correction_analytic_journal(cr, uid, corr_type='hq', context=context)
+                            if not odhq_analytic_journal_id:
+                                raise osv.except_osv(_('Error'), _('No "correction HQ" analytic journal found!'))
+                        seqnum = ir_seq_obj.get_id(cr, uid, gl_correction_odhq_journal_rec.sequence_id.id, context=seq_num_ctx)
+                        entry_seq = "%s-%s-%s" % (move_prefix, gl_correction_odhq_journal_rec.code, seqnum)
+                        corr_j = odhq_analytic_journal_id
                     else:
                         # compute entry sequence
-                        seqnum = self.pool.get('ir.sequence').get_id(cr, uid, gl_correction_journal_rec.sequence_id.id, context=seq_num_ctx)
+                        seqnum = ir_seq_obj.get_id(cr, uid, gl_correction_journal_rec.sequence_id.id, context=seq_num_ctx)
                         entry_seq = "%s-%s-%s" % (move_prefix, gl_correction_journal_rec.code, seqnum)
-                        corr_j = correction_journal_id
+                        corr_j = od_analytic_journal_id
 
                     # First reverse line
                     rev_ids = self.pool.get('account.analytic.line').reverse(cr, uid, [aline.id], posting_date=date)
 
=== modified file 'bin/addons/msf_doc_import/__init__.py'
--- bin/addons/msf_doc_import/__init__.py	2019-05-03 13:44:52 +0000
+++ bin/addons/msf_doc_import/__init__.py	2020-01-27 10:41:30 +0000
@@ -28,10 +28,10 @@
         The file should be in XML 2003 format.
 
 The columns should be in this values: """)
-# Authorized analytic journal in Accounting import
+# Authorized journals in Accounting import
 ACCOUNTING_IMPORT_JOURNALS = [
     'intermission',
-    'correction',
+    'correction_manual',
     'hr',
     'migration',
     'sale',  # US-70/3
 
=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2019-10-30 16:33:21 +0000
+++ bin/addons/msf_doc_import/account.py	2020-01-27 10:41:30 +0000
@@ -358,7 +358,7 @@
                         money[(booking_curr, period_name, r_document_date)]['credit'] += book_credit
                         r_credit = book_credit
 
-                    # Check which journal it is to be posted to: should be of type OD, MIG or INT
+                    # Check the journal code which must match with one of the journal types listed in ACCOUNTING_IMPORT_JOURNALS
                     if not line[cols['Journal Code']]:
                         errors.append(_('Line %s. No Journal Code specified') % (current_line_num,))
                         continue
 
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-01-14 16:49:14 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-01-27 10:41:30 +0000
@@ -477,6 +477,7 @@
             <field name="method">us_6768_trigger_FP_sync</field>
         </record>
 
+<<<<<<< TREE
         <!-- UF15.1 -->
         <record id="us_6930_gen_unreconcile" model="patch.scripts">
             <field name="method">us_6930_gen_unreconcile</field>
@@ -490,5 +491,12 @@
             <field name="method">rec_entries_uf14_1_uf15</field>
         </record>
 
+=======
+        <!-- UF16.0 -->
+        <record id="us_6692_new_od_journals" model="patch.scripts">
+            <field name="method">us_6692_new_od_journals</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-11-21 16:33:04 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-01-27 10:41:30 +0000
@@ -42164,13 +42164,10 @@
 msgid "Field Information"
 msgstr "Information Champ "
 
-#. modules: account_corrections, account_hq_entries
+#. module: account_corrections
 #: code:addons/account_corrections/account_move_line.py:499
 #: code:addons/account_corrections/account_move_line.py:707
 #: code:addons/account_corrections/account_move_line.py:855
-#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:261
-#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:340
-#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:542
 #, python-format
 msgid "No correction journal found!"
 msgstr "Le système n'a pas trouvé de Journal des corrections !"
@@ -91142,7 +91139,13 @@
 #: code:addons/analytic_distribution/analytic_line.py:288
 #, python-format
 msgid "No analytic journal found for corrections!"
-msgstr "No analytic journal found for corrections!"
+msgstr "Pas de journal analytique trouvé pour les corrections !"
+
+#. module: account_corrections
+#: code:addons/account_corrections/wizard/analytic_distribution_wizard.py:198
+#, python-format
+msgid "No journal found for corrections!"
+msgstr "Pas de journal trouvé pour les corrections !"
 
 #. module: stock
 #: selection:physical.inventory.select.products,second_filter:0
@@ -100290,13 +100293,6 @@
 msgstr "Aucun journal HQ trouvé!"
 
 #. module: account_hq_entries
-#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:343
-#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:506
-#, python-format
-msgid "No analytic correction journal found!"
-msgstr "Aucun Journal Analytique de correction n'a été trouvé!"
-
-#. module: account_hq_entries
 #: code:addons/account_hq_entries/hq_entries.py:311
 #, python-format
 msgid "No line found!"
@@ -106586,3 +106582,98 @@
 msgid "Funding Pool not found."
 msgstr "Funding Pool non trouvé."
 
+#. modules: account_override, account, register_accounting, msf_instance, finance
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.analytic.line,journal_type:0
+#: selection:account.move,journal_type:0
+#: selection:account.move.line,journal_type:0
+#: selection:cash.request.liquidity,type:0
+#: selection:cash.request.liquidity.bank,type:0
+#: selection:cash.request.liquidity.cash,type:0
+#: selection:cash.request.liquidity.cheque,type:0
+#: selection:account.analytic.journal.fake,type:0
+#: selection:account.journal.fake,type:0
+#: selection:wizard.register.opening.confirmation,register_type:0
+msgid "Correction Auto"
+msgstr "Correction Auto"
+
+#. modules: account_override, account, register_accounting, msf_instance, finance
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.analytic.line,journal_type:0
+#: selection:account.move,journal_type:0
+#: selection:account.move.line,journal_type:0
+#: selection:cash.request.liquidity,type:0
+#: selection:cash.request.liquidity.bank,type:0
+#: selection:cash.request.liquidity.cash,type:0
+#: selection:cash.request.liquidity.cheque,type:0
+#: selection:account.analytic.journal.fake,type:0
+#: selection:account.journal.fake,type:0
+#: selection:wizard.register.opening.confirmation,register_type:0
+msgid "Correction Manual"
+msgstr "Correction Manuelle"
+
+#. modules: account_override, account, register_accounting, msf_instance, finance
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.analytic.line,journal_type:0
+#: selection:account.move,journal_type:0
+#: selection:account.move.line,journal_type:0
+#: selection:cash.request.liquidity,type:0
+#: selection:cash.request.liquidity.bank,type:0
+#: selection:cash.request.liquidity.cash,type:0
+#: selection:cash.request.liquidity.cheque,type:0
+#: selection:account.analytic.journal.fake,type:0
+#: selection:account.journal.fake,type:0
+#: selection:wizard.register.opening.confirmation,register_type:0
+msgid "Correction HQ"
+msgstr "Correction HQ"
+
+#. module: account_journal
+#: constraint:account.journal:0
+msgid "The analytic journal selected must have the same type and prop. instance as this journal."
+msgstr "Le journal analytique sélectionné doit avoir le même type et la même instance prop. que ce journal."
+
+#. module: account_journal
+#: constraint:account.journal:0
+msgid "A journal with this type already exists for this instance."
+msgstr "Un journal de ce type existe déjà pour cette instance."
+
+#. module: account
+#: constraint:account.analytic.journal:0
+msgid "An analytic journal with this type already exists for this instance."
+msgstr "Un journal analytique de ce type existe déjà pour cette instance."
+
+#. module: account_journal
+#: constraint:account.journal:0
+msgid "The prop. instance of the \"Correction HQ\" journal must be a coordination."
+msgstr "L'instance prop. du journal de type \"Correction HQ\" doit être une coordination."
+
+#. module: account
+#: constraint:account.analytic.journal:0
+msgid "The prop. instance of the \"Correction HQ\" analytic journal must be a coordination."
+msgstr "L'instance prop. du journal analytique de type \"Correction HQ\" doit être une coordination."
+
+#. module: account_override
+#: code:addons/account_override/account.py:1198
+#, python-format
+msgid "The journal %s is forbidden in manual entries."
+msgstr "Le journal %s est interdit dans les écritures manuelles."
+
+#. modules: account_hq_entries, account_corrections, analytic_distribution
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:269
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:568
+#: code:addons/account_corrections/account_move_line.py:731
+#: code:addons/analytic_distribution/analytic_line.py:354
+#, python-format
+msgid "No \"correction HQ\" journal found!"
+msgstr "Aucun journal de type \"correction HQ\" n'a été trouvé !"
+
+#. modules: account_hq_entries, analytic_distribution
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:350
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:531
+#: code:addons/analytic_distribution/analytic_line.py:359
+#, python-format
+msgid "No \"correction HQ\" analytic journal found!"
+msgstr "Aucun journal analytique de type \"correction HQ\" n'a été trouvé !"
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-01-17 13:25:56 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-01-27 10:41:30 +0000
@@ -52,6 +52,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF15.2
     def rec_entries_uf14_1_uf15(self, cr, uid, *a, **b):
         current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
@@ -130,6 +131,78 @@
 
         return True
 
+=======
+    # UF16.0
+    def us_6692_new_od_journals(self, cr, uid, *a, **b):
+        """
+        1. Change the type of the existing correction journals (except OD) to "Correction Manual" so they remain usable
+
+        2. Create:
+        - ODM journals in all existing instances
+        - ODHQ journals in existing coordo instances
+
+        Notes:
+        - creations are done in Python as the objects created must sync normally
+        - none of these journals already exists in prod. DB.
+        """
+        user_obj = self.pool.get('res.users')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
+        journal_obj = self.pool.get('account.journal')
+        current_instance = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:  # existing instances only
+            # existing correction journals
+            cr.execute("""
+                       UPDATE account_analytic_journal
+                       SET type = 'correction_manual'
+                       WHERE type = 'correction'
+                       AND code != 'OD';              
+                       """)
+            self._logger.warn('%s correction analytic journal(s) updated.' % (cr.rowcount,))
+            cr.execute("""
+                       UPDATE account_journal
+                       SET type = 'correction_manual'
+                       WHERE type = 'correction'
+                       AND code != 'OD';              
+                       """)
+            self._logger.warn('%s correction journal(s) updated.' % (cr.rowcount,))
+            # ODM analytic journal
+            odm_analytic_vals = {
+                # Prop. Instance: by default the current one is used
+                'code': 'ODM',
+                'name': 'Correction manual',
+                'type': 'correction_manual',
+            }
+            odm_analytic_journal_id = analytic_journal_obj.create(cr, uid, odm_analytic_vals)
+            # ODM G/L journal
+            odm_vals = {
+                # Prop. Instance: by default the current one is used
+                'code': 'ODM',
+                'name': 'Correction manual',
+                'type': 'correction_manual',
+                'analytic_journal_id': odm_analytic_journal_id,
+            }
+            journal_obj.create(cr, uid, odm_vals)
+            if current_instance.level == 'coordo':
+                # ODHQ analytic journal
+                odhq_analytic_vals = {
+                    # Prop. Instance: by default the current one is used
+                    'code': 'ODHQ',
+                    'name': 'Correction automatic HQ',
+                    'type': 'correction_hq',
+                }
+                odhq_analytic_journal_id = analytic_journal_obj.create(cr, uid, odhq_analytic_vals)
+                # ODHQ G/L journal
+                odhq_vals = {
+                    # Prop. Instance: by default the current one is used
+                    'code': 'ODHQ',
+                    'name': 'Correction automatic HQ',
+                    'type': 'correction_hq',
+                    'analytic_journal_id': odhq_analytic_journal_id,
+                }
+                journal_obj.create(cr, uid, odhq_vals)
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF15.0
     def us_6768_trigger_FP_sync(self, cr, uid, *a, **b):
         """
 
=== modified file 'bin/addons/msf_sync_data_coordo/__openerp__.py'
--- bin/addons/msf_sync_data_coordo/__openerp__.py	2012-09-05 16:20:12 +0000
+++ bin/addons/msf_sync_data_coordo/__openerp__.py	2020-01-27 10:41:30 +0000
@@ -31,6 +31,8 @@
     'init_xml': [],
     'data': [
         'data/res.partner.csv',
+        'data/account.analytic.journal.csv',
+        'data/account.journal.csv',
     ],
     'demo_xml': [],
     'test':[],
 
=== added file 'bin/addons/msf_sync_data_coordo/data/account.analytic.journal.csv'
--- bin/addons/msf_sync_data_coordo/data/account.analytic.journal.csv	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_sync_data_coordo/data/account.analytic.journal.csv	2020-01-27 10:41:30 +0000
@@ -0,0 +1,2 @@
+active,code,name,type
+TRUE,ODHQ,Correction automatic HQ,correction_hq
 
=== added file 'bin/addons/msf_sync_data_coordo/data/account.journal.csv'
--- bin/addons/msf_sync_data_coordo/data/account.journal.csv	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_sync_data_coordo/data/account.journal.csv	2020-01-27 10:41:30 +0000
@@ -0,0 +1,2 @@
+code,currency,default_credit_account_id,default_debit_account_id,name,type,analytic_journal_id
+ODHQ,,,,Correction automatic HQ,correction_hq,Correction automatic HQ
 
=== modified file 'bin/addons/msf_sync_data_post_synchro/data/account.analytic.journal.csv'
--- bin/addons/msf_sync_data_post_synchro/data/account.analytic.journal.csv	2019-08-02 15:32:08 +0000
+++ bin/addons/msf_sync_data_post_synchro/data/account.analytic.journal.csv	2020-01-27 10:41:30 +0000
@@ -4,6 +4,7 @@
 TRUE,SAL,Sales,sale
 TRUE,SAR,Sales Refund,sale
 TRUE,OD,Corrections,correction
+TRUE,ODM,Correction manual,correction_manual
 TRUE,HQ,Headquarters,hq
 TRUE,HR,Human Resources,hr
 TRUE,ENG,Engagement,engagement
 
=== modified file 'bin/addons/msf_sync_data_post_synchro/data/account.journal.csv'
--- bin/addons/msf_sync_data_post_synchro/data/account.journal.csv	2014-02-13 15:11:50 +0000
+++ bin/addons/msf_sync_data_post_synchro/data/account.journal.csv	2020-01-27 10:41:30 +0000
@@ -4,6 +4,7 @@
 HR,,,,Human Resources,hr,Human Resources
 FXA,,67040,67040,FX adjustment,cur_adj,FX adjustment
 OD,,,,Corrections,correction,Corrections
+ODM,,,,Correction manual,correction_manual,Correction manual
 PUR,,,,Purchase,purchase,Purchase
 PUF,,,,Purchase Refund,purchase_refund,Purchase Refund
 SAL,,,,Sales,sale,Sales
 
=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb.py'
--- bin/addons/vertical_integration/report/hq_report_ocb.py	2019-09-25 12:57:25 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocb.py	2020-01-27 10:41:30 +0000
@@ -549,7 +549,7 @@
             # Pay attention to take analytic line that are not on HQ and MIGRATION journals.
             'rawdata': """
                 SELECT al.id, i.code,
-                       CASE WHEN j.code = 'OD' THEN j.code ELSE aj.code END AS journal,
+                       CASE WHEN j.code IN ('OD', 'ODHQ', 'ODX') THEN j.code ELSE aj.code END AS journal,
                        al.entry_sequence, al.name, al.ref, al.document_date, al.date,
                        a.code, al.partner_txt, aa.code AS dest, aa2.code AS cost_center_id, aa3.code AS funding_pool, 
                        CASE WHEN al.amount_currency < 0 AND aml.is_addendum_line = 'f' THEN ABS(al.amount_currency) ELSE 0.0 END AS debit, 
 
=== modified file 'bin/addons/vertical_integration/report/hq_report_ocp.py'
--- bin/addons/vertical_integration/report/hq_report_ocp.py	2019-09-25 12:57:25 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocp.py	2020-01-27 10:41:30 +0000
@@ -63,7 +63,7 @@
         """
         Takes data in parameter corresponding to ACCOUNT MOVE LINES (results from 'bs_entries' or 'plresult' requests)
         1) Replaces the journal type "key" by its corresponding "value" (ex: inkind => In-kind Donation)
-        2) Modifies it for all OD entries that originate from HQ entry corrections:
+        2) Modifies it for all entries that originate from HQ entry corrections:
         - instance: 'EAUD' or 'SIEG' if this matches the first 4 characters of the original HQ entry (if not: 'SIEG' by default)
         - journal: the journal name corresponds to the 9-to-11 characters of the reference field of the original HQ entry
         Returns a list of tuples (same format as data)
@@ -80,7 +80,7 @@
             line_list = list(line)
             line_list[journal_type] = self._get_journal_type_value(cr, uid, line_list[journal_type])
             od_hq_entry = False
-            if line_list[journal] == 'OD':
+            if line_list[journal] in ('OD', 'ODHQ'):  # 'OD' for entries before US-6692
                 aml = aml_obj.browse(cr, uid, line_list[id_from_db], fields_to_fetch=['corrected_line_id', 'reversal_line_id'])
                 corrected_aml = aml.corrected_line_id
                 reversed_aml = aml.reversal_line_id
@@ -107,7 +107,7 @@
         """
         Takes data in parameter corresponding to ACCOUNT ANALYTIC LINES (results from 'rawdata' request)
         1) Replaces the journal type "key" by its corresponding "value" (ex: inkind => In-kind Donation)
-        2) Modifies it for all OD entries that originate from HQ entry corrections:
+        2) Modifies it for all entries that originate from HQ entry corrections:
         - instance: 'EAUD' or 'SIEG' if this matches the first 4 characters of the original HQ entry (if not: 'SIEG' by default)
         - journal: the journal name corresponds to the 9-to-11 characters of the reference field of the original HQ entry
         Returns a list of tuples (same format as data)
@@ -124,7 +124,7 @@
             line_list = list(line)
             line_list[journal_type] = self._get_journal_type_value(cr, uid, line_list[journal_type])
             od_hq_entry = False
-            if line_list[journal] == 'OD':
+            if line_list[journal] in ('OD', 'ODHQ'):  # 'OD' for entries before US-6692
                 aal = aal_obj.browse(cr, uid, line_list[id_from_db], fields_to_fetch=['last_corrected_id', 'reversal_origin'])
                 corrected_aal = aal.last_corrected_id
                 reversed_aal = aal.reversal_origin
@@ -151,7 +151,7 @@
         """
         ##### WARNING #####
         ### THIS CALLS THE METHOD postprocess_add_db_id FROM OCB ###
-        - first modify the data for all lines corresponding to OD entries originating from HQ entry corrections
+        - first modify the data for all lines corresponding to entries originating from HQ entry corrections
         - then call OCB method on the new data to change first column for the DB ID
         """
         new_data = self._handle_od_ji_entries(cr, uid, data)  # we handle account move lines
@@ -162,7 +162,7 @@
         """
         ##### WARNING #####
         ### THIS CALLS THE METHOD postprocess_add_db_id FROM OCB ###
-        - first modify the data for all lines corresponding to OD entries originating from HQ entry corrections
+        - first modify the data for all lines corresponding to entries originating from HQ entry corrections
         - then call OCB method on the new data to change first column for the DB ID
         """
         new_data = self._handle_od_aji_entries(cr, uid, data)  # we handle account analytic lines
@@ -341,7 +341,7 @@
             # Pay attention to take analytic lines that are not on HQ, MIGRATION, IN-KIND and ODX journals.
             'rawdata': """
                 SELECT al.id, SUBSTR(i.code, 1, 3),
-                       CASE WHEN j.code = 'OD' THEN j.code ELSE aj.code END AS journal,
+                       CASE WHEN j.code IN ('OD', 'ODHQ') THEN j.code ELSE aj.code END AS journal,
                        al.entry_sequence, al.name, al.ref, al.document_date, al.date,
                        a.code, al.partner_txt, aa.code AS dest, aa2.code AS cost_center_id, aa3.code AS funding_pool, 
                        CASE WHEN al.amount_currency < 0 AND aml.is_addendum_line = 'f' THEN ABS(al.amount_currency) ELSE 0.0 END AS debit, 
@@ -350,7 +350,7 @@
                        CASE WHEN al.amount < 0 THEN ABS(ROUND(al.amount, 2)) ELSE 0.0 END AS debit, 
                        CASE WHEN al.amount > 0 THEN ROUND(al.amount, 2) ELSE 0.0 END AS credit,
                        cc.name AS "functional_currency", hr.identification_id as "emplid", aml.partner_id, hr.name_resource as hr_name,
-                       CASE WHEN j.code = 'OD' THEN j.type ELSE aj.type END AS journal_type
+                       CASE WHEN j.code IN ('OD', 'ODHQ') THEN j.type ELSE aj.type END AS journal_type
                 FROM account_analytic_line AS al, 
                      account_account AS a, 
                      account_analytic_account AS aa,