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

[jftempo]

=== modified file 'bin/addons/account/wizard/account_invoice_refund.py'
--- bin/addons/account/wizard/account_invoice_refund.py	2017-07-03 16:00:30 +0000
+++ bin/addons/account/wizard/account_invoice_refund.py	2017-10-19 09:52:42 +0000
@@ -238,6 +238,14 @@
                             if 'value' in data and data['value']:
                                 inv_obj.write(cr, uid, [inv_id], data['value'])
                         created_inv.append(inv_id)
+
+                    # Refund cancel/modify: set the invoice JI/AJIs as Corrected by the system so that they can't be
+                    # corrected manually. This must be done at the end of the refund process to handle the right AJI ids
+                    # get the list of move lines excluding invoice header
+                    ml_list = [ml.id for ml in movelines if not (ml.account_id.id == inv.account_id.id and
+                               abs(abs(inv.amount_total) - abs(ml.amount_currency)) <= 10**-3)]
+                    account_m_line_obj.set_as_corrected(cr, uid, ml_list, manual=False, context=None)
+
             if inv.type in ('out_invoice', 'out_refund'):
                 xml_id = 'action_invoice_tree3'
             else:

=== modified file 'bin/addons/account_corrections/account_move_line.py'
--- bin/addons/account_corrections/account_move_line.py	2017-04-28 07:56:21 +0000
+++ bin/addons/account_corrections/account_move_line.py	2017-10-19 09:52:42 +0000
@@ -148,6 +148,7 @@
         'last_cor_was_only_analytic': fields.boolean(string="AD Corrected?",
                                                      invisible=True,
                                                      help="If true, this line has been corrected by an accounting correction wizard but with only an AD correction (no G/L correction)"),
+        'is_manually_corrected': fields.boolean('Is Manually Corrected'),
     }
 
     _defaults = {
@@ -156,6 +157,7 @@
         'have_an_historic': lambda *a: False,
         'is_corrigible': lambda *a: True,
         'last_cor_was_only_analytic': lambda *a: False,
+        'is_manually_corrected': lambda *a: False,
     }
 
     def copy(self, cr, uid, aml_id, default=None, context=None):
@@ -174,6 +176,7 @@
             'corrected': False,
             'reversal': False,
             'last_cor_was_only_analytic': False,
+            'is_manually_corrected': False,
         })
         if 'exported' not in default:
             default['exported'] = False
@@ -280,7 +283,7 @@
         wiz_obj = self.pool.get('wizard.journal.items.corrections')
         ml = self.browse(cr, uid, ids[0])
         # Create wizard
-        wizard = wiz_obj.create(cr, uid, {'move_line_id': ids[0]}, context=context)
+        wizard = wiz_obj.create(cr, uid, {'move_line_id': ids[0], 'from_ji': True}, context=context)
         # Change wizard state in order to change date requirement on wizard
         wiz_obj.write(cr, uid, [wizard], {'state': 'open'}, context=context)
         # Update context
@@ -316,6 +319,34 @@
             context={}
         if isinstance(ids, (int, long)):
             ids = [ids]
+        # if JI was marked as corrected manually: display the Reverse Manual Corr. wizard instead of the History wizard
+        # except if it's a project line that was marked as Corrected in a upper level
+        reverse_corr_wiz_obj = self.pool.get('reverse.manual.correction.wizard')
+        user_obj = self.pool.get('res.users')
+        display_reverse_corr_wiz = False
+        if len(ids) == 1:
+            ml = self.read(cr, uid, ids[0], ['is_manually_corrected', 'corrected_upstream'], context=context)
+            if ml['is_manually_corrected']:
+                company = user_obj.browse(cr, uid, uid, context=context).company_id
+                level = company.instance_id and company.instance_id.level or ''
+                if not ml['corrected_upstream'] or level != 'project':
+                    display_reverse_corr_wiz = True
+        if display_reverse_corr_wiz:
+            context.update({
+                'active_id': ids[0],
+                'active_ids': ids,
+            })
+            reverse_corr_wizard = reverse_corr_wiz_obj.create(cr, uid, {}, context=context)
+            return {
+                'name': _("History Move Line"),  # same title as the History Wizard
+                'type': 'ir.actions.act_window',
+                'res_model': 'reverse.manual.correction.wizard',
+                'view_mode': 'form,tree',
+                'view_type': 'form',
+                'res_id': [reverse_corr_wizard],
+                'context': context,
+                'target': 'new',
+            }
         # Prepare some values
         domain_ids = []
         # Search ids to be open
@@ -949,8 +980,42 @@
             self.write(cr, uid, ml_ids, {'corrected_upstream': True}, check=False, update_check=False, context=context)
         return True
 
+    def set_as_corrected(self, cr, uid, ji_ids, manual=True, context=None):
+        """
+        Sets the JIs and their related AJIs as Corrected according to the following rules:
+        - if one of the JIs or AJIs has already been corrected it raises an error
+        - if manual = True, the Correction will be set as Manual (= the user will be able to reverse it manually)
+        """
+        if context is None:
+            context = {}
+        if isinstance(ji_ids, (int, long)):
+            ji_ids = [ji_ids]
+        aal_obj = self.pool.get('account.analytic.line')
+        for ji in self.browse(cr, uid, ji_ids, fields_to_fetch=['corrected', 'move_id'], context=context):
+            # check that the JI isn't already corrected
+            if ji.corrected:
+                raise osv.except_osv(_('Error'), _('The entry %s has already been corrected.') % ji.move_id.name)
+            # check that none of the AJIs linked to the JIs has already been reallocated
+            aji_ids = aal_obj.search(cr, uid, [('move_id', '=', ji.id)], order='NO_ORDER', context=context)
+            for aji in aal_obj.read(cr, uid, aji_ids, ['is_reallocated'], context=context):
+                if aji['is_reallocated']:
+                    raise osv.except_osv(_('Error'), _('One AJI related to the entry %s has already been corrected.') % ji.move_id.name)
+            # set the JI as corrected
+            manual_corr_vals = {'is_manually_corrected': manual,
+                                'corrected': True,  # is_corrigible will be seen as "False"
+                                'have_an_historic': True}
+            # write on JI without recreating AJIs
+            self.write(cr, uid, ji.id, manual_corr_vals, context=context, check=False, update_check=False)
+            # Set the "corrected_upstream" flag on the JI if necessary
+            # (so that project lines marked as corrected in a upper level can't be "uncorrected" in project)
+            self.corrected_upstream_marker(cr, uid, [ji.id], context=context)
+            # set the AJIs as corrected
+            aal_obj.write(cr, uid, aji_ids, {'is_reallocated': True}, context=context)
+
+
 account_move_line()
 
+
 class account_move(osv.osv):
     _name = 'account.move'
     _inherit = 'account.move'
@@ -971,4 +1036,45 @@
         return reversed_move
 
 account_move()
+
+
+class reverse_manual_correction_wizard(osv.osv_memory):
+    _name = 'reverse.manual.correction.wizard'
+    _description = 'Manual Correction Reversal Wizard'
+
+    _columns = {
+    }
+
+    _defaults = {
+    }
+
+    def reverse_manual_correction(self, cr, uid, ids, context=None):
+        """
+        Cancels the "Manual Correction" on the JI and its AJIs so that they can be re-corrected
+        """
+        if context is None:
+            context = {}
+        aml_obj = self.pool.get('account.move.line')
+        aal_obj = self.pool.get('account.analytic.line')
+        ji_id = context.get('active_id', False)
+        if ji_id:
+            # set the JI as non-corrected
+            is_cor_line = False
+            if aml_obj.read(cr, uid, ji_id, ['corrected_line_id'], context=context)['corrected_line_id']:
+                # if a COR line was corrected manually: the History Wizard must still appear if manual corr. is removed
+                is_cor_line = True
+            reverse_corr_vals = {'is_manually_corrected': False,
+                                 'corrected': False,  # is_corrigible will be seen as "True"
+                                 'have_an_historic': is_cor_line,
+                                 'corrected_upstream': False}
+            # add a tag in context to allow the write on a system JI (ex: to cancel a manual corr. done on a SI line)
+            context.update({'from_manual_corr_reversal': True})
+            aml_obj.write(cr, uid, ji_id, reverse_corr_vals, context=context, check=False, update_check=False)
+            # set the AJIs as non-corrected
+            aji_ids = aal_obj.search(cr, uid, [('move_id', '=', ji_id)], order='NO_ORDER', context=context)
+            aal_obj.write(cr, uid, aji_ids, {'is_reallocated': False}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+
+reverse_manual_correction_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account_corrections/account_wizard_view.xml'
--- bin/addons/account_corrections/account_wizard_view.xml	2016-05-27 09:17:16 +0000
+++ bin/addons/account_corrections/account_wizard_view.xml	2017-10-19 09:52:42 +0000
@@ -38,9 +38,14 @@
             <field name="arch" type="xml">
                 <form string="Journal items corrections Wizard">
                     <separator string="Correction"/>
-                    <field name="date" on_change="onchange_date(date)" colspan="2"/>
-                    <label string="" colspan="2"/>
-                    <field name="from_donation" invisible="1"/>
+                    <group col="10" colspan="4">
+                        <field name="date" on_change="onchange_date(date)" colspan="2"/>
+                        <field name="from_ji" invisible="1" colspan="2"/>
+                        <button name="correct_manually" type="object" string="Set as Corrected Manually" colspan="2"
+                                icon="terp-gtk-go-back-rtl" attrs="{'invisible': [('from_ji', '=', False)]}" />
+                        <label string="" colspan="2"/>
+                        <field name="from_donation" invisible="1" colspan="2"/>
+                    </group>
                     <newline/>
                     <field name="to_be_corrected_ids" colspan="6" context="{'from_donation_account': from_donation}" nolabel="1"/>
                     <newline/>
@@ -79,5 +84,19 @@
             </field>
         </record>
 
+    <!-- Reversal Manual Correction Wizard -->
+        <record model="ir.ui.view" id="reverse_manual_correction_wizard_form">
+            <field name="name">reverse.manual.correction.wizard.form</field>
+            <field name="model">reverse.manual.correction.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <label string="This line has been manually corrected. Do you want to reverse the correction?" colspan="4"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="terp-gtk-go-back-ltr" string="Reverse the correction" name="reverse_manual_correction" type="object"/>
+                </form>
+            </field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'bin/addons/account_corrections/wizard/journal_items_corrections.py'
--- bin/addons/account_corrections/wizard/journal_items_corrections.py	2017-04-19 10:18:53 +0000
+++ bin/addons/account_corrections/wizard/journal_items_corrections.py	2017-10-19 09:52:42 +0000
@@ -208,6 +208,7 @@
         'state': fields.selection([('draft', 'Draft'), ('open', 'Open')], string="state"),
         'from_donation': fields.boolean('From Donation account?'),
         'from_register': fields.function(_get_from_register, type='boolean', string='From register?', method=True, store=False),
+        'from_ji': fields.boolean('Opened from the JI view?'),
     }
 
     _defaults = {
@@ -359,6 +360,19 @@
                                               employee_id=aml.employee_id or False, transfer_journal_id=aml.transfer_journal_id or False,
                                               partner_id=aml.partner_id or False, raise_it=True, context=context)
 
+    def correct_manually(self, cr, uid, ids, context=None):
+        """
+        Gets the JI displayed in the wizard and sets it as Manually Corrected
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        aml_obj = self.pool.get('account.move.line')
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        aml_obj.set_as_corrected(cr, uid, [wizard.move_line_id.id], context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
     def action_confirm(self, cr, uid, ids, context=None, distrib_id=False):
         """
         Do a correction from the given line
@@ -368,6 +382,7 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+        aml_obj = self.pool.get('account.move.line')
         # Verify that date is superior to line's date
         for wiz in self.browse(cr, uid, ids, context=context):
             if wiz.move_line_id and wiz.move_line_id.date:
@@ -384,7 +399,6 @@
             if cp.state != 'draft':
                 raise osv.except_osv(_('Error'), _('Period (%s) is not open.') % (cp.name,))
 
-        aml_obj = self.pool.get('account.move.line')
         # Fetch old line
         old_line = wizard.move_line_id
         # Verify what have changed between old line and new one

=== modified file 'bin/addons/account_mcdb/account_mcdb.py'
--- bin/addons/account_mcdb/account_mcdb.py	2017-08-10 12:29:42 +0000
+++ bin/addons/account_mcdb/account_mcdb.py	2017-10-19 09:52:42 +0000
@@ -411,9 +411,15 @@
             # REALLOCATION field
             if wiz.reallocated:
                 if wiz.reallocated == 'reallocated':
+                    # entries corrected by the system (= not marked as corrected manually)
                     domain.append(('is_reallocated', '=', True))
+                    domain.append('|')
+                    domain.append(('move_id', '=', False))
+                    domain.append(('move_id.is_manually_corrected', '=', False))
                 elif wiz.reallocated == 'unreallocated':
+                    domain.append('|')
                     domain.append(('is_reallocated', '=', False))
+                    domain.append(('move_id.is_manually_corrected', '=', True))
             # REVERSED field
             if wiz.reversed:
                 if wiz.reversed == 'reversed':

=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2017-08-21 10:17:48 +0000
+++ bin/addons/account_override/account_move_line.py	2017-10-19 09:52:42 +0000
@@ -557,7 +557,8 @@
                     reconciliation = ml.reconcile_id or ml.reconcile_partial_id or False
                     if reconciliation and reconciliation.type == 'auto':
                         raise osv.except_osv(_('Warning'), _('Only manually reconciled entries can be unreconciled.'))
-                elif ml.move_id and ml.move_id.status == 'sys':
+                # prevent from modifying system JIs except for reversing a manual correction
+                elif ml.move_id and ml.move_id.status == 'sys' and not context.get('from_manual_corr_reversal'):
                     raise osv.except_osv(_('Warning'), _('You cannot change Journal Items that comes from the system!'))
             # Check date validity with period
             self._check_date_validity(cr, uid, ids, vals)

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-10-09 16:01:14 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-10-19 09:52:42 +0000
@@ -94508,7 +94508,7 @@
 msgid "Search Uninvoiced Lines"
 msgstr "Rechercher Lignes non-facturées"
 
-#. modules: res_currency_functional, financing_contract, msf_tools, account_voucher, account_hq_entries, account_override, product_attributes, base_report_designer, register_accounting, procurement_cycle, msf_accrual, finance, sync_client, purchase_followup, account_mcdb, res_currency_tables, supplier_catalogue, procurement_request, purchase, purchase_compare_rfq, board, stock_override, msf_doc_import, analytic_distribution, threshold_value, account_payment, msf_homere_interface, msf_instance, account_reconciliation, consumption_calculation, purchase_override, specific_rules, kit, sale_override, base, account_period_closing_level, msf_currency_revaluation, msf_supply_doc_export, product_list, procurement_report, msf_budget, account_corrections, account, msf_outgoing, stock_move_tracking, procurement_auto, documents_done, sale, msf_config_locations, sales_followup, vertical_integration, procurement, sourcing, msf_custom_settings, msf_audittrail, tender_flow, stock, msf_profile
+#. modules: res_currency_functional, financing_contract, msf_tools, account_voucher, account_hq_entries, account_override, product_attributes, base_report_designer, register_accounting, procurement_cycle, msf_accrual, finance, sync_client, purchase_followup, account_mcdb, res_currency_tables, supplier_catalogue, procurement_request, purchase, purchase_compare_rfq, board, stock_override, msf_doc_import, analytic_distribution, threshold_value, account_payment, msf_homere_interface, msf_instance, account_reconciliation, consumption_calculation, purchase_override, specific_rules, kit, sale_override, base, account_period_closing_level, msf_currency_revaluation, msf_supply_doc_export, product_list, procurement_report, msf_budget, account_corrections, account, msf_outgoing, stock_move_tracking, procurement_auto, documents_done, sale, msf_config_locations, sales_followup, vertical_integration, procurement, sourcing, msf_custom_settings, msf_audittrail, tender_flow, stock, msf_profile, account_corrections
 #: view:account.addtmpl.wizard:0
 #: view:account.aged.trial.balance:0
 #: view:account.analytic.Journal.report:0
@@ -94731,6 +94731,7 @@
 #: view:stock.picking.processor:0
 #: view:wizard.import.invoice.line:0
 #: view:wizard.report.paid.invoice:0
+#: view:reverse.manual.correction.wizard:0
 #, python-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -99629,3 +99630,51 @@
 #, python-format
 msgid "You can't delete this FX rate as the period \"%s\" isn't in Draft state."
 msgstr "Vous ne pouvez pas supprimer ce taux de change car la période \"%s\" n'est pas en statut Brouillon."
+
+#. module: account_corrections
+#: view:wizard.journal.items.corrections:0
+msgid "Set as Corrected Manually"
+msgstr "Marquer comme Corrigé Manuellement"
+
+#. module: account_corrections
+#: field:wizard.journal.items.corrections,from_ji:0
+msgid "Opened from the JI view?"
+msgstr "Ouvert depuis la vue Lignes d'Ecritures Comptables ?"
+
+#. module: account_corrections
+#: field:account.move.line,is_manually_corrected:0
+msgid "Is Manually Corrected"
+msgstr "Est Corrigé Manuellement"
+
+#. module: account_corrections
+#: code:addons/account_corrections/account_move_line.py:341
+#, python-format
+msgid "History Move Line"
+msgstr "Historique - Ecriture"
+
+#. module: account_corrections
+#: view:reverse.manual.correction.wizard:0
+msgid "This line has been manually corrected. Do you want to reverse the correction?"
+msgstr "Cette ligne a été corrigée manuellement. Voulez-vous annuler la correction ?"
+
+#. module: account_corrections
+#: view:reverse.manual.correction.wizard:0
+msgid "Reverse the correction"
+msgstr "Annuler la correction"
+
+#. module: account_corrections
+#: model:ir.model,name:account_corrections.model_reverse_manual_correction_wizard
+msgid "Manual Correction Reversal Wizard"
+msgstr "Assistant d'Annulation de Correction Manuelle"
+
+#. module: account_corrections
+#: code:addons/account_corrections/account_move_line.py:997
+#, python-format
+msgid "The entry %s has already been corrected."
+msgstr "L'écriture %s a déjà été corrigée."
+
+#. module: account_corrections
+#: code:addons/account_corrections/account_move_line.py:1001
+#, python-format
+msgid "One AJI related to the entry %s has already been corrected."
+msgstr "Une entrée analytique liée à l'écriture %s a déjà été corrigée."

=== 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	2017-08-23 18:38:09 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2017-10-19 09:52:42 +0000
@@ -74,7 +74,7 @@
 msf_sync_data_server.account_move_reconcile,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,[],"['name', 'type', 'is_multi_instance', 'multi_instance_level_creation', 'instance_id', 'nb_partial_legs']",HQ + MISSION,account.move.reconcile,,Account Move Reconcile,Valid,,410
 msf_sync_data_server.register_line_deleted,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['statement_id/id', 'sequence','instance_id/id']",MISSION,account.bank.statement.line.deleted,instance_id,Register Deleted Line,Valid,,405
 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']",HQ + MISSION,account.move.line,instance_id,Account Move Line,Valid,,412
+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']",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.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']",MISSION,account.bank.statement.line,instance_id,Register Line / Account Move Line,Valid,,415
@@ -181,7 +181,7 @@
 msf_usb_sync_data_server.cp_gl_journals_registers,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"['|',('type', '=', 'cash'),('type', '=', 'cheque')]","['bank_journal_id/id','analytic_journal_id/id', 'code', 'currency/id', 'default_credit_account_id/id', 'default_debit_account_id/id', 'name', 'type','instance_id/id']",USB,account.journal,,[MASTER] GL Journals - Registers,Valid,,1507
 msf_usb_sync_data_server.cp_account_move_reconcile,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['name', 'type']",USB,account.move.reconcile,,[MASTER] Account Move Reconcile,Valid,,1510
 msf_usb_sync_data_server.cp_account_move,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['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']",USB,account.move,,[MASTER] Account Move,Valid,,1520
-msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', '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', 'move_state', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date', 'unreconcile_date', 'unreconcile_txt']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521
+msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', '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', 'move_state', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date', 'unreconcile_date', 'unreconcile_txt', 'is_manually_corrected']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521
 msf_usb_sync_data_server.cp_account_move_line_correction,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",USB,account.move.line,,[MASTER] Account Move Line Correction,Valid,,1522
 msf_usb_sync_data_server.cp_account_move_line_register_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['corrected_st_line_id/id', 'instance_id/id']",USB,account.move.line,,[MASTER] Account Move Line / Register Line,Valid,,1523
 msf_usb_sync_data_server.cp_register_line_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['first_move_line_id/id', 'instance_id/id']",USB,account.bank.statement.line,,[MASTER] Register Line / Account Move Line,Valid,,1530