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

[jftempo]

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2018-08-14 16:05:39 +0000
+++ bin/addons/account/account_view.xml	2018-10-16 13:04:48 +0000
@@ -2650,12 +2650,12 @@
                         <page string="CashBox">
                             <group col="2" colspan="2" expand="1">
                                 <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','draft')]}">
-                                    <tree string = "Opening Balance" editable="bottom">
+                                    <tree string="Starting Balance" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal" sum="Total"/>
                                     </tree>
-                                    <form string = "Opening Balance">
+                                    <form string="Starting Balance">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal"/>
@@ -2688,8 +2688,8 @@
                             <field name="closing_date" select="1" readonly="1"/>
                         </group>
                         <group col="2" colspan="2">
-                            <separator string="Opening Balance" colspan="4"/>
-                            <field name="balance_start" readonly="1" string="Opening Balance"/>
+                            <separator string="Starting Balance" colspan="4"/>
+                            <field name="balance_start" readonly="1" string="Starting Balance"/>
                             <field name="total_entry_encoding"/>
                         </group>
                         <group col="2" colspan="2">

=== modified file 'bin/addons/account/report/account_liquidity_balance.mako'
--- bin/addons/account/report/account_liquidity_balance.mako	2017-05-31 13:57:26 +0000
+++ bin/addons/account/report/account_liquidity_balance.mako	2018-10-16 13:04:48 +0000
@@ -165,7 +165,7 @@
     <Data ss:Type="String">${_('Period')}</Data>
 </Cell>
 <Cell ss:StyleID="ssHeader">
-    <Data ss:Type="String">${_('Opening balance')}</Data>
+    <Data ss:Type="String">${_('Starting balance')}</Data>
 </Cell>
 <Cell ss:StyleID="ssHeader">
     <Data ss:Type="String">${_('Calculated balance')}</Data>

=== modified file 'bin/addons/account_corrections/account_move_line.py'
--- bin/addons/account_corrections/account_move_line.py	2018-09-06 09:03:25 +0000
+++ bin/addons/account_corrections/account_move_line.py	2018-10-16 13:04:48 +0000
@@ -582,12 +582,27 @@
             success_move_ids.append(new_move_id)
         return success_move_line_ids, success_move_ids
 
-    def update_account_on_st_line(self, cr, uid, ids, account_id=None, context=None):
-        """
-        Update the account from the statement line attached if different
-        """
-        # Some verifications
-        if not context:
+    def _get_third_party_fields(self, third_party):
+        """
+        Returns the partner_id, employee_id, transfer_journal_id corresponding to the third_party in parameter
+        """
+        partner_id = False
+        employee_id = False
+        transfer_journal_id = False
+        if third_party:
+            if third_party._table_name == 'res.partner':
+                partner_id = third_party.id
+            elif third_party._table_name == 'hr.employee':
+                employee_id = third_party.id
+            elif third_party._table_name == 'account.journal':
+                transfer_journal_id = third_party.id
+        return partner_id, employee_id, transfer_journal_id
+
+    def update_st_line(self, cr, uid, ids, account_id=None, context=None):
+        """
+        Update the account of the statement line
+        """
+        if context is None:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -595,6 +610,7 @@
             raise osv.except_osv(_('Warning'), _('No account_id given. No update on account will be done.'))
         # Prepare some values
         absl_obj = self.pool.get('account.bank.statement.line')
+        cor_vals = {'account_id': account_id}
         # Update lines
         for ml in self.browse(cr, uid, ids, context=context):
             # in order to update hard posted line (that's forbidden!), we use a tip: add from_correction in context
@@ -607,22 +623,28 @@
                     # US-303: only update the statement line that links to this move line
                     if st_line.cash_return_move_line_id:
                         if st_line.cash_return_move_line_id.id == ml.id:
-                            absl_obj.write(cr, uid, [st_line.id], {'account_id': account_id}, context=context)
+                            absl_obj.write(cr, uid, [st_line.id], cor_vals, context=context)
                             # we informs new move line that it have correct a statement line
                             self.write(cr, uid, corrected_line_ids, {'corrected_st_line_id': st_line.id}, context=context)
                             break
                     elif not st_line.from_cash_return: #US-1044: only update the account on line if the regline is not cash return!
                         #US-303: If not the case, then we inform the new move line that it has corrected a statement line
-                        absl_obj.write(cr, uid, [st_line.id], {'account_id': account_id}, context=context)
+                        absl_obj.write(cr, uid, [st_line.id], cor_vals, context=context)
                         self.write(cr, uid, corrected_line_ids, {'corrected_st_line_id': st_line.id}, context=context)
             # if not, this move line should have a direct link to a register line
             elif ml.statement_id and ml.corrected_st_line_id:
-                absl_obj.write(cr, uid, [ml.corrected_st_line_id.id], {'account_id': account_id}, context=context)
+                absl_obj.write(cr, uid, [ml.corrected_st_line_id.id], cor_vals, context=context)
         return True
 
-    def correct_account(self, cr, uid, ids, date=None, new_account_id=None, distrib_id=False, context=None):
+    def correct_aml(self, cr, uid, ids, date=None, new_account_id=None, distrib_id=False, new_third_party=None, context=None):
         """
-        Correct given account_move_line by only changing account
+        Corrects the G/L account and/or the Third Party of the JIs having their ids in param.
+        Generates the related REV/COR lines.
+
+        /!\ WARNING /!\
+        new_third_party is a partner_type, i.e. it can be a res.partner, hr.employee... If it is None (= no 3d party
+        passed as a parameter): no change regarding 3d Party should be made, whereas if it is False/empty/browse_null,
+        the COR line must have an empty Third Party.
         """
         # Verification
         if not context:
@@ -638,6 +660,7 @@
         move_obj = self.pool.get('account.move')
         j_obj = self.pool.get('account.journal')
         al_obj = self.pool.get('account.analytic.line')
+        wiz_obj = self.pool.get('wizard.journal.items.corrections')
         success_move_line_ids = []
 
         # New account
@@ -680,8 +703,8 @@
                 not initial_al_ids and new_account and \
                     new_account.is_analytic_addicted:
                 # we check only if no distrib_id arg passed to function
-                msg = _("The line '%s' with new account '%s - %s' need an" \
-                        " analytic distribution (you may have changed account from" \
+                msg = _("The line '%s' with the new account '%s - %s' needs an" \
+                        " analytic distribution (you may have changed the account from" \
                         " one with no AD required to a new one with AD required).")
                 raise osv.except_osv(_('Error'), msg % (ml.move_id.name,
                                                         new_account.code, new_account.name, ))
@@ -711,7 +734,8 @@
             for aal in self.pool.get('account.analytic.line').browse(cr, uid, aal_ids):
                 check_accounts = self.pool.get('account.analytic.account').is_blocked_by_a_contract(cr, uid, [aal.account_id.id])
                 if check_accounts and aal.account_id.id in check_accounts:
-                    raise osv.except_osv(_('Warning'), _('You cannot change the G/L account since it is used in a closed financing contract.'))
+                    raise osv.except_osv(_('Warning'), _('You cannot change this entry since one of its accounts is '
+                                                         'used in a closed financing contract.'))
             # (US-815) use the right period for December HQ Entries
             period_id_dec_hq_entry = False
             if period_number == 12 and context.get('period_id_for_dec_hq_entries', False):
@@ -765,13 +789,31 @@
                 cor_vals['analytic_distribution_id'] = distrib_id
             elif ml.analytic_distribution_id:
                 cor_vals['analytic_distribution_id'] = self.pool.get('analytic.distribution').copy(cr, uid, ml.analytic_distribution_id.id, {}, context=context)
+            if new_third_party is not None:  # if None: no correction on Third Party should be made
+                new_partner_id, new_employee_id, new_transfer_journal_id = self._get_third_party_fields(new_third_party)
+                cor_vals.update({
+                    'partner_id': new_partner_id,
+                    'employee_id': new_employee_id,
+                    'transfer_journal_id': new_transfer_journal_id,
+                })
+                # if no Third Party: reset partner_txt (this field is automatically updated only when there is one)
+                if not new_partner_id and not new_employee_id and not new_transfer_journal_id:
+                    cor_vals['partner_txt'] = ''
+            # set the partner_type_mandatory tag
+            third_required = False
+            if new_account.type_for_register in ['advance', 'down_payment', 'payroll', 'transfer', 'transfer_same']:
+                third_required = True
+            cor_vals['partner_type_mandatory'] = third_required
             self.write(cr, uid, [correction_line_id], cor_vals, context=context, check=False, update_check=False)
+            # check the account compatibility with the Third Party on the COR line created
+            correction_line = self.browse(cr, uid, correction_line_id, context=context)
+            wiz_obj._check_account_partner_compatibility(cr, uid, new_account, correction_line, context)
             # UF-2231: Remove the update to the statement line
             # Update register line if exists
 
             # UFTP-119: Reverted a code that has been commented out in UF-2231 without explanation, and which caused the problem of updating back the Reg line
             if ml.statement_id:
-                self.update_account_on_st_line(cr, uid, [ml.id], new_account_id, context=context)
+                self.update_st_line(cr, uid, [ml.id], account_id=new_account_id, context=context)
             # Inform old line that it have been corrected
             self.write(cr, uid, [ml.id], {'corrected': True, 'have_an_historic': True,}, context=context, check=False, update_check=False)
             # Post the move
@@ -804,101 +846,11 @@
             self.corrected_upstream_marker(cr, uid, [ml.id], context=context)
         return success_move_line_ids
 
-    def correct_partner_id(self, cr, uid, ids, date=None, partner_id=None, context=None):
-        """
-        Correct given entries in order to change its partner_id:
-         - do a reverse line for partner line
-         - do a correction line for new partner
-        """
-        # Verifications
-        if not context:
-            context = {}
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        if not date:
-            date = strftime('%Y-%m-%d')
-        if not partner_id:
-            raise osv.except_osv(_('Error'), _('No new partner_id given!'))
-        # Prepare some values
-        j_obj = self.pool.get('account.journal')
-        move_obj = self.pool.get('account.move')
-        success_move_line_ids = []
-        # 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
-        # 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
-        # Search attached period
-        period_ids = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)],
-                                                            context=context, limit=1, order='date_start, name')
-        # Correct all given move lines
-        for ml in self.browse(cr, uid, ids, context=context):
-            # Search the move line (in the move) to be changed (account that have a payable OR a receivable account)
-            move_line = None
-            for line in ml.move_id.line_id:
-                if line.account_id.type == 'payable' or line.account_id.type == 'receivable':
-                    move_line = line
-                    break
-            # If no move line found or move line has been corrected, continue process
-            if not move_line or move_line.corrected:
-                continue
-            # Retrieve journal. If account is inkind, so use extra-accounting journal, otherwise use correction journal
-            journal_id = j_corr_id
-            if ml.account_id.type_for_register == 'donation':
-                journal_id = j_extra_id
-                if not journal_id:
-                    raise osv.except_osv(_('Error'), _('No OD-Extra Accounting Journal found!'))
-            if not journal_id:
-                raise osv.except_osv(_('Error'), _('No correction journal found!'))
-            # Create a new move
-            move_id = move_obj.create(cr, uid,{'journal_id': journal_id, 'period_id': period_ids[0], 'date': date}, context=context)
-            # Search the new attached account_id
-            partner_type = 'res.partner,%s' % partner_id
-            account_vals = self.pool.get('account.bank.statement.line').onchange_partner_type(cr, uid, [], partner_type, move_line.credit,
-                                                                                              move_line.debit, context=context)
-            if not 'value' in account_vals and not account_vals.get('value').get('account_id', False):
-                raise osv.except_osv(_('Error'), _('No account found for this partner!'))
-            account_id = account_vals.get('value').get('account_id')
-            # Prepare default value for new line
-            vals = {
-                'move_id': move_id,
-                'date': date,
-                'journal_id': journal_id,
-                'period_id': period_ids[0],
-                'source_date': ml.date,
-            }
-            # Copy the line
-            rev_line_id = self.copy(cr, uid, move_line.id, vals, context=context)
-            correction_line_id = self.copy(cr, uid, move_line.id, vals, context=context)
-            # Do the reverse
-            name = self.join_without_redundancy(move_line.name, 'REV')
-            amt = -1 * move_line.amount_currency
-            vals.update({
-                'debit': move_line.credit,
-                'credit': move_line.debit,
-                'amount_currency': amt,
-                'journal_id': journal_id,
-                'name': name,
-                'reversal_line_id': move_line.id,
-                'account_id': move_line.account_id.id,
-            })
-            self.write(cr, uid, [rev_line_id], vals, context=context)
-            # Do the correction line
-            name = self.join_without_redundancy(move_line.name, 'COR')
-            self.write(cr, uid, [correction_line_id], {'name': name, 'journal_id': journal_id, 'corrected_line_id': move_line.id,
-                                                       'account_id': account_id, 'partner_id': partner_id, 'have_an_historic': True,}, context=context)
-            # Inform old line that it have been corrected
-            self.write(cr, uid, [move_line.id], {'corrected': True, 'have_an_historic': True,}, context=context)
-            # Post the move
-            move_obj.post(cr, uid, [move_id], context=context)
-            # Reconcile the line with its reversal
-            self.reconcile_partial(cr, uid, [line.id, rev_line_id], context=context)
-            # Add this line to succeded lines
-            success_move_line_ids.append(move_line.id)
-        return success_move_line_ids
+    def correct_account(self, cr, uid, aml_ids, date=None, new_account_id=None, distrib_id=False, context=None):
+        """
+        Corrects the G/L account (only) of the amls
+        """
+        return self.correct_aml(cr, uid, aml_ids, date=date, new_account_id=new_account_id, distrib_id=distrib_id, context=context)
 
     def corrected_upstream_marker(self, cr, uid, ids, context=None):
         """

=== modified file 'bin/addons/account_corrections/account_wizard_view.xml'
--- bin/addons/account_corrections/account_wizard_view.xml	2017-10-04 08:22:01 +0000
+++ bin/addons/account_corrections/account_wizard_view.xml	2018-10-16 13:04:48 +0000
@@ -15,7 +15,13 @@
                     <field name="account_id"
                         domain="[('restricted_area', '=', 'correction_wizard')]"
                         attrs="{'readonly': [('is_account_correctible', '=', False)]}"
+                        on_change="onchange_correction_line_account_id(account_id, partner_type)"
                     />
+                    <field name="partner_txt_only" invisible="1"/>
+                    <field name="partner_type_mandatory" invisible="1"/>
+                    <field name="partner_type"
+                           attrs="{'required': [('partner_type_mandatory', '=', True)],
+                                   'readonly': ['|', ('partner_txt_only', '=', True), ('is_account_correctible', '=', False)]}"/>
                     <button name="button_analytic_distribution" type="object"
                             icon="terp-stock_symbol-selection" string="Ana. Distri."
                             attrs="{'invisible': [('is_analytic_target', '=', False)]}" />

=== modified file 'bin/addons/account_corrections/wizard/analytic_distribution_wizard.py'
--- bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2018-05-29 08:49:55 +0000
+++ bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2018-10-16 13:04:48 +0000
@@ -34,7 +34,11 @@
         'date': fields.date(string="Date", help="This date is taken from analytic distribution corrections"),
         'state': fields.selection([('draft', 'Draft'), ('cc', 'Cost Center only'), ('dispatch', 'All other elements'), ('done', 'Done'),
                                    ('correction', 'Correction')], string="State", required=True, readonly=True),
-        'old_account_id': fields.many2one('account.account', "New account given by correction wizard", readonly=True),
+        'old_account_id': fields.many2one('account.account', "Original account of the line to be corrected", readonly=True),
+        'old_partner_id': fields.many2one('res.partner', "Original partner of the line to be corrected", readonly=True),
+        'old_employee_id': fields.many2one('hr.employee', "Original employee of the line to be corrected", readonly=True),
+        'new_partner_id': fields.many2one('res.partner', "New partner selected in the correction wizard", readonly=True),
+        'new_employee_id': fields.many2one('hr.employee', "New employee selected in the correction wizard", readonly=True),
     }
 
     _defaults = {
@@ -593,14 +597,14 @@
         if to_reverse or to_override or to_create:
             self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [ml.id], context=context)
 
-        if context and 'ji_correction_account_changed' in context:
+        if context and 'ji_correction_account_or_tp_changed' in context:
             if (any_reverse or to_reverse) and \
-                    not context['ji_correction_account_changed']:
+                    not context['ji_correction_account_or_tp_changed']:
                 # BKLG-12 pure AD correction flag marker
                 # (do this bypassing model write)
                 return osv.osv.write(self.pool.get('account.move.line'), cr,
                                      uid, [ml.id], {'last_cor_was_only_analytic': True})
-            del context['ji_correction_account_changed']
+            del context['ji_correction_account_or_tp_changed']
 
     def button_cancel(self, cr, uid, ids, context=None):
         """
@@ -643,15 +647,17 @@
                 # Do some verifications before writing elements
                 self.wizard_verifications(cr, uid, wiz.id, context=context)
                 # Verify old account and new account
-                account_changed = False
+                account_or_tp_changed = False
                 new_account_id = wiz.account_id and wiz.account_id.id or False
                 old_account_id = wiz.old_account_id and wiz.old_account_id.id or False
-                if old_account_id != new_account_id:
-                    account_changed = True
+                new_tp = wiz.new_partner_id or wiz.new_employee_id or False
+                old_tp = wiz.old_partner_id or wiz.old_employee_id or False
+                if (old_account_id != new_account_id) or (new_tp != old_tp):
+                    account_or_tp_changed = True
 
-                # Account AND/OR Distribution have changed
-                context['ji_correction_account_changed'] = account_changed
-                if account_changed:
+                # Account and/or Third Party AND/OR Distribution have changed
+                context['ji_correction_account_or_tp_changed'] = account_or_tp_changed
+                if account_or_tp_changed:
                     # Create new distribution
                     new_distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {})
                     # Write current distribution to the new one

=== modified file 'bin/addons/account_corrections/wizard/journal_items_corrections.py'
--- bin/addons/account_corrections/wizard/journal_items_corrections.py	2018-06-21 13:48:36 +0000
+++ bin/addons/account_corrections/wizard/journal_items_corrections.py	2018-10-16 13:04:48 +0000
@@ -77,6 +77,132 @@
                 res[line_br.id] = False
         return res
 
+    def _get_third_parties(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        """
+        Gets the right Third Parties based on:
+        - the partner / employee of the line if any (Journal 3d Party is excluded)
+        - or on the line account type
+        """
+        res = {}
+        if context is None:
+            context = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.employee_id:
+                res[line.id] = {'third_parties': 'hr.employee,%s' % line.employee_id.id}
+                res[line.id]['partner_type'] = {'options': [('hr.employee', 'Employee')],
+                                                'selection': 'hr.employee,%s' % line.employee_id.id}
+            elif line.partner_id:
+                res[line.id] = {'third_parties': 'res.partner,%s' % line.partner_id.id}
+                res[line.id]['partner_type'] = {'options': [('res.partner', 'Partner')],
+                                                'selection': 'res.partner,%s' % line.partner_id.id}
+            else:
+                res[line.id] = {'third_parties': False}
+                if line.account_id:
+                    acc_type = line.account_id.type_for_register
+                    if acc_type == 'advance':
+                        third_type = [('hr.employee', 'Employee')]
+                        third_selection = 'hr.employee,'
+                    elif acc_type == 'down_payment':
+                        third_type = [('res.partner', 'Partner')]
+                        third_selection = 'res.partner,'
+                    else:
+                        # by default when no restriction and for the "payroll" type
+                        third_type = [('res.partner', 'Partner'), ('hr.employee', 'Employee')]
+                        third_selection = 'res.partner,'
+                    res[line.id]['partner_type'] = {'options': third_type, 'selection': third_selection}
+        return res
+
+    def _set_third_parties(self, cr, uid, obj_id, name=None, value=None, fnct_inv_arg=None, context=None):
+        """
+        Sets the chosen 3d Party to the wizard line (can be: a partner, an employee, or empty)
+        """
+        if context is None:
+            context = {}
+        if name == 'partner_type':
+            employee_id = False
+            partner_id = False
+            element = False
+            if value:
+                fields = value.split(",")
+                element = fields[0]
+            if element == 'hr.employee':
+                employee_id = fields[1] and int(fields[1]) or False
+            elif element == 'res.partner':
+                partner_id = fields[1] and int(fields[1]) or False
+            vals = {
+                'employee_id': employee_id,
+                'partner_id': partner_id,
+            }
+            self.write(cr, uid, obj_id, vals, context=context)
+        return True
+
+    def _get_partner_txt_only(self, cr, uid, ids, name, args, context=None):
+        """
+        True if the JI to be corrected has got a partner_txt without any partner/employee/transfer_journal
+        Ex.: coordo line with an internal partner synched to HQ
+        """
+        res = {}
+        if not ids:
+            return res
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if context is None:
+            context = {}
+        for corr_line in self.browse(cr, uid, ids, fields_to_fetch=['move_line_id'], context=context):
+            res[corr_line.id] = False
+            aml = corr_line.move_line_id
+            if aml.partner_txt and not (aml.partner_id or aml.employee_id or aml.transfer_journal_id):
+                res[corr_line.id] = True
+        return res
+
+    def onchange_correction_line_account_id(self, cr, uid, ids, account_id=False, current_tp=False):
+        """
+        Adapts the "Third Parties" selectable on the wizard line according to the account selected
+        """
+        vals = {}
+        warning = {}
+        if isinstance(account_id, (list, tuple)):
+            account_id = account_id[0]
+        acc_obj = self.pool.get('account.account')
+        if account_id:
+            third_type = [('res.partner', 'Partner'), ('hr.employee', 'Employee')]
+            third_required = False
+            third_selection = 'res.partner,0'
+            account = acc_obj.browse(cr, uid, account_id, fields_to_fetch=['code', 'name', 'type_for_register'])
+            acc_type = account.type_for_register
+            if acc_type in ['transfer', 'transfer_same']:  # requires a journal 3d party on which corr. are forbidden
+                warning = {
+                    'title': _('Warning!'),
+                    'message': _('The account %s - %s requires a Journal Third Party.') % (account.code, account.name)
+                }
+                vals.update({'account_id': False})  # empty the account
+                third_type = [('res.partner', 'Partner'), ('hr.employee', 'Employee')]
+                third_required = False
+                third_selection = 'res.partner,0'
+            elif acc_type == 'advance':
+                third_type = [('hr.employee', 'Employee')]
+                third_required = True
+                third_selection = 'hr.employee,0'
+            elif acc_type == 'down_payment':
+                third_type = [('res.partner', 'Partner')]
+                third_required = True
+                third_selection = 'res.partner,0'
+            elif acc_type == 'payroll':
+                third_type = [('res.partner', 'Partner'), ('hr.employee', 'Employee')]
+                third_required = True
+                third_selection = 'res.partner,0'
+            # keep the current Third Party if it is compatible with the new account selected
+            if current_tp:
+                current_tp_type = current_tp.split(',')[0]  # ex: 'res.partner'
+                for th_type in third_type:
+                    if current_tp_type == th_type[0]:
+                        third_selection = current_tp
+                        continue
+            vals.update({'partner_type_mandatory': third_required,
+                         'partner_type': {'options': third_type,
+                                          'selection': third_selection}})
+        return {'value': vals, 'warning': warning}
+
     _columns = {
         'move_line_id': fields.many2one('account.move.line', string="Account move line", readonly=True, required=True),
         'wizard_id': fields.many2one('wizard.journal.items.corrections', string="wizard"),
@@ -100,12 +226,25 @@
         'is_account_correctible': fields.function(_get_is_account_correctible,
                                                   type='boolean', string='Is account correctible',
                                                   method=True, invisible=True),
+        'partner_type': fields.function(_get_third_parties, fnct_inv=_set_third_parties, type='reference', method=True,
+                                        string="Third Parties", readonly=False,
+                                        selection=[('res.partner', 'Partner'), ('hr.employee', 'Employee')],
+                                        multi="third_parties_key"),
+        'partner_type_mandatory': fields.boolean('Third Party Mandatory'),
+        'third_parties': fields.function(_get_third_parties, type='reference', method=True,
+                                         string="Third Parties",
+                                         selection=[('res.partner', 'Partner'), ('hr.employee', 'Employee')],
+                                         help="To use for python code when registering", multi="third_parties_key"),
+        'partner_txt_only': fields.function(_get_partner_txt_only, type='boolean', method=True, invisible=True,
+                                            string='Has a "partner_txt" without any related partner/employee/transfer journal',
+                                            help="The Third Party of the line to be corrected hasn't been synched to this instance"),
     }
 
     _defaults = {
         'from_donation': lambda *a: False,
         'is_analytic_target': lambda *a: False,
         'is_account_correctible': lambda *a: True,
+        'partner_type_mandatory': lambda *a: False,
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -152,10 +291,14 @@
             'move_line_id': wiz.move_line_id and wiz.move_line_id.id,
             'currency_id': currency or False,
             'old_account_id': wiz.move_line_id and wiz.move_line_id.account_id and wiz.move_line_id.account_id.id or False,
+            'old_partner_id': wiz.move_line_id and wiz.move_line_id.partner_id and wiz.move_line_id.partner_id.id or False,
+            'old_employee_id': wiz.move_line_id and wiz.move_line_id.employee_id and wiz.move_line_id.employee_id.id or False,
             'distribution_id': distrib_id,
             'state': 'dispatch', # Be very careful, if this state is not applied when creating wizard => no lines displayed
             'date': wiz.date or strftime('%Y-%m-%d'),
             'account_id': this_line.account_id and this_line.account_id.id or False,
+            'new_partner_id': this_line.partner_id and this_line.partner_id.id or False,
+            'new_employee_id': this_line.employee_id and this_line.employee_id.id or False,
             'document_date': wiz.move_line_id.document_date,
             'posting_date': wiz.date or wiz.move_line_id.date,
         }
@@ -257,7 +400,7 @@
                 'partner_id': move_line.partner_id and move_line.partner_id.id or None,
                 'employee_id': move_line.employee_id and move_line.employee_id.id or None,
                 'transfer_journal_id': move_line.transfer_journal_id and move_line.transfer_journal_id.id or None,
-                #                'partner_type_mandatory': move_line.partner_type_mandatory or None,
+                'partner_type_mandatory': move_line.partner_type_mandatory or False,
                 'analytic_distribution_id': move_line.analytic_distribution_id and move_line.analytic_distribution_id.id or None,
             }
             self.pool.get('wizard.journal.items.corrections.lines').create(cr, uid, corrected_line_vals, context=context)
@@ -265,14 +408,12 @@
 
     def compare_lines(self, cr, uid, old_line_id=None, new_line_id=None, context=None):
         """
-        Compare an account move line to a wizard journal items corrections lines regarding 3 fields:
+        Compare an account move line to a wizard journal items corrections line regarding 2 fields:
          - account_id (1)
          - partner_type (partner_id, employee_id or transfer_journal_id) (2)
-         - analytic_distribution_id (4)
         Then return the sum.
         """
-        # Verifications
-        if not context:
+        if context is None:
             context = {}
         if not old_line_id or not new_line_id:
             raise osv.except_osv(_('Error'), _('An ID is missing!'))
@@ -284,23 +425,12 @@
         # Fields
         old_account = old_line.account_id and old_line.account_id.id or False
         new_account = new_line.account_id and new_line.account_id.id or False
-        old_partner = old_line.partner_id and old_line.partner_id.id or False
-        new_partner = new_line.partner_id and new_line.partner_id.id or False
-        old_distrib = old_line.analytic_distribution_id and old_line.analytic_distribution_id.id or False
-        new_distrib = new_line.analytic_distribution_id and new_line.analytic_distribution_id.id or False
+        old_third_party = old_line.partner_id or old_line.employee_id or old_line.transfer_journal_id or False
+        new_third_party = new_line.partner_id or new_line.employee_id or new_line.transfer_journal_id or False
         if cmp(old_account, new_account):
             res += 1
-        if cmp(old_partner, new_partner): # FIXME !!!!! or cmp(old_line.employee_id, new_line.employee_id) or
-            # cmp(old_line.register_id, new_line.register_id):
+        if cmp(old_third_party, new_third_party):
             res += 2
-        if cmp(old_distrib, new_distrib):
-            # UFTP-1187
-            if old_line.account_id.is_analytic_addicted and \
-                    new_account.account_id.is_analytic_addicted:
-                # tolerate this diff (no +4)
-                # if we correct an account with no AD required to a new account
-                # with AD required or from AD required to no AD
-                res += 4
         return res
 
     # UF-2056: Delete reverse button
@@ -330,7 +460,7 @@
         """
         Check the compatibility between the account and the aml Third Party: raise a warning if they are not compatible.
         :param account: new account selected in the Correction Wizard
-        :param aml: Journal Item to be corrected
+        :param aml: Journal Item with the Third Party to check
         """
         acc_obj = self.pool.get('account.account')
         acc_type = account.type_for_register
@@ -408,25 +538,17 @@
         new_lines = wizard.to_be_corrected_ids
         # compare lines
         comparison = self.compare_lines(cr, uid, old_line.id, new_lines[0].id, context=context)
-        # Result
-        res = [] # no result yet
-        # Correct account
-        if comparison == 1:
-            self._check_account_partner_compatibility(cr, uid, new_lines[0].account_id, old_line, context)
-            res = aml_obj.correct_account(cr, uid, [old_line.id], wizard.date, new_lines[0].account_id.id, distrib_id, context=context)
+        if 1 <= comparison <= 3:  # corr. on account and 3d Party are currently handled the same way (REV/COR generated)
+            if new_lines[0].partner_txt_only:
+                # prevent change on 3d Party if the 3d Party of the initial line hasn't been synched to the current
+                # instance (=> only partner_txt exists)
+                new_tp = None
+            else:
+                new_tp = new_lines[0].partner_type
+            res = aml_obj.correct_aml(cr, uid, [old_line.id], wizard.date, new_lines[0].account_id.id, distrib_id,
+                                      new_third_party=new_tp, context=context)
             if not res:
-                raise osv.except_osv(_('Error'), _('No account changed!'))
-        # Correct third parties
-        elif comparison == 2:
-            if not old_line.statement_id:
-                res = aml_obj.correct_partner_id(cr, uid, [old_line.id], wizard.date, new_lines[0].partner_id.id, context=context)
-                if not res:
-                    raise osv.except_osv(_('Error'),
-                                         _('No partner changed! Verify that the Journal Entries attached to this line was not modify previously.'))
-        elif comparison == 4:
-            raise osv.except_osv('Warning', 'Do analytic distribution reallocation here!')
-        elif comparison in [3, 5, 7]:
-            raise osv.except_osv(_('Error'), _("You're just allowed to change ONE field amongst Account, Third Party or Analytical Distribution"))
+                raise osv.except_osv(_('Error'), _('No change made!'))
         else:
             raise osv.except_osv(_('Warning'), _('No modifications seen!'))
         return {'type': 'ir.actions.act_window_close', 'success_move_line_ids': res}

=== modified file 'bin/addons/account_override/account_bank_statement.py'
--- bin/addons/account_override/account_bank_statement.py	2016-06-13 14:57:53 +0000
+++ bin/addons/account_override/account_bank_statement.py	2018-10-16 13:04:48 +0000
@@ -61,7 +61,11 @@
     _columns = {
         'ref': fields.char('Reference', size=50), # UF-1613 - add reference field from 32 to 50 chars
         'invoice_id': fields.many2one('account.invoice', "Invoice", required=False),
+        # NOTE: partner_move_ids is used for old entries until US-3874. Since then, entries use partner_move_line_ids.
         'partner_move_ids': fields.one2many('account.move', 'register_line_id', 'Payable Entries', readonly=True, required=False),
+        'partner_move_line_ids': fields.one2many('account.move.line', 'partner_register_line_id', 'Automated Entries',
+                                                 readonly=True, required=False,
+                                                 help="Automated entries generated for expense/income register lines linked to a partner"),
     }
 
 account_bank_statement_line()

=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2018-06-27 14:28:34 +0000
+++ bin/addons/account_override/account_move_line.py	2018-10-16 13:04:48 +0000
@@ -343,6 +343,9 @@
         'revaluation_date': fields.datetime(string='Revaluation date'),
         'revaluation_reference': fields.char(string='Revaluation reference', size=64,
                                              help="Entry sequence of the related Revaluation Entry"),
+        # US-3874
+        'partner_register_line_id': fields.many2one('account.bank.statement.line', string="Register Line", required=False, readonly=True,
+                                                    help="Register line to which this partner automated entry is linked"),
     }
 
     _defaults = {
@@ -632,7 +635,7 @@
     def copy(self, cr, uid, aml_id, default=None, context=None):
         """
         When duplicate a JI, don't copy:
-        - the link to register lines
+        - the links to register lines
         - the reconciliation date
         - the unreconciliation date
         - the old reconciliation ref (unreconcile_txt)
@@ -645,6 +648,7 @@
             default = {}
         default.update({
             'imported_invoice_line_ids': [],
+            'partner_register_line_id': False,
             'reconcile_date': None,
             'unreconcile_date': None,
             'unreconcile_txt': '',

=== modified file 'bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py'
--- bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2017-09-27 12:38:56 +0000
+++ bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2018-10-16 13:04:48 +0000
@@ -1162,8 +1162,8 @@
                     correction = True
             # AD changed at header level: all JIs should recreate AJI
             # if an AD is set on a new line, this JI and all JIs in the same move can be valide
-            # if we change the G/L account, new JE will be created => no need to validate original JE
-            if not context.get('ji_correction_account_changed'):
+            # if we change the G/L account or Third Party, new JE will be created => no need to validate original JE
+            if not context.get('ji_correction_account_or_tp_changed'):
                 self.pool.get('account.move').validate(cr, uid, [move_id])
 
             # As analytic lines were deleted and recreated, we need to recreate links between reversal, corrections, etc.

=== modified file 'bin/addons/finance/cash_request.py'
--- bin/addons/finance/cash_request.py	2017-12-14 12:43:52 +0000
+++ bin/addons/finance/cash_request.py	2018-10-16 13:04:48 +0000
@@ -1241,7 +1241,7 @@
                               readonly=True),  # can be "Not Created" if the cheque reg. of the month is not created yet
         'period_id': fields.function(_period_id_compute, method=True, relation='account.period',
                                      type='many2one', string='Period', readonly=True, store=False),
-        'opening_balance': fields.float('Opening Balance in register currency', readonly=True,
+        'opening_balance': fields.float('Starting Balance in register currency', readonly=True,
                                         digits_compute=dp.get_precision('Account')),
         'calculated_balance_booking': fields.float('Calculated Balance in register currency', readonly=True,
                                                    digits_compute=dp.get_precision('Account')),

=== modified file 'bin/addons/finance/cash_request_view.xml'
--- bin/addons/finance/cash_request_view.xml	2017-12-08 14:47:02 +0000
+++ bin/addons/finance/cash_request_view.xml	2018-10-16 13:04:48 +0000
@@ -325,7 +325,7 @@
                         <field name="journal_name"/>
                         <field name="status"/>
                         <field name="period_id"/>
-                        <field name="opening_balance" sum="Total Opening Balance"/>
+                        <field name="opening_balance" sum="Total Starting Balance"/>
                         <field name="calculated_balance_booking" sum="Total Calculated Balance Booking"/>
                         <field name="cashbox_balance_booking" sum="Total Cashbox Balance Booking"/>
                         <field name="booking_currency_id"/>
@@ -348,7 +348,7 @@
                         <field name="journal_name"/>
                         <field name="status"/>
                         <field name="period_id"/>
-                        <field name="opening_balance" sum="Total Opening Balance"/>
+                        <field name="opening_balance" sum="Total Starting Balance"/>
                         <field name="calculated_balance_booking" sum="Total Calculated Balance Booking"/>
                         <field name="bank_statement_balance_booking" sum="Total Bank Statement Balance Booking"/>
                         <field name="booking_currency_id"/>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-09-27 16:17:57 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-10-16 13:04:48 +0000
@@ -4576,8 +4576,8 @@
 
 #. module: register_accounting
 #: view:wizard.register.opening.confirmation:0
-msgid "Register Opening Balance"
-msgstr "Solde d'Ouverture du Registre"
+msgid "Register Starting Balance"
+msgstr "Solde Initial du Registre"
 
 #. module: finance
 #: code:addons/finance/cash_request.py:276
@@ -7655,12 +7655,6 @@
 msgstr "Taxe de Remplacement"
 
 #. module: register_accounting
-#: code:addons/register_accounting/account_bank_statement.py:1807
-#, python-format
-msgid "No purchase journal found!"
-msgstr "No purchase journal found!"
-
-#. module: register_accounting
 #: report:bank.reconciliation:0
 #: report:cash.inventory:0
 msgid "Register closing date:"
@@ -12067,7 +12061,7 @@
 #. module: register_accounting
 #: report:bank.reconciliation:0
 msgid "Starting Balance:"
-msgstr "Solde d'ouverture:"
+msgstr "Solde Initial :"
 
 #. module: sync_so
 #: field:purchase.order,fo_sync_date:0
@@ -13849,8 +13843,8 @@
 #: field:cash.request.liquidity.cash,opening_balance:0
 #: field:cash.request.liquidity.cheque,opening_balance:0
 #: report:addons/register_accounting/report/liquidity_position_xls.mako:330
-msgid "Opening Balance in register currency"
-msgstr "Solde d'Ouverture dans la devise du registre"
+msgid "Starting Balance in register currency"
+msgstr "Solde Initial dans la devise du registre"
 
 #. module: kit
 #: model:ir.model,name:kit.model_kit_selection_sale_line
@@ -14692,7 +14686,7 @@
 #: view:cash.request:0
 #: view:cash.request.liquidity.bank:0
 msgid "Total Bank Statement Balance Functional"
-msgstr "Solde Total du Relevé Bancaire en Devise Fonc."
+msgstr "Solde Total Registre de Banque en Devise Fonc."
 
 #. module: sync_client
 #: field:sync.client.rule,owner_field:0
@@ -15951,12 +15945,6 @@
 msgid "Apply to lines"
 msgstr "Appliquer aux lignes"
 
-#. module: account_corrections
-#: code:addons/account_corrections/wizard/journal_items_corrections.py:422
-#, python-format
-msgid "No partner changed! Verify that the Journal Entries attached to this line was not modify previously."
-msgstr "No partner changed! Verify that the Journal Entries attached to this line was not modify previously."
-
 #. module: msf_tools
 #: code:addons/msf_tools/msf_tools.py:812
 #, python-format
@@ -16260,7 +16248,12 @@
 #. module: register_accounting
 #: report:cash.inventory:0
 msgid "CashBox Balance:"
-msgstr "Solde de Caisse "
+msgstr "Solde de Caisse :"
+
+#. module: register_accounting
+#: report:addons/register_accounting/report/fully_report_xls.mako:508
+msgid "Bank Statement balance:"
+msgstr "Solde Registre de Banque :"
 
 #. modules: msf_outgoing, specific_rules
 #: code:addons/msf_outgoing/wizard/picking_processor.py:952
@@ -19629,8 +19622,15 @@
 
 #. module: register_accounting
 #: report:cash.inventory:0
-msgid "Opening balance:"
-msgstr "Solde d'ouverture: "
+#: report:addons/register_accounting/report/fully_report_xls.mako:500
+msgid "Starting balance:"
+msgstr "Solde initial :"
+
+#. modules: register_accounting, account
+#: report:cash.inventory:0
+#: report:addons/account/report/account_liquidity_balance.mako:168
+msgid "Starting balance"
+msgstr "Solde initial"
 
 #. module: product_attributes
 #: field:product.product,kc_txt:0
@@ -26919,7 +26919,7 @@
 #. module: finance
 #: view:cash.request.liquidity.bank:0
 msgid "Total Bank Statement Balance Booking"
-msgstr "Solde Total du Relevé Bancaire en Devise d'Enreg."
+msgstr "Solde Total Registre de Banque en Devise d'Enreg."
 
 #. module: msf_partner
 #: view:res.partner:0
@@ -28248,7 +28248,7 @@
 #: field:cash.request.liquidity.bank,bank_statement_balance_functional:0
 #: report:addons/register_accounting/report/liquidity_position_xls.mako:352
 msgid "Bank Statement Balance in functional currency"
-msgstr "Solde du Relevé Bancaire en devise fonctionnelle"
+msgstr "Solde Registre de Banque en devise fonctionnelle"
 
 #. module: msf_instance
 #: help:res.company,instance_id:0
@@ -30098,11 +30098,6 @@
 msgid "Statement"
 msgstr "Relevé"
 
-#. module: account
-#: field:account.bank.statement,balance_start:0
-msgid "Starting Balance"
-msgstr "Solde Initial"
-
 #. module: financing_contract
 #: view:financing.contract.contract:0
 msgid "Contract information"
@@ -31135,12 +31130,6 @@
 msgid "Allocatable"
 msgstr "Attribuable"
 
-#. module: account_corrections
-#: code:addons/account_corrections/wizard/journal_items_corrections.py:426
-#, python-format
-msgid "You're just allowed to change ONE field amongst Account, Third Party or Analytical Distribution"
-msgstr "Vous ne pouvez changer qu'UN champ parmi:  Compte, Tiers, Allocation Analytique"
-
 #. module: financing_contract
 #: report:addons/financing_contract/report/financing_interactive_xls.mako:493
 msgid "Total Project - %used"
@@ -31863,10 +31852,10 @@
 msgstr "Field Order Line %s of %s has already been sourced from order. Impossible to forward the claim."
 
 #. module: account_corrections
-#: code:addons/account_corrections/wizard/journal_items_corrections.py:415
+#: code:addons/account_corrections/wizard/journal_items_corrections.py:551
 #, python-format
-msgid "No account changed!"
-msgstr "Pas de compte changé!"
+msgid "No change made!"
+msgstr "Aucun changement effectué !"
 
 #. modules: stock_override, stock
 #: help:stock.move,prodlot_id:0
@@ -37215,12 +37204,6 @@
 msgid "Chained Location Type"
 msgstr "Type de Zone Liée"
 
-#. module: account_corrections
-#: code:addons/account_corrections/account_move_line.py:863
-#, python-format
-msgid "No account found for this partner!"
-msgstr "Pas de compte trouvé pour ce partenaire!"
-
 #. module: base
 #: selection:res.config.users,context_tz:0
 #: selection:res.users,context_tz:0
@@ -43540,11 +43523,12 @@
 msgid "done - (sale.order.line)"
 msgstr "done - (sale.order.line)"
 
-#. modules: register_accounting, analytic_distribution
+#. modules: register_accounting, analytic_distribution, account_override
 #: field:analytic.distribution.wizard,register_line_id:0
 #: view:account.bank.statement.line:0
 #: field:wizard.transfer.with.change,absl_id:0
 #: field:account.direct.invoice.wizard,register_line_id:0
+#: field:account.move.line,partner_register_line_id:0
 msgid "Register Line"
 msgstr "Ligne de Registre"
 
@@ -45373,12 +45357,6 @@
 msgid "Partner Name"
 msgstr "Nom du Partenaire"
 
-#. module: account_corrections
-#: code:addons/account_corrections/account_move_line.py:821
-#, python-format
-msgid "No new partner_id given!"
-msgstr "Pas de nouveau partner_id fournie!"
-
 #. module: product_attributes
 #: view:product.where.used:0
 #: field:product.where.used,kit_ids:0
@@ -57373,8 +57351,8 @@
 
 #. module: register_accounting
 #: help:account.bank.statement,msf_calculated_balance:0
-msgid "Opening balance + Cash Transaction"
-msgstr "Solde initial + Transaction en espèce"
+msgid "Starting Balance + Cash Transactions"
+msgstr "Solde Initial + Transactions en espèces"
 
 #. module: msf_doc_import
 #: model:ir.model,name:msf_doc_import.model_purchase_line_import_xml_line
@@ -61587,8 +61565,8 @@
 
 #. module: register_accounting
 #: field:wizard.register.opening.confirmation,confirm_opening_balance:0
-msgid "Do you want to open the register with the following opening balance?"
-msgstr "Voulez-vous ouvrir le registre avec le solde d'ouverture suivant ?"
+msgid "Do you want to open the register with the following starting balance?"
+msgstr "Voulez-vous ouvrir le registre avec le solde initial suivant ?"
 
 #. module: msf_outgoing
 #: field:stock.move.memory.shipment.create,selected_weight:0
@@ -62141,8 +62119,9 @@
 #: view:account.bank.statement:0
 #: view:account.bank.statement:0
 #: field:wizard.register.opening.confirmation,opening_balance:0
-msgid "Opening Balance"
-msgstr "Solde d'ouverture"
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr "Solde Initial"
 
 #. module: msf_accrual
 #: code:addons/msf_accrual/wizard/wizard_accrual_validation.py:47
@@ -63887,10 +63866,10 @@
 msgstr "Format exécutif 4 7,5 x 10 pouces, 190,5 x 254 mm"
 
 #. module: register_accounting
-#: code:addons/register_accounting/account_bank_statement.py:1827
+#: code:addons/register_accounting/account_bank_statement.py:1821
 #, python-format
-msgid "The supplier seems not have an incorrect account.                         Please contact an accountant administrator to resolve this problem."
-msgstr "The supplier seems not have an incorrect account.                         Please contact an accountant administrator to resolve this problem."
+msgid "The supplier seems to have an incorrect account. Please contact an Accounting Administrator to solve this problem."
+msgstr "Le fournisseur semble avoir un compte incorrect. Veuillez contacter un Administrateur Finance pour résoudre ce problème."
 
 #. module: account_override
 #: field:account.move.line,reconcile_txt:0
@@ -66349,10 +66328,10 @@
 msgstr "Rapport Destruction"
 
 #. module: account_corrections
-#: code:addons/account_corrections/account_move_line.py:714
+#: code:addons/account_corrections/account_move_line.py:721
 #, python-format
-msgid "You cannot change the G/L account since it is used in a closed financing contract."
-msgstr "Vous ne pouvez pas modifier le compte du Grand livre parce qu'il est utilisé dans un contrat de financement clôturé."
+msgid "You cannot change this entry since one of its accounts is used in a closed financing contract."
+msgstr "Vous ne pouvez pas modifier cette écriture car l'un de ses comptes est utilisé dans un contrat de financement clôturé."
 
 #. modules: base_setup, unifield_setup, base
 #: selection:base.setup.company,country_id:0
@@ -68417,7 +68396,7 @@
 #: report:bank.reconciliation:0
 #: report:cash.inventory:0
 msgid "Gap:"
-msgstr "Écart"
+msgstr "Écart :"
 
 #. module: product_asset
 #: view:product.asset.event:0
@@ -69772,11 +69751,12 @@
 msgid "Taxes Report"
 msgstr "Rapport des Taxes"
 
-#. modules: account, register_accounting
+#. modules: account, register_accounting, account_corrections
 #: field:account.bank.statement.line,partner_type_mandatory:0
 #: field:account.move.line,partner_type_mandatory:0
 #: selection:account.journal.column,field:0
 #: field:wizard.register.import.lines,partner_type_mandatory:0
+#: field:wizard.journal.items.corrections.lines,partner_type_mandatory:0
 msgid "Third Party Mandatory"
 msgstr "Tiers Obligatoire"
 
@@ -70334,12 +70314,6 @@
 msgid "Confirmed sale order lines, not yet delivered"
 msgstr "Confirmed sale order lines, not yet delivered"
 
-#. modules: account, register_accounting
-#: report:addons/account/report/account_liquidity_balance.mako:168
-#: report:cash.inventory:0
-msgid "Opening balance"
-msgstr "Solde d'ouverture"
-
 #. module: product_attributes
 #: model:product.justification.code,code:product_attributes.justification_code_jme
 msgid "ME"
@@ -71081,9 +71055,14 @@
 msgstr "Solde de clôture"
 
 #. module: register_accounting
-#: report:addons/register_accounting/report/fully_report_xls.mako:508
+#: report:addons/register_accounting/report/fully_report_xls.mako:512
 msgid "Closing balance:"
-msgstr "Solde de clôture :"
+msgstr "Solde de Clôture :"
+
+#. module: register_accounting
+#: report:addons/register_accounting/report/fully_report_xls.mako:510
+msgid "CashBox balance:"
+msgstr "Solde de Caisse :"
 
 #. modules: account, finance, account_voucher, account_override, analytic, register_accounting, msf_doc_import
 #: report:account.account.balance:0
@@ -84287,7 +84266,7 @@
 #. module: register_accounting
 #: report:cash.inventory:0
 msgid "Theoretical balance:"
-msgstr "Solde théorique"
+msgstr "Solde théorique :"
 
 #. module: msf_config_locations
 #: model:ir.actions.act_window,name:msf_config_locations.action_configurable_location_setup
@@ -89453,9 +89432,10 @@
 msgid "From assigned to backorder."
 msgstr "De attribué à reliquat de commande."
 
-#. module: register_accounting
+#. modules: register_accounting, account_corrections
 #: help:account.bank.statement.line,third_parties:0
 #: help:account.move.line,third_parties:0
+#: help:wizard.journal.items.corrections.lines,third_parties:0
 msgid "To use for python code when registering"
 msgstr "A utiliser pour le code python lors de l'enregistrement"
 
@@ -93062,10 +93042,10 @@
 msgstr "Inscrire une date de début !"
 
 #. module: account_corrections
-#: code:addons/account_corrections/account_move_line.py:683
+#: code:addons/account_corrections/account_move_line.py:706
 #, python-format
-msgid "The line '%s' with new account '%s - %s' need an analytic distribution (you may have changed account from one with no AD required to a new one with AD required)."
-msgstr "The line '%s' with new account '%s - %s' need an analytic distribution (you may have changed account from one with no AD required to a new one with AD required)."
+msgid "The line '%s' with the new account '%s - %s' needs an analytic distribution (you may have changed the account from one with no AD required to a new one with AD required)."
+msgstr "La ligne '%s' avec le nouveau compte '%s - %s' a besoin d'une distribution analytique (il se peut que vous ayez passé la ligne d'un compte sans Distribution Analytique requise à un compte qui en requiert une)."
 
 #. module: product_attributes
 #: field:product.international.status,no_storage:0
@@ -93156,7 +93136,7 @@
 #: field:cash.request.liquidity.bank,bank_statement_balance_booking:0
 #: report:addons/register_accounting/report/liquidity_position_xls.mako:339
 msgid "Bank Statement Balance in register currency"
-msgstr "Solde du Relevé Bancaire dans la devise du registre"
+msgstr "Solde Registre de Banque dans la devise du registre"
 
 #. module: base
 #: selection:res.config.users,context_tz:0
@@ -94596,7 +94576,7 @@
 msgid "Additional Information"
 msgstr "Information Complémentaire"
 
-#. modules: account, register_accounting, account_mcdb, msf_homere_interface, msf_audittrail
+#. modules: account, register_accounting, account_mcdb, msf_homere_interface, msf_audittrail, account_corrections
 #: report:combined.journals.report.pdf:0
 #: report:addons/account_mcdb/report/combined_journals_report.mako:226
 #: field:hr.payroll.msf,partner_type:0
@@ -94606,6 +94586,8 @@
 #: field:account.move.line,partner_txt:0
 #: field:account.move.line,partner_type:0
 #: field:account.move.line,third_parties:0
+#: field:wizard.journal.items.corrections.lines,partner_type:0
+#: field:wizard.journal.items.corrections.lines,third_parties:0
 #: report:addons/register_accounting/report/cheque_inventory_xls.mako:169
 #: report:addons/register_accounting/report/open_advances_xls.mako:151
 #: report:addons/register_accounting/report/pending_cheque_xls.mako:225
@@ -98071,8 +98053,8 @@
 
 #. module: account_corrections
 #: field:analytic.distribution.wizard,old_account_id:0
-msgid "New account given by correction wizard"
-msgstr "Nouveau compte donné par l'assistant de correction "
+msgid "Original account of the line to be corrected"
+msgstr "Compte d'origine de la ligne à corriger"
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/account.py:139
@@ -98409,8 +98391,8 @@
 #. module: finance
 #: view:cash.request.liquidity.bank:0
 #: view:cash.request.liquidity.cash:0
-msgid "Total Opening Balance"
-msgstr "Total Solde d'Ouverture"
+msgid "Total Starting Balance"
+msgstr "Total Solde Initial"
 
 #. module: product_list
 #: field:old.product.list.line,removal_date:0
@@ -101091,11 +101073,6 @@
 msgstr "Cmpt"
 
 #. module: register_accounting
-#: report:addons/register_accounting/report/fully_report_xls.mako:500
-msgid "Starting balance:"
-msgstr "Solde d'ouverture:"
-
-#. module: register_accounting
 #: report:addons/register_accounting/report/fully_report_xls.mako:469
 msgid "REPORT"
 msgstr "RAPPORT"
@@ -101851,6 +101828,68 @@
 msgid " goods products, please refer to the appropriate procedures"
 msgstr " veuillez vous référer aux procédures adéquates."
 
+#. module: account_corrections
+#: code:addons/account_corrections/wizard/journal_items_corrections.py:157
+#, python-format
+msgid "The account %s - %s requires a Journal Third Party."
+msgstr "Le compte %s - %s requiert un Tiers de type Journal."
+
+#. module: account_corrections
+#: field:wizard.journal.items.corrections.lines,partner_txt_only:0
+msgid "Has a \"partner_txt\" without any related partner/employee/transfer journal"
+msgstr "A un \"partner_txt\" sans partenaire/employé/journal de transfert associé"
+
+#. module: account_corrections
+#: help:wizard.journal.items.corrections.lines,partner_txt_only:0
+msgid "The Third Party of the line to be corrected hasn't been synched to this instance"
+msgstr "Le Tiers de la ligne à corriger n'a pas été synchronisé vers cette instance"
+
+#. module: account_corrections
+#: field:analytic.distribution.wizard,old_partner_id:0
+msgid "Original partner of the line to be corrected"
+msgstr "Partenaire d'origine de la ligne à corriger"
+
+#. module: account_corrections
+#: field:analytic.distribution.wizard,old_employee_id:0
+msgid "Original employee of the line to be corrected"
+msgstr "Employé d'origine de la ligne à corriger"
+
+#. module: account_corrections
+#: field:analytic.distribution.wizard,new_partner_id:0
+msgid "New partner selected in the correction wizard"
+msgstr "Nouveau partenaire sélectionné dans l'assistant de correction"
+
+#. module: account_corrections
+#: field:analytic.distribution.wizard,new_employee_id:0
+msgid "New employee selected in the correction wizard"
+msgstr "Nouvel employé sélectionné dans l'assistant de correction"
+
+#. module: register_accounting
+#: code:addons/register_accounting/account_bank_statement.py:1824
+#, python-format
+msgid "Journal Entry linked to the register line %s not found."
+msgstr "Ecriture comptable liée à la ligne de registre %s non trouvée."
+
+#. module: register_accounting
+#: report:addons/register_accounting/report/fully_report_xls.mako:1043
+msgid "Automated Entry"
+msgstr "Écriture Automatique"
+
+#. module: account_override
+#: field:account.bank.statement.line,partner_move_line_ids:0
+msgid "Automated Entries"
+msgstr "Écritures Automatiques"
+
+#. module: account_override
+#: help:account.bank.statement.line,partner_move_line_ids:0
+msgid "Automated entries generated for expense/income register lines linked to a partner"
+msgstr "Écritures Automatiques générées pour les lignes de registre de dépenses/produits liées à un partenaire"
+
+#. module: account_override
+#: help:account.move.line,partner_register_line_id:0
+msgid "Register line to which this partner automated entry is linked"
+msgstr "Ligne de registre à laquelle cette écriture automatique liée à un partenaire est rattachée"
+
 #. module: account_override
 #: code:addons/account_override/account.py:517
 #, python-format

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-09-06 13:44:28 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-10-16 13:04:48 +0000
@@ -81,7 +81,7 @@
 msf_sync_data_server.account_move,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['date', 'document_date', 'imported', 'journal_id/id', 'name', 'narration', 'period_id/id', 'ref', 'statement_line_ids/id', 'to_check','instance_id/id','status','employee_id/id','transfer_journal_id/id','manual_currency_id/id','block_manual_currency_id','partner_id2/id','analytic_distribution_id/id', 'register_line_id/id']",HQ + MISSION,account.move,instance_id,Account Move,Valid,,411
 msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'reconcile_partial_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date', 'is_revaluated_ok', 'unreconcile_date', 'unreconcile_txt', 'is_manually_corrected', 'is_si_refund']",HQ + MISSION,account.move.line,instance_id,Account Move Line,Valid,,412
 msf_sync_data_server.account_move_line_correction,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",HQ + MISSION,account.move.line,instance_id,Account Move Line Correction,Valid,,413
-msf_sync_data_server.account_move_line_register_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_st_line_id/id', 'instance_id/id']",MISSION,account.move.line,instance_id,Account Move Line / Register Line,Valid,,414
+msf_sync_data_server.account_move_line_register_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_st_line_id/id', 'instance_id/id', 'partner_register_line_id/id']",MISSION,account.move.line,instance_id,Account Move Line / Register Line,Valid,,414
 msf_sync_data_server.register_line_account_move_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['direct_invoice_move_id/id', 'first_move_line_id/id', 'from_import_cheque_id/id', 'imported_invoice_line_ids/id','instance_id/id', 'cash_return_move_line_id/id', 'advance_invoice_move_id/id']",MISSION,account.bank.statement.line,instance_id,Register Line / Account Move Line,Valid,,415
 msf_sync_data_server.account_move_state,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['instance_id/id', 'state']",HQ + MISSION,account.move,instance_id,Account Move State,Valid,,416
 msf_sync_data_server.account_move_line_corrected_upstream,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_upstream', 'instance_id/id']",HQ + MISSION,account.move.line,instance_id,Account Move Line Corrected Upstream,Valid,,417

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2018-08-31 07:57:21 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2018-10-16 13:04:48 +0000
@@ -1791,36 +1791,26 @@
                                                     {'reference': ''}, context=context)
         return True
 
-    def do_direct_expense(self, cr, uid, st_line, context=None):
+    def do_direct_expense(self, cr, uid, st_line, posttype='', context=None):
         """
-        Do a direct expense when the line is hard posted and content a supplier
+        If the statement line...
+            - is being hardposted
+            - has a Partner Third Party
+            - is booked on an income or expense account
+        ... this method creates automated entries on partner payable or receivable account (JI), adds them to the
+        regline JE, and returns a list of their ids that will have to be reconciled once the JE will be posted.
         """
         if context is None:
             context = {}
         if not st_line:
             return False
-        # Do the treatment only if the line is hard posted and have a partner who is a supplier
-        if st_line.state == "hard" and st_line.partner_id and st_line.account_id.user_type.code in ('expense', 'income') and \
+        automated_entries_ids = []
+        if posttype == 'hard' and st_line.partner_id and st_line.account_id.user_type.code in ('expense', 'income') and \
                 st_line.direct_invoice is False:
             # Prepare some elements
             move_obj = self.pool.get('account.move')
             move_line_obj = self.pool.get('account.move.line')
             curr_date = time.strftime('%Y-%m-%d')
-            journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'purchase'), ('is_current_instance', '=', True)])
-            if not journal_ids:
-                raise osv.except_osv(_('Error'), _('No purchase journal found!'))
-            journal_id = journal_ids[0]
-            # Create a move
-            move_vals= {
-                'journal_id': journal_id,
-                'period_id': st_line.statement_id.period_id.id,
-                'date': st_line.date or curr_date,
-                'document_date': st_line.document_date or curr_date,
-                # name removed from UF-1542 because of a bug from UF-1129
-                #'name': 'DirectExpense/' + st_line.name,
-                'partner_id': st_line.partner_id.id,
-            }
-            move_id = move_obj.create(cr, uid, move_vals, context=context)
             # Create move lines
             account_id = False
             if st_line.account_id.user_type.code == 'expense':
@@ -1828,23 +1818,25 @@
             elif st_line.account_id.user_type.code == 'income':
                 account_id = st_line.partner_id.property_account_receivable.id or False
             if not account_id:
-                raise osv.except_osv(_('Warning'), _('The supplier seems not have an incorrect account. \
-                        Please contact an accountant administrator to resolve this problem.'))
+                raise osv.except_osv(_('Warning'), _('The supplier seems to have an incorrect account. Please contact '
+                                                     'an Accounting Administrator to solve this problem.'))
+            reg_move = st_line.first_move_line_id and st_line.first_move_line_id.move_id or False
+            if not reg_move:
+                raise osv.except_osv(_('Warning'),
+                                     _('Journal Entry linked to the register line %s not found.') % st_line.sequence_for_reference or '')
             val = {
                 'name': st_line.name,
-                'date': st_line.date or curr_date,
-                'document_date': st_line.document_date or curr_date,
-                'ref': st_line.ref or st_line.sequence_for_reference,
-                'reference': st_line.ref or st_line.sequence_for_reference,
-                'move_id': move_id,
+                'date': reg_move.date,
+                'document_date': reg_move.document_date,
+                'move_id': reg_move.id,
                 'partner_id': st_line.partner_id.id or False,
                 'partner_type_mandatory': True,
                 'account_id': account_id,
                 'credit': 0.0,
                 'debit': 0.0,
                 'statement_id': st_line.statement_id.id,
-                'journal_id': journal_id,
-                'period_id': st_line.statement_id.period_id.id,
+                'journal_id': reg_move.journal_id.id,
+                'period_id': reg_move.period_id.id,
                 'currency_id': st_line.statement_id.currency.id,
                 'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False
             }
@@ -1856,18 +1848,17 @@
                                                                st_line.statement_id.company_id.currency_id.id, amount, round=False, context=context)
             val.update({'debit': amount, 'credit': 0.0, 'amount_currency': abs(st_line.amount)})
             # Optimization: Add check=False because of next post() for the move
+            # (From US-3874: JIs are added to the regline JE to be posted right after the current method is called)
             move_line_debit_id = move_line_obj.create(cr, uid, val, context=context, check=False)
             val.update({'debit': 0.0, 'credit': amount, 'amount_currency': -abs(st_line.amount)})
-            # Optimization: Add check=False because of next post() for the move
             move_line_credit_id = move_line_obj.create(cr, uid, val, context=context, check=False)
-            # Post the move
-            move_obj.post(cr, uid, [move_id], context=context)
-            # Do reconciliation
-            move_line_obj.reconcile_partial(cr, uid, [move_line_debit_id, move_line_credit_id])
+            # the new JIs created will have to be reconciled after the JE will be posted
+            automated_entries_ids.append(move_line_debit_id)
+            automated_entries_ids.append(move_line_credit_id)
             # Disable the cash return button on this line
             # Optimization on write() for this field
             self.write(cr, uid, [st_line.id], {'from_cash_return': True}, context=context)
-        return True
+        return automated_entries_ids
 
     def do_import_invoices_reconciliation(self, cr, uid, st_line, context=None):
         """
@@ -2092,7 +2083,8 @@
         state = self._get_state(cr, uid, ids, context=context).values()[0]
         # Verify that the statement line isn't in hard state
         if state == 'hard':
-            if values.get('partner_move_ids') or values == {'from_cash_return': True} or values.get('analytic_distribution_id', False) or \
+            if values.get('partner_move_ids') or values.get('partner_move_line_ids') or \
+                    values == {'from_cash_return': True} or values.get('analytic_distribution_id', False) or \
                     (values.get('invoice_id', False) and len(values.keys()) == 2 and values.get('from_cash_return')) or \
                     'from_correction' in context or context.get('sync_update_execution', False):
                 res = super(account_bank_statement_line, self).write(cr, uid, ids, values, context=context)
@@ -2228,6 +2220,7 @@
             'down_payment_id': False,
             'cash_return_move_line_id': False,  # BKLG-60
             'partner_move_ids': [],
+            'partner_move_line_ids': [],
             'advance_invoice_move_id': False,
             'direct_invoice_move_id': False,
         })
@@ -2437,11 +2430,16 @@
                     acc_move_obj.write(cr, uid, [x.id for x in absl.move_ids], {'state':'posted'}, context=context)
                     acc_move_obj.write(cr, uid, [absl.invoice_id.move_id.id], {'state':'posted'}, context=context)
                 else:
+                    # create automated entries if need be: add the JIs to the regline JE and get the JIs to be reconciled
+                    automated_entries_ids = self.do_direct_expense(cr, uid, absl, posttype=postype, context=context)
+                    # post regline JE
                     acc_move_obj.post(cr, uid, [x.id for x in absl.move_ids], context=context)
-                    # WARNING: if we don't do a browse before the "do_direct_expense", the system doesn't know that the absl state is hard post. And so the direct expense functionnality doesn't work!
-                    absl = self.browse(cr, uid, absl.id, context=context)
-                    # do a move that enable a complete supplier follow-up
-                    self.do_direct_expense(cr, uid, absl, context=context)
+                    if automated_entries_ids:
+                        # reconcile automated entries together
+                        self.pool.get('account.move.line').reconcile_partial(cr, uid, automated_entries_ids, context=context)
+                        # store them in the regline as partner_move_line_ids ("Automated Entries")
+                        self.write(cr, uid, absl.id, {'partner_move_line_ids': [(6, 0, automated_entries_ids)]}, context=context)
+
                 if previous_state == 'draft':
                     direct_hard_post = True  # UF-2316
                 else:

=== modified file 'bin/addons/register_accounting/account_cash_statement.py'
--- bin/addons/register_accounting/account_cash_statement.py	2018-06-20 13:17:44 +0000
+++ bin/addons/register_accounting/account_cash_statement.py	2018-10-16 13:04:48 +0000
@@ -254,7 +254,7 @@
 
     def _msf_calculated_balance_compute(self, cr, uid, ids, field_name=None, arg=None, context=None):
         """
-        Sum of opening balance (balance_start) and sum of cash transaction (total_entry_encoding)
+        Sum of starting balance (balance_start) and sum of cash transaction (total_entry_encoding)
         """
         if context is None:
             context = {}
@@ -263,7 +263,7 @@
         for st in self.browse(cr, uid, ids):
             amount = (st.balance_start or 0.0) + (st.total_entry_encoding or 0.0)
             res[st.id] = amount
-            # Update next register opening balance
+            # Update next register starting balance
             if st.journal_id and st.journal_id.type == 'cash':
                 next_st_ids = self.search(cr, uid, [('prev_reg_id', '=', st.id)])
                 context.update({'update_next_reg_balance_start': True})
@@ -306,7 +306,7 @@
         'closing_gap': fields.function(_gap_compute, method=True, string='Gap'),
         'comments': fields.char('Comments', size=64, required=False, readonly=False),
         'msf_calculated_balance': fields.function(_msf_calculated_balance_compute, method=True, readonly=True, string='Calculated Balance',
-                                                  help="Opening balance + Cash Transaction"),
+                                                  help="Starting Balance + Cash Transactions"),
         # Because of UTP-382, need to change store=True to FALSE for total_entry_encoding (which do not update fields at register line deletion/copy)
         'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=False, string="Cash Transaction", help="Total cash transactions"),
     }

=== modified file 'bin/addons/register_accounting/account_view.xml'
--- bin/addons/register_accounting/account_view.xml	2018-03-14 08:57:47 +0000
+++ bin/addons/register_accounting/account_view.xml	2018-10-16 13:04:48 +0000
@@ -342,12 +342,12 @@
                                 <field name="prev_reg_id" invisible="1"/>
                                 <group col="4" colspan="4">
                                     <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'invisible':['|',('state','!=','draft'),('prev_reg_id','!=',False)], 'readonly':['|',('state','!=','draft'),('prev_reg_id','!=',False)]}">
-                                        <tree string = "Opening Balance" editable="bottom">
+                                        <tree string="Starting Balance" editable="bottom">
                                             <field name="pieces"/>
                                             <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                             <field name="subtotal" sum="Total"/>
                                         </tree>
-                                        <form string = "Opening Balance">
+                                        <form string="Starting Balance">
                                             <field name="pieces"/>
                                             <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                             <field name="subtotal"/>
@@ -382,8 +382,8 @@
                                 <field name="closing_date" select="1" readonly="1"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Opening Balance" colspan="4"/>
-                                <field name="balance_start" string="Opening Balance" readonly="True"/>
+                                <separator string="Starting Balance" colspan="4"/>
+                                <field name="balance_start" readonly="True"/>
                                 <field name="total_entry_encoding"/>
                                 <field name="msf_calculated_balance"/>
                                 <field name="open_advance_amount" attrs="{'readonly': [('state', 'not in',('draft', 'open'))]}"/>
@@ -798,6 +798,7 @@
                         <field name="date" select="1" on_change="onchange_date(date)" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
                         <field name="period_id" domain="[('state', '=', 'draft'),('special', '!=', True)]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
                         <field name="currency" readonly="1"/>
+                        <field name="balance_end" string="Calculated Balance" readonly="1"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" invisible="1"/>
                         <field name="virtual_id" invisible="1" readonly="1"/>
                         <field name="prev_reg_id" invisible="1"/>

=== modified file 'bin/addons/register_accounting/report/cash_inventory.rml'
--- bin/addons/register_accounting/report/cash_inventory.rml	2018-03-14 08:57:47 +0000
+++ bin/addons/register_accounting/report/cash_inventory.rml	2018-10-16 13:04:48 +0000
@@ -83,7 +83,7 @@
       <para style="text"><b>Cashbox</b></para>
       <blockTable colWidths="30mm,30mm,30mm,30mm,30mm,30mm" style="table_reconciliation_balance">
         <tr>
-          <td><para style="center"><b>Opening balance</b></para></td>
+          <td><para style="center"><b>Starting balance</b></para></td>
           <td></td>
           <td></td>
           <td><para style="center"><b>Closing balance</b></para></td>
@@ -134,7 +134,7 @@
       <blockTable colWidths="90mm, 90mm" style="table_reconciliation">
         <tr>
           <td>
-            <para>Opening balance: <b>[[ o.balance_start and o.balance_start or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para>
+            <para>Starting balance: <b>[[ o.balance_start and o.balance_start or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para>
             <para>Cash Transaction: <b>[[ o.total_entry_encoding and o.total_entry_encoding or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para>
             <para>Calculated Balance: <b>[[ o.msf_calculated_balance and o.msf_calculated_balance or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para>
             <para>Unrecorded Advances: <b>[[ o.open_advance_amount and o.open_advance_amount or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para>

=== modified file 'bin/addons/register_accounting/report/fully_report_xls.mako'
--- bin/addons/register_accounting/report/fully_report_xls.mako	2018-07-17 12:20:07 +0000
+++ bin/addons/register_accounting/report/fully_report_xls.mako	2018-10-16 13:04:48 +0000
@@ -503,12 +503,25 @@
           <Data ss:Type="Number">${o.balance_start or 0.0|x}</Data>
         </Cell>
       </Row>
+      <%
+      if o.journal_id.type == 'cash':
+          closing_bal_title = _('CashBox balance:')
+          closing_bal = o.balance_end_cash or 0.0
+          calculated_bal = o.msf_calculated_balance or 0.0
+      else:
+          if o.journal_id.type == 'bank':
+              closing_bal_title = _('Bank Statement balance:')
+          else:
+              closing_bal_title = _('Closing balance:')
+          closing_bal = o.balance_end_real or 0.0
+          calculated_bal = o.balance_end or 0.0
+      %>
       <Row ss:Height="14.5134">
         <Cell ss:StyleID="header_part">
-          <Data ss:Type="String">${_('Closing balance:')|x} </Data>
+          <Data ss:Type="String">${closing_bal_title|x} </Data>
         </Cell>
         <Cell ss:StyleID="header_part_number">
-          <Data ss:Type="Number">${o.balance_end_real or 0.0|x}</Data>
+          <Data ss:Type="Number">${closing_bal|x}</Data>
         </Cell>
       </Row>
       <Row ss:Height="14.5134">
@@ -516,7 +529,7 @@
           <Data ss:Type="String">${_('Calculated balance:')|x} </Data>
         </Cell>
         <Cell ss:StyleID="header_part_number">
-          <Data ss:Type="Number">${o.balance_end or 0.0|x}</Data>
+          <Data ss:Type="Number">${calculated_bal|x}</Data>
         </Cell>
       </Row>
       <Row ss:Height="14.5134">
@@ -739,7 +752,7 @@
     </Row>
 % endfor
 
-<!-- if there are Trade Payable Entries (automatically generated) -->
+<!-- if there are Trade Payable Entries (automatically generated) - until US-3874 -->
 <% partner_move_ids = line.partner_move_ids or False %>
 % if partner_move_ids:
 % for partner_move_id in sorted(partner_move_ids, key=lambda x: x.name):
@@ -874,7 +887,7 @@
           <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
-          <Data ss:Type="String"></Data>
+          <Data ss:Type="String">${ana_line.partner_txt or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
           <Data ss:Type="String"></Data>
@@ -943,7 +956,7 @@
           <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
-          <Data ss:Type="String"></Data>
+          <Data ss:Type="String">${ana_line.partner_txt or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
           <Data ss:Type="String"></Data>
@@ -1001,7 +1014,7 @@
           <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
-          <Data ss:Type="String"></Data>
+          <Data ss:Type="String">${ana_line.partner_txt or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
           <Data ss:Type="String"></Data>
@@ -1033,6 +1046,88 @@
 % endfor
 % endif
 
+<!-- AUTOMATED ENTRIES linked to the register line -->
+<!-- Note: they are booked on accounts without AD -->
+<% partner_move_line_ids = line.partner_move_line_ids or [] %>
+% if partner_move_line_ids:
+    % for partner_aml in sorted(partner_move_line_ids, key=lambda x: x.partner_txt):
+        <Row ss:Height="14.5134">
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${_('Automated Entry')|x}</Data>
+            </Cell>
+            % if isDate(partner_aml.document_date):
+              <Cell ss:StyleID="date">
+                <Data ss:Type="DateTime">${partner_aml.document_date|n}T00:00:00.000</Data>
+              </Cell>
+            % else:
+              <Cell ss:StyleID="left_bold">
+                <Data ss:Type="String"></Data>
+              </Cell>
+            % endif
+            % if isDate(partner_aml.date):
+              <Cell ss:StyleID="date">
+                <Data ss:Type="DateTime">${partner_aml.date|n}T00:00:00.000</Data>
+              </Cell>
+            % else:
+              <Cell ss:StyleID="left_bold">
+                <Data ss:Type="String"></Data>
+              </Cell>
+            % endif
+            <Cell ss:StyleID="left_bold">
+              <!-- SEQUENCE -->
+              <Data ss:Type="String">${partner_aml.move_id.name|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${partner_aml.name|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${partner_aml.ref or ''|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String"></Data>
+            </Cell>
+            % if o.journal_id.type == 'cheque':
+              <Cell ss:StyleID="left_bold">
+                <Data ss:Type="String"></Data>
+              </Cell>
+            % endif
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${"%s %s" % (partner_aml.account_id.code, partner_aml.account_id.name)|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${partner_aml.partner_txt or ''|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="amount_bold">
+              <Data ss:Type="Number">${partner_aml.credit_currency or 0.0}</Data>
+            </Cell>
+            <Cell ss:StyleID="amount_bold">
+              <Data ss:Type="Number">${partner_aml.debit_currency or 0.0}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${_('FALSE')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${_('FALSE')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${_('FALSE')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String"></Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String"></Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${partner_aml.reconcile_id and 'X' or ''|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="left_bold">
+              <Data ss:Type="String">${partner_aml.move_id.state and getSel(partner_aml.move_id, 'state') or ''|x}</Data>
+            </Cell>
+        </Row>
+    % endfor
+% endif
+
 % endfor
 
 <!-- MANUAL ENTRIES -->
@@ -1129,7 +1224,7 @@
             <Data ss:Type="String">${"%s %s" % (manual_aal.general_account_id.code, manual_aal.general_account_id.name)|x}</Data>
           </Cell>
           <Cell ss:StyleID="${aal_color}_ana_left">
-            <Data ss:Type="String"></Data>
+            <Data ss:Type="String">${manual_aal.partner_txt or ''|x}</Data>
           </Cell>
           <Cell ss:StyleID="${aal_color}_ana_left">
             <Data ss:Type="String"></Data>
@@ -1174,7 +1269,7 @@
           <Data ss:Type="String">${"%s %s" % (free_line.general_account_id.code, free_line.general_account_id.name)|x}</Data>
         </Cell>
         <Cell ss:StyleID="${aal_color}_ana_left">
-          <Data ss:Type="String"></Data>
+          <Data ss:Type="String">${free_line.partner_txt or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="${aal_color}_ana_left">
           <Data ss:Type="String"></Data>

=== modified file 'bin/addons/register_accounting/report/liquidity_position_pdf.rml'
--- bin/addons/register_accounting/report/liquidity_position_pdf.rml	2018-04-23 09:58:08 +0000
+++ bin/addons/register_accounting/report/liquidity_position_pdf.rml	2018-10-16 13:04:48 +0000
@@ -60,7 +60,7 @@
           <td><para style="text">Instance</para></td>
           <td><para style="text">Journal Code - Journal Name</para></td>
           <td><para style="text">State</para></td>
-          <td><para style="text">Opening Balance</para></td>
+          <td><para style="text">Starting Balance</para></td>
           <td><para style="text">Calculated Balance</para></td>
           <td><para style="text">[[ reg_type == 'cash' and 'Cash Box Balance' or 'Bank Statement Balance']]</para></td>
           <td><para style="text">Reg. ccy</para></td>

=== modified file 'bin/addons/register_accounting/report/liquidity_position_xls.mako'
--- bin/addons/register_accounting/report/liquidity_position_xls.mako	2018-04-23 09:58:08 +0000
+++ bin/addons/register_accounting/report/liquidity_position_xls.mako	2018-10-16 13:04:48 +0000
@@ -327,7 +327,7 @@
           <Data ss:Type="String">${_('Period')|x}</Data>
         </Cell>
         <Cell ss:StyleID="s34">
-          <Data ss:Type="String">${_('Opening Balance in register currency')|x}</Data>
+          <Data ss:Type="String">${_('Starting Balance in register currency')|x}</Data>
         </Cell>
         <Cell ss:StyleID="s34">
           <Data ss:Type="String">${_('Calculated Balance in register currency')|x}</Data>

=== modified file 'bin/addons/register_accounting/report/report_fully_report.py'
--- bin/addons/register_accounting/report/report_fully_report.py	2018-08-28 09:57:16 +0000
+++ bin/addons/register_accounting/report/report_fully_report.py	2018-10-16 13:04:48 +0000
@@ -237,10 +237,10 @@
         db = pooler.get_pool(self.cr.dbname)
         aji_obj = db.get('account.analytic.line')
         aji_ids = aji_obj.search(self.cr, self.uid, [('move_id', '=', aml.id), ('free_account', '=', free)])
-        ajis = aji_obj.browse(self.cr, self.uid, aji_ids, context={'lang': self.localcontext.get('lang')})
-        return [aji for aji in ajis]
+        # add the correction lines if any
+        return self.getAnalyticLines(aji_ids)
 
-    def getManualFreeLines(self, aml, free=False):
+    def getManualFreeLines(self, aml):
         """
         Returns of list of Free1/Free2 Lines linked to the manual JI in parameter
         """

=== modified file 'bin/addons/register_accounting/report/report_liquidity_position.py'
--- bin/addons/register_accounting/report/report_liquidity_position.py	2018-04-23 10:09:26 +0000
+++ bin/addons/register_accounting/report/report_liquidity_position.py	2018-10-16 13:04:48 +0000
@@ -187,7 +187,7 @@
 
     def getOpeningBalance(self, reg_type, cur):
         '''
-        Returns the TOTAL of opening balance for the register type and the currency in parameters
+        Returns the TOTAL of starting balance for the register type and the currency in parameters
         '''
         reg_data = self.getRegisters()[reg_type]['registers']
         return sum([line['opening_balance'] or 0.0 for line in reg_data if line['currency'] == cur])

=== modified file 'bin/addons/register_accounting/wizard/register_opening.py'
--- bin/addons/register_accounting/wizard/register_opening.py	2017-10-16 09:07:48 +0000
+++ bin/addons/register_accounting/wizard/register_opening.py	2018-10-16 13:04:48 +0000
@@ -31,8 +31,8 @@
 
     def _get_opening_balance(self, cr, uid, ids, name, arg, context=None):
         """
-        Returns a dict with key = id of the wizard, and value = amount of the opening balance of the related register
-        The Opening Balance is:
+        Returns a dict with key = id of the wizard, and value = amount of the starting balance of the related register
+        The Starting Balance is:
         - equal to the value of "balance_start" for Bank Registers
         - based on the Cashbox lines for Cash Registers
         - always equal to 0.00 for Cheque Registers
@@ -60,13 +60,13 @@
         return self.pool.get('account.journal').get_journal_type(cr, uid, context=context)
 
     _columns = {
-        'confirm_opening_balance': fields.boolean(string='Do you want to open the register with the following opening balance?',
+        'confirm_opening_balance': fields.boolean(string='Do you want to open the register with the following starting balance?',
                                                   required=False),
         'register_id': fields.many2one('account.bank.statement', 'Register', required=True, readonly=True),
         'register_type': fields.related('register_id', 'journal_id', 'type', string='Register Type', type='selection',
                                         selection=_get_journal_type, readonly=True),
         'opening_balance': fields.function(_get_opening_balance, method=True, type='float', readonly=True,
-                                           string='Opening Balance'),
+                                           string='Starting Balance'),
         'confirm_opening_period': fields.boolean(string='Do you want to open the register on the following period?',
                                                  required=False),
         'opening_period': fields.related('register_id', 'period_id', string='Opening Period', type='many2one',

=== modified file 'bin/addons/register_accounting/wizard/register_opening.xml'
--- bin/addons/register_accounting/wizard/register_opening.xml	2017-10-13 08:20:44 +0000
+++ bin/addons/register_accounting/wizard/register_opening.xml	2018-10-16 13:04:48 +0000
@@ -8,7 +8,7 @@
             <field name='arch' type='xml'>
                 <form string="Open Register Confirmation">
                     <group colspan="4" attrs="{'invisible': [('register_type', '=', 'cheque')]}">
-                        <separator string="Register Opening Balance"/>
+                        <separator string="Register Starting Balance"/>
                         <field name="register_type" invisible="1"/>
                         <field name="confirm_opening_balance"/>
                         <field name="opening_balance"/>

=== modified file 'bin/addons/register_accounting/wizard/wizard_cash_return.py'
--- bin/addons/register_accounting/wizard/wizard_cash_return.py	2018-07-17 14:03:52 +0000
+++ bin/addons/register_accounting/wizard/wizard_cash_return.py	2018-10-16 13:04:48 +0000
@@ -774,7 +774,9 @@
         if context is None:
             context = {}
         account_obj = self.pool.get('account.account')
+        absl_obj = self.pool.get('account.bank.statement.line')
         wizard = self.browse(cr, uid, ids[0], context=context)
+        curr_date = wizard.date
 
         # US-672/2
         self.pool.get('account.invoice').check_accounts_for_partner(cr, uid,
@@ -930,35 +932,12 @@
         if st_currency and st_currency != wizard.advance_st_line_id.statement_id.company_id.currency_id.id:
             # change the amount_currency of the advance closing line in order to be negative (not done in create_move_line function)
             move_line_obj.write(cr, uid, [adv_closing_id], {'amount_currency': -(wizard.initial_amount + wizard.additional_amount)}, context=context)
-        # make the move line in posted state
-        #res_move_id = move_obj.write(cr, uid, [move_id], {'state': 'posted'}, context=context)
-        res_move_id = move_obj.post(cr, uid, [move_id], context=context)
-        # We create statement lines for invoices and advance closing ONLY IF the move is posted.
-        # Verify that the posting has succeed
-        if res_move_id == False:
-            raise osv.except_osv(_('Error'), _('An error has occurred: The journal entries cannot be posted.'))
-        # create the statement line for the invoices
-        absl_obj = self.pool.get('account.bank.statement.line')
-        curr_date = wizard.date
-        # handle invoice lines
-        for inv_move_line_data in inv_move_line_ids:
-            self.create_st_line_from_move_line(cr, uid, ids, register.id, move_id, inv_move_line_data[0], invoice_id=inv_move_line_data[1], context=context)
-            # search the invoice move line that come from invoice
-            invoice_move_id = self.pool.get('account.invoice').read(cr, uid, inv_move_line_data[1], ['move_id'], context=context).get('move_id', None)
-            inv_move_line_account_id = move_line_obj.read(cr, uid, inv_move_line_data[0], ['account_id'], context=context).get('account_id', None)
-            if invoice_move_id and inv_move_line_account_id:
-                ml_ids = move_line_obj.search(cr, uid, [('move_id', '=', invoice_move_id[0]), ('account_id', '=', inv_move_line_account_id[0])], context=context)
-            if not ml_ids or len(ml_ids) > 1:
-                raise osv.except_osv(_('Error'), _('An error occurred on invoice reconciliation: Invoice line not found.'))
-            # reconcile invoice line (from cash return) with specified invoice line (from invoice)
-            move_line_obj.reconcile_partial(cr, uid, [ml_ids[0], inv_move_line_data[0]])
-        # handle advance lines
-        for adv_move_line_id in adv_move_line_ids:
-            self.create_st_line_from_move_line(cr, uid, ids, register.id, move_id, adv_move_line_id, context=context)
-        # Have you filled in the supplier field ? If yes let's go for creating some moves for them !
+
+        # if advance lines have a Partner Third Party: create Payable Entries and add them to the advance closing JE
+        to_reconcile = {}  # per partner
+        payable_lines = []
         if advances_with_supplier:
             wiz_adv_line_obj = self.pool.get('wizard.advance.line')
-            supp_move_ids = []  # to store the ids of the account moves created
             # Browse suppliers
             for supplier_id in advances_with_supplier:
                 total = 0.0
@@ -967,20 +946,11 @@
                     data = wiz_adv_line_obj.read(cr, uid, s_id, ['amount'], context=context)
                     if 'amount' in data:
                         total += data.get('amount')
-                # create the move with 2 move lines for the supplier
+                # create both move lines for the supplier
                 if total > 0:
-                    # prepare the move
                     supp_move_info = wiz_adv_line_obj.read(cr, uid, advances_with_supplier[supplier_id][0], ['description', 'document_date'], context=context)
                     supp_move_name = supp_move_info.get('description', "/")
                     supp_move_date = supp_move_info.get('document_date', curr_date)
-                    supp_move_vals = {
-                        'journal_id': journal.id,
-                        'period_id': period_id,
-                        'date': wizard.date,
-                        'document_date': wizard.date,
-                        #'name': supp_move_name, ## Deleted in UF-1959. Was asked since UTP-330 and UF-1542.
-                        'partner_id': supplier_id,
-                    }
                     # search account_id of the supplier
                     account_id = self.pool.get('res.partner').read(cr, uid, supplier_id, ['property_account_payable'], context=context)
                     if 'property_account_payable' in account_id and account_id.get('property_account_payable', False):
@@ -988,24 +958,49 @@
                     else:
                         raise osv.except_osv(_('Warning'), _('One supplier seems not to have a payable account. \
                         Please contact an accountant administrator to resolve this problem.'))
-                    # Create the move
-                    supp_move_id = move_obj.create(cr, uid, supp_move_vals, context=context)
-                    supp_move_ids.append(supp_move_id)
                     # Create move_lines
                     supp_move_line_debit_id = self.create_move_line(cr, uid, ids, wizard.date, supp_move_date, supp_move_name, journal, register, supplier_id, False, \
-                                                                    account_id, total, 0.0, adv_return_ref, supp_move_id, False, context=context)
+                                                                    account_id, total, 0.0, adv_return_ref, move_id, False, context=context)
                     supp_move_line_credit_id = self.create_move_line(cr, uid, ids, wizard.date, supp_move_date, supp_move_name, journal, register, supplier_id, False, \
-                                                                     account_id, 0.0, total, adv_return_ref, supp_move_id, False, context=context)
-                    # We hard post the move
-                    move_obj.post(cr, uid, [supp_move_id], context=context)
-                    # Verify that the posting has succeed
-                    if supp_move_id == False:
-                        raise osv.except_osv(_('Error'), _('An error has occurred: The journal entries cannot be posted.'))
-                    # Do reconciliation
-                    move_line_obj.reconcile_partial(cr, uid, [supp_move_line_debit_id, supp_move_line_credit_id])
-            # Update the statement line with the partner move ids ("Payable entries")
-            if 'statement_line_id' in context:
-                absl_obj.write(cr, uid, context['statement_line_id'], {'partner_move_ids': [(6, 0, supp_move_ids)]}, context)
+                                                                     account_id, 0.0, total, adv_return_ref, move_id, False, context=context)
+                    # mark the lines as to be reconciled, for each supplier
+                    to_reconcile[supplier_id] = [supp_move_line_debit_id, supp_move_line_credit_id]
+                    # store all payable lines created
+                    payable_lines.append(supp_move_line_debit_id)
+                    payable_lines.append(supp_move_line_credit_id)
+
+        # post the move
+        res_move_id = move_obj.post(cr, uid, [move_id], context=context)
+
+        # reconcile partner Payable Entries together if any
+        for supp_id in to_reconcile:
+            move_line_obj.reconcile_partial(cr, uid, to_reconcile[supp_id], context=context)
+
+        # Update the statement line with the partner_move_line_ids ("Automated entries")
+        if payable_lines and 'statement_line_id' in context:
+            absl_obj.write(cr, uid, context['statement_line_id'], {'partner_move_line_ids': [(6, 0, payable_lines)]},
+                           context=context)
+
+        # Create statement lines for invoices and advance closing ONLY IF the move is posted
+        # Check that the posting has succeeded
+        if res_move_id == False:
+            raise osv.except_osv(_('Error'), _('An error has occurred: The journal entries cannot be posted.'))
+        # handle invoice lines
+        for inv_move_line_data in inv_move_line_ids:
+            self.create_st_line_from_move_line(cr, uid, ids, register.id, move_id, inv_move_line_data[0], invoice_id=inv_move_line_data[1], context=context)
+            # search the invoice move line that comes from the invoice
+            invoice_move_id = self.pool.get('account.invoice').read(cr, uid, inv_move_line_data[1], ['move_id'], context=context).get('move_id', None)
+            inv_move_line_account_id = move_line_obj.read(cr, uid, inv_move_line_data[0], ['account_id'], context=context).get('account_id', None)
+            if invoice_move_id and inv_move_line_account_id:
+                ml_ids = move_line_obj.search(cr, uid, [('move_id', '=', invoice_move_id[0]), ('account_id', '=', inv_move_line_account_id[0])], context=context)
+            if not ml_ids or len(ml_ids) > 1:
+                raise osv.except_osv(_('Error'), _('An error occurred on invoice reconciliation: Invoice line not found.'))
+            # reconcile invoice line (from cash return) with specified invoice line (from invoice)
+            move_line_obj.reconcile_partial(cr, uid, [ml_ids[0], inv_move_line_data[0]])
+        # handle advance lines
+        for adv_move_line_id in adv_move_line_ids:
+            self.create_st_line_from_move_line(cr, uid, ids, register.id, move_id, adv_move_line_id, context=context)
+
         # reconcile advance and advance return lines
         original_move_id = wizard.advance_st_line_id.move_ids[0]
         criteria = [('statement_id', '=', wizard.advance_st_line_id.statement_id.id), ('account_id', '=', adv_closing_acc_id), ('move_id', '=', original_move_id.id)]

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb.py'
--- bin/addons/vertical_integration/report/hq_report_ocb.py	2018-09-18 07:25:26 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocb.py	2018-10-16 13:04:48 +0000
@@ -678,7 +678,7 @@
                 'query_params': (first_day_of_last_fy, last_day_of_period),
             },
             {
-                'headers': ['Instance', 'Code', 'Name', 'Period', 'Opening balance', 'Calculated balance', 'Closing balance', 'Currency'],
+                'headers': ['Instance', 'Code', 'Name', 'Period', 'Starting balance', 'Calculated balance', 'Closing balance', 'Currency'],
                 'filename': instance_name + '_' + year + month + '_Liquidity Balances.csv',
                 'key': 'liquidity',
                 'query_params': (tuple([period_yyyymm]), reg_types, first_day_of_period, reg_types, period.id, reg_types, last_day_of_period, tuple(instance_ids)),

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocg.py'
--- bin/addons/vertical_integration/report/hq_report_ocg.py	2018-09-18 07:25:26 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocg.py	2018-10-16 13:04:48 +0000
@@ -103,7 +103,7 @@
                                     'Code',
                                     'Name',
                                     'Period',
-                                    'Opening balance',
+                                    'Starting balance',
                                     'Calculated balance',
                                     'Closing balance',
                                     'Currency']
@@ -123,7 +123,7 @@
                               'Account',
                               'Account Name',
                               'Period',
-                              'Opening balance',
+                              'Starting balance',
                               'Calculated balance',
                               'Closing balance',
                               'Booking Currency']

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocp.py'
--- bin/addons/vertical_integration/report/hq_report_ocp.py	2018-09-18 07:25:26 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocp.py	2018-10-16 13:04:48 +0000
@@ -510,7 +510,7 @@
                 'object': 'account.move.line',
             },
             {
-                'headers': ['Instance', 'Code', 'Name', 'Period', 'Opening balance', 'Calculated balance',
+                'headers': ['Instance', 'Code', 'Name', 'Period', 'Starting balance', 'Calculated balance',
                             'Closing balance', 'Currency'],
                 'filename': liquidity_balance_filename,
                 'key': 'liquidity',
@@ -520,7 +520,7 @@
                 'fnct_params': context,
             },
             {
-                'headers': ['Instance', 'Account', 'Account Name', 'Period', 'Opening balance', 'Calculated balance',
+                'headers': ['Instance', 'Account', 'Account Name', 'Period', 'Starting balance', 'Calculated balance',
                             'Closing balance', 'Booking Currency'],
                 'filename': account_balance_filename,
                 'key': 'account_balances_per_currency',