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

[jftempo]

=== modified file 'bin/addons/account_corrections/wizard/journal_items_corrections.py'
--- bin/addons/account_corrections/wizard/journal_items_corrections.py	2017-10-27 11:56:53 +0000
+++ bin/addons/account_corrections/wizard/journal_items_corrections.py	2018-03-01 09:41:41 +0000
@@ -59,7 +59,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
         for line_br in self.browse(cr, uid, ids, context=context):
-            res[line_br.id] = line_br.account_id and line_br.account_id.is_analytic_addicted or False
+            res[line_br.id] = line_br.account_id and line_br.account_id.is_analytic_addicted and not line_br.account_id.is_not_ad_correctable or False
         return res
 
     def _get_is_account_correctible(self, cr, uid, ids, name, args,  context=None):

=== modified file 'bin/addons/account_hq_entries/account.py'
--- bin/addons/account_hq_entries/account.py	2013-12-10 09:13:08 +0000
+++ bin/addons/account_hq_entries/account.py	2018-03-01 09:41:41 +0000
@@ -29,8 +29,30 @@
     _inherit = 'account.account'
 
     _columns = {
-        'is_not_hq_correctible': fields.boolean("Can not be corrected on HQ entries", help='If checked, this attribute will prevent user from correcting the account on the entry imported from HQ system'),
+        'is_not_hq_correctible': fields.boolean("Prevent correction on account codes",
+                                                help="If checked, this attribute will prevent the user from correcting the account on the entries"),
+        'is_not_ad_correctable': fields.boolean("Prevent correction on analytic accounts",
+                                                help="If this option is checked AD correction on this account will be prevented in the HQ entries and via the correction wizard.")
     }
 
+    def onchange_is_not_ad_correctable(self, cr, uid, ids, is_not_ad_correctable):
+        """
+        If is_not_ad_correctable is set to TRUE, also set is_not_hq_correctible to True
+        """
+        res = {}
+        if is_not_ad_correctable:
+            res['value'] = {'is_not_hq_correctible': True}
+        return res
+
+    def onchange_is_not_hq_correctible(self, cr, uid, ids, is_not_hq_correctible):
+        """
+        If is_not_hq_correctible is set to FALSE, also set is_not_ad_correctable to False
+        """
+        res = {}
+        if not is_not_hq_correctible:
+            res['value'] = {'is_not_ad_correctable': False}
+        return res
+
+
 account_account()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account_hq_entries/account_view.xml'
--- bin/addons/account_hq_entries/account_view.xml	2017-04-20 08:41:54 +0000
+++ bin/addons/account_hq_entries/account_view.xml	2018-03-01 09:41:41 +0000
@@ -188,7 +188,10 @@
             <field name="priority">30</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_type']" position="after">
-                    <field name="is_not_hq_correctible"/>
+                    <field name="is_not_hq_correctible" on_change="onchange_is_not_hq_correctible(is_not_hq_correctible)"/>
+                    <newline/>
+                    <label string="" colspan="2"/>
+                    <field name="is_not_ad_correctable" on_change="onchange_is_not_ad_correctable(is_not_ad_correctable)"/>
                 </xpath>
             </field>
         </record>

=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2017-04-18 08:02:20 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2018-03-01 09:41:41 +0000
@@ -475,6 +475,7 @@
             for line in self.browse(cr, uid, ids):
                 if line.account_id_first_value and line.account_id_first_value.is_not_hq_correctible and not account.is_not_hq_correctible:
                     raise osv.except_osv(_('Warning'), _('Change Expat salary account is not allowed!'))
+        self.check_ad_change_allowed(cr, uid, ids, vals, context=context)
         return super(hq_entries, self).write(cr, uid, ids, vals, context)
 
     def unlink(self, cr, uid, ids, context=None):
@@ -542,6 +543,29 @@
                 elif p.number == 12 and not self._is_dec_period_open(cr, uid, context):
                     raise mission_closed_except
 
+    def check_ad_change_allowed(self, cr, uid, ids, vals, context=None):
+        """
+        Raises a warning if the HQ entry Analytic Distribution is about to be modified although the general account is
+        set as "is_not_ad_correctable"
+        :param ids: ids of the HQ Entries
+        :param vals: new values about to be written
+        """
+        if context is None:
+            context = {}
+        if not context.get('sync_update_execution'):
+            account_obj = self.pool.get('account.account')
+            fields_list = ['account_id', 'cost_center_id', 'free_1_id', 'free_2_id', 'destination_id', 'analytic_id']
+            for hq_entry in self.browse(cr, uid, ids, fields_to_fetch=fields_list, context=context):
+                account_id = vals.get('account_id') and account_obj.browse(cr, uid, vals['account_id'], fields_to_fetch=['is_not_ad_correctable'], context=context)
+                hq_account = account_id or hq_entry.account_id
+                if hq_account.is_not_ad_correctable:
+                    for field in ['cost_center_id', 'destination_id', 'analytic_id', 'free_1_id', 'free_2_id']:
+                        value_changed = vals.get(field) and (not getattr(hq_entry, field) or getattr(hq_entry, field).id != vals[field])
+                        value_removed = getattr(hq_entry, field) and field in vals and not vals[field]
+                        if value_changed or value_removed:
+                            raise osv.except_osv(_('Warning'), _('The account %s - %s is set as \"Prevent correction on'
+                                                                 ' analytic accounts\".') % (hq_account.code, hq_account.name))
+
     def auto_import(self, cr, uid, file_to_import):
         import base64
         import os

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_split.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_split.py	2016-12-13 10:47:53 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_split.py	2018-03-01 09:41:41 +0000
@@ -53,6 +53,7 @@
         'ref': fields.char("Reference", size=255),
         'account_id': fields.many2one("account.account", "Account", domain=[('type', '!=', 'view')], required=True),
         'account_hq_correctible': fields.boolean("Is HQ correctible?"),
+        'is_not_ad_correctable': fields.boolean("Prevent correction on analytic accounts"),
         'amount': fields.float('Amount', required=True),
         'destination_id': fields.many2one('account.analytic.account', "Destination", domain=[('category', '=', 'DEST'), ('type', '!=', 'view')], required=True),
         'cost_center_id': fields.many2one('account.analytic.account', "Cost Center", domain=[('category', '=', 'OC'), ('type', '!=', 'view')], required=True),
@@ -114,6 +115,19 @@
             res = getattr(account, 'is_not_hq_correctible', False)
         return res
 
+    def _get_is_not_ad_correctable(self, cr, uid, context=None):
+        """
+        Returns True if the account of the original entry to split is set as 'is_not_ad_correctable'
+        """
+        res = False
+        if not context:
+            return res
+        original_line = self._get_original_line(cr, uid, context=context)
+        account = original_line and getattr(original_line, 'account_id', False) or False
+        if account:
+            res = getattr(account, 'is_not_ad_correctable', False)
+        return res
+
     _defaults = {
         'name': lambda obj, cr, uid, c: obj._get_field(cr, uid, 'name', context=c),
         'ref': lambda obj, cr, uid, c: obj._get_field(cr, uid, 'ref', context=c),
@@ -122,9 +136,23 @@
         'destination_id': lambda obj, cr, uid, c: obj._get_field(cr, uid, 'destination_id', field_type='m2o', context=c),
         'cost_center_id': lambda obj, cr, uid, c: obj._get_field(cr, uid, 'cost_center_id', field_type='m2o', context=c),
         'analytic_id': lambda obj, cr, uid, c: obj._get_field(cr, uid, 'analytic_id', field_type='m2o', context=c),
-        'account_hq_correctible': lambda obj, cr, uid, c: obj._get_hq_correctible(cr, uid, context=c)
+        'account_hq_correctible': lambda obj, cr, uid, c: obj._get_hq_correctible(cr, uid, context=c),
+        'is_not_ad_correctable': lambda obj, cr, uid, c: obj._get_is_not_ad_correctable(cr, uid, context=c)
     }
 
+    def _update_account_and_ad(self, wizard, vals):
+        """
+        Updates vals dictionary with the account and AD to use IF they are not retrieved from the wizard because they are readonly.
+        If so the values are taken from the original entry (use case: account set as is_not_hq_correctible / is_not_ad_correctable).
+        """
+        if wizard:
+            for field in ['account_id', 'destination_id', 'cost_center_id', 'analytic_id']:  # analytic_id = FP
+                if not vals.get(field):
+                    value = getattr(wizard.original_id, field) and getattr(wizard.original_id, field).id or False
+                    if not value:
+                        raise osv.except_osv(_('Error'), _('The account or AD of the original entry is missing or incomplete.'))
+                    vals[field] = value
+
     def create(self, cr, uid, vals, context=None):
         """
         Check that:
@@ -149,10 +177,7 @@
             if not vals.get('wizard_id'):
                 raise osv.except_osv(_('Error'), _('No link from this line to a specific wizard. Do you come from web client?'))
             wiz = self.pool.get('hq.entries.split').browse(cr, uid, vals.get('wizard_id', False))
-            account = wiz and wiz.original_id and wiz.original_id.account_id or False
-            if not account:
-                raise osv.except_osv(_('Error'), _('Account is required!'))
-            vals['account_id'] = account.id
+        self._update_account_and_ad(wiz, vals)
         # US-672/2
         hq_entry = self._get_original_line(cr, uid, context=context,
                                            wizard_id=vals.get('wizard_id', False))
@@ -199,7 +224,9 @@
                 raise osv.except_osv(_('Error'), _('Negative value is not allowed!'))
             elif original_amount < 0 and vals.get('amount') > 0.0:
                 raise osv.except_osv(_('Error'), _('Positive value is not allowed!'))
-        # Prepare some values
+
+        wizard = self.browse(cr, uid, ids[0], context=context).wizard_id
+        self._update_account_and_ad(wizard, vals)
 
         # US-672/2
         for line in self.browse(cr, uid, ids, context=context):

=== modified file 'bin/addons/account_hq_entries/wizard/wizard_view.xml'
--- bin/addons/account_hq_entries/wizard/wizard_view.xml	2016-07-19 16:06:07 +0000
+++ bin/addons/account_hq_entries/wizard/wizard_view.xml	2018-03-01 09:41:41 +0000
@@ -42,11 +42,16 @@
                             <field name="name" readonly="1" />
                             <field name="ref"/>
                             <field name="account_hq_correctible" invisible="1"/>
-                            <field name="account_id" attrs="{'readonly': [('account_hq_correctible', '=', True)]}" domain="[('type', '!=', 'view'), ('restricted_area', '=', 'hq_lines'), ('is_not_hq_correctible', '=', False)]"/>
+                            <field name="is_not_ad_correctable" invisible="1"/>
+                            <field name="account_id" attrs="{'readonly': [('account_hq_correctible', '=', True)]}"
+                                   domain="[('type', '!=', 'view'), ('restricted_area', '=', 'hq_lines'), ('is_not_hq_correctible', '=', False)]"/>
                             <field name="amount"/>
-                            <field name="destination_id"/>
-                            <field name="cost_center_id"/>
-                            <field name="analytic_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open'), ('cost_center_ids', '=', cost_center_id)]" string="Funding Pool" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('document_date')}"/>
+                            <field name="destination_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/>
+                            <field name="cost_center_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/>
+                            <field name="analytic_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"
+                                   domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open'), ('cost_center_ids', '=', cost_center_id)]"
+                                   string="Funding Pool"
+                                   context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('document_date')}"/>
                             <field name="state"/>
                             <field name="state_info"/>
                         </tree>

=== modified file 'bin/addons/account_override/__init__.py'
--- bin/addons/account_override/__init__.py	2017-08-18 12:48:57 +0000
+++ bin/addons/account_override/__init__.py	2018-03-01 09:41:41 +0000
@@ -195,7 +195,7 @@
         '!', ('code', '=like', '8%'),  # UTP-1187 exclude 8/9 accounts
         '!', ('code', '=like', '9%'),  # UTP-1187 exclude 8/9 accounts
         ('code', 'not in', ['10100', '10200', '10210']),  # UTP-1187 exclude liquidity / cash (10100, 10200, 10210) accounts
-        ('is_not_hq_correctible', '!=', True)  # UTP-1187 exclude with the "Can not be corrected on HQ entries" attribute set to "True" accounts
+        ('is_not_hq_correctible', '!=', True)  # UTP-1187 exclude the "Prevent correction on account codes" attribute set to "True" accounts
     ],
 }
 

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2018-01-03 10:28:31 +0000
+++ bin/addons/msf_doc_import/account.py	2018-03-01 09:41:41 +0000
@@ -406,10 +406,10 @@
                         errors.append(_("Line %s. Thirdparty not compatible with account '%s - %s'") % (current_line_num, account.code, account.name, ))
                         continue
 
-                    # US-3461 Accounts that can't be corrected on HQ entries are not allowed here
+                    # US-3461 Accounts that can't be corrected on Account Codes are not allowed here
                     if account.is_not_hq_correctible:
                         errors.append(_("Line %s. The account \"%s - %s\" cannot be used because it is set as "
-                                        "\"Can not be corrected on HQ entries\".") % (current_line_num, account.code, account.name,))
+                                        "\"Prevent correction on account codes\".") % (current_line_num, account.code, account.name,))
                         continue
 
                     # Check analytic axis only if G/L account is analytic-a-holic

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py	2017-06-12 09:46:03 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py	2018-03-01 09:41:41 +0000
@@ -167,14 +167,14 @@
                         domain.extend(ACCOUNT_RESTRICTED_AREA['intermission_lines'])
                         error_domain = _("Line %s: Some restrictions prevent account %s to be used to import this line:\n"
                                          "- the account cannot be of type 'View'\n"
-                                         "- account can not be corrected on HQ entries\n"
+                                         "- account can not be set as 'Prevent correction on account codes'\n"
                                          "- 'Account Type' should be in ('expense', 'income', 'receivables')\n"
                                          "- 'P&L / BS Category' cannot be None.") % (line_num, account_value)
                     else:
                         domain.extend(ACCOUNT_RESTRICTED_AREA['invoice_lines'])
                         error_domain = _("Line %s: Some restrictions prevent account %s to be used to import this line:\n"
                                          "- the account cannot be of type 'View' or 'Liquidity'\n"
-                                         "- account can not be corrected on HQ entries\n"
+                                         "- account can not be set as 'Prevent correction on account codes'\n"
                                          "- 'Type for specific treatment' cannot be 'Donations'\n"
                                          "- 'Internal Type' should be different from 'Regular' OR 'Account Type' should be different from 'Stock'\n"
                                          "- 'Account Type' should be different from 'Expense' OR 'P&L / BS Category' not None."

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-02-23 13:41:43 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-03-01 09:41:41 +0000
@@ -29018,8 +29018,8 @@
 
 #. module: account_hq_entries
 #: field:account.account,is_not_hq_correctible:0
-msgid "Can not be corrected on HQ entries"
-msgstr "Impossible à corriger dans les entrées HQ"
+msgid "Prevent correction on account codes"
+msgstr "Empêcher toutes corrections sur ce code comptable"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -35091,8 +35091,8 @@
 
 #. module: account_hq_entries
 #: help:account.account,is_not_hq_correctible:0
-msgid "If checked, this attribute will prevent user from correcting the account on the entry imported from HQ system"
-msgstr "If checked, this attribute will prevent user from correcting the account on the entry imported from HQ system"
+msgid "If checked, this attribute will prevent the user from correcting the account on the entries"
+msgstr "Si cet attribut est coché, il empêchera l'utilisateur de corriger le compte sur les écritures"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -45081,6 +45081,7 @@
 msgid "Pricelists Types"
 msgstr "Type de Liste de Prix"
 
+<<<<<<< TREE
 #. modules: account, msf_instance
 #: help:account.journal,entry_posted:0
 #: help:account.journal.fake,entry_posted:0
@@ -45093,6 +45094,12 @@
 #: view:cash.request:0
 msgid "Planned expense for the coming period"
 msgstr "Dépense prévue pour la période à venir"
+=======
+#. module: sale
+#: report:msf.report_reception_in:0
+msgid "KC"
+msgstr "GF"
+>>>>>>> MERGE-SOURCE
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procure_confirmed
@@ -104094,13 +104101,13 @@
 #, python-format
 msgid "Line %s: Some restrictions prevent account %s to be used to import this line:\n"
 "- the account cannot be of type 'View' or 'Liquidity'\n"
-"- account can not be corrected on HQ entries\n"
+"- account can not be set as 'Prevent correction on account codes'\n"
 "- 'Type for specific treatment' cannot be 'Donations'\n"
 "- 'Internal Type' should be different from 'Regular' OR 'Account Type' should be different from 'Stock'\n"
 "- 'Account Type' should be different from 'Expense' OR 'P&L / BS Category' not None."
 msgstr "Ligne %s: Des restrictions empêchent le compte %s d'être utilisé pour importer cette ligne :\n"
 "- le compte ne peut pas être de type 'Vue' ou 'Liquidités'\n"
-"- compte impossible à corriger dans les entrées HQ\n"
+"- le compte ne peut pas être défini comme 'Empêcher toutes corrections sur ce code comptable'\n"
 "- 'Type pour traitement spécifique' ne peut pas être 'Donations'\n"
 "- 'Type Interne' doit être différent de 'Normal' OU 'Type de Compte' doit être différent de 'Stock'\n"
 "- 'Type de Compte' doit être différent de 'Expense' OU 'Catégorie Bilan/Cte de Résultat' ne doit pas être vide."
@@ -104116,12 +104123,12 @@
 #, python-format
 msgid "Line %s: Some restrictions prevent account %s to be used to import this line:\n"
 "- the account cannot be of type 'View'\n"
-"- account can not be corrected on HQ entries\n"
+"- account can not be set as 'Prevent correction on account codes'\n"
 "- 'Account Type' should be in ('expense', 'income', 'receivables')\n"
 "- 'P&L / BS Category' cannot be None."
 msgstr "Ligne %s: Des restrictions empêchent le compte %s d'être utilisé pour importer cette ligne :\n"
 "- le compte ne peut pas être de type 'Vue'\n"
-"- compte impossible à corriger dans les entrées HQ\n"
+"- le compte ne peut pas être défini comme 'Empêcher toutes corrections sur ce code comptable'\n"
 "- 'Type de Compte' doit être de type 'expense', 'income' ou 'receivables'\n"
 "- 'Catégorie Bilan/Cte de Résultat' ne doit pas être vide."
 
@@ -105338,8 +105345,8 @@
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/account.py:383
 #, python-format
-msgid "Line %s. The account \"%s - %s\" cannot be used because it is set as \"Can not be corrected on HQ entries\"."
-msgstr "Ligne %s. Le compte \"%s - %s\" ne peut pas être utilisé car il est défini comme \"Impossible à corriger dans les entrées HQ\"."
+msgid "Line %s. The account \"%s - %s\" cannot be used because it is set as \"Prevent correction on account codes\"."
+msgstr "Ligne %s. Le compte \"%s - %s\" ne peut pas être utilisé car il est défini comme \"Empêcher toutes corrections sur ce code comptable\"."
 
 #. module: msf_homere_interface
 #: code:addons/msf_homere_interface/wizard/hr_payroll_validation.py:147
@@ -106788,6 +106795,7 @@
 #: field:import.commitment.wizard,progress:0
 msgid "Import in progress"
 msgstr "Import en cours"
+<<<<<<< TREE
 
 #. module: product_nomenclature
 #: code:addons/product_nomenclature/product_nomenclature.py:742
@@ -107118,3 +107126,28 @@
 
 
 
+=======
+
+#. module: account_hq_entries
+#: field:account.account,is_not_ad_correctable:0
+#: field:hq.entries.split.lines,is_not_ad_correctable:0
+msgid "Prevent correction on analytic accounts"
+msgstr "Empêcher la correction sur les comptes analytiques"
+
+#. module: account_hq_entries
+#: help:account.account,is_not_ad_correctable:0
+msgid "If this option is checked AD correction on this account will be prevented in the HQ entries and via the correction wizard."
+msgstr "Si cette option est cochée la correction de la Distribution Analytique sur ce compte sera empêchée dans les Écritures HQ et via l'assistant de correction."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/hq_entries.py:566
+#, python-format
+msgid "The account %s - %s is set as \"Prevent correction on analytic accounts\"."
+msgstr "Le compte %s - %s est défini comme \"Empêcher la correction sur les comptes analytiques\"."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/hq_entries_split.py:150
+#, python-format
+msgid "The account or AD of the original entry is missing or incomplete."
+msgstr "Le compte ou la Distribution Analytique de l'écriture d'origine est manquant(e) ou incomplet(e)."
+>>>>>>> MERGE-SOURCE

=== 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-02-22 14:23:17 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-03-01 09:41:41 +0000
@@ -16,7 +16,7 @@
 msf_sync_data_server.currency_activator,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('active', '!=', ''),('currency_table_id', '!=', ''), ('currency_table_id.state', '=', 'valid')]",['active'],OC,res.currency,,Currency activator,Valid,,114
 msf_sync_data_server.currency_table_header_state,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('state','=','valid')]",['state'],OC,res.currency.table,,Currency Table Header State,Valid,,115
 msf_sync_data_server.gl_account_type,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['close_method', 'code', 'name', 'note', 'not_correctible', 'report_type']",OC,account.account.type,,GL Account Type,Valid,,116
-msf_sync_data_server.gl_accounts,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['accrual_account','code', 'default_destination_id/id', 'display_in_reports', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', 'shrink_entries_for_hq', 'type', 'type_for_register', 'user_type/id', 'currency_revaluation', 'include_in_yearly_move', 'has_partner_type_internal', 'has_partner_type_section', 'has_partner_type_external', 'has_partner_type_esc', 'has_partner_type_intermission', 'has_partner_type_local', 'has_partner_type_ex', 'has_partner_type_book', 'has_partner_type_empty' ]",OC,account.account,,GL Accounts,Valid,,117
+msf_sync_data_server.gl_accounts,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['accrual_account','code', 'default_destination_id/id', 'display_in_reports', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', 'shrink_entries_for_hq', 'type', 'type_for_register', 'user_type/id', 'currency_revaluation', 'include_in_yearly_move', 'has_partner_type_internal', 'has_partner_type_section', 'has_partner_type_external', 'has_partner_type_esc', 'has_partner_type_intermission', 'has_partner_type_local', 'has_partner_type_ex', 'has_partner_type_book', 'has_partner_type_empty', 'is_not_ad_correctable']",OC,account.account,,GL Accounts,Valid,,117
 msf_sync_data_server.gl_accounts_tree,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('parent_id', '!=', '')]",['parent_id/id'],OC,account.account,,GL Accounts Tree,Valid,,118
 msf_sync_data_server.analytical_journal_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'section')]","['active', 'code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,,Analytical Journal (HQ),Valid,,119
 msf_sync_data_server.analytical_journal_coordo,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'coordo'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Coordo),Valid,,120
@@ -173,7 +173,7 @@
 msf_usb_sync_data_server.cp_currency_table_header_state,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('state','=','valid')]",['state'],USB,res.currency.table,,[MASTER] Currency Table Header State,Valid,,1155
 msf_usb_sync_data_server.cp_currency_rate,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('rate' , '!=' , ''),('currency_id', '!=', ''), ('currency_id', 'in', ('res.currency', 'id', [('active', 'in', ['t', 'f']), ('currency_table_id', '=', '')]))]","['currency_id/id', 'name', 'rate']",USB,res.currency.rate,,[MASTER] Currency Rate,Valid,,1156
 msf_usb_sync_data_server.cp_gl_account_type,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['close_method', 'code', 'name', 'note', 'report_type']",USB,account.account.type,,[MASTER] GL Account Type,Valid,,1400
-msf_usb_sync_data_server.cp_gl_accounts,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['accrual_account','code', 'default_destination_id/id', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', 'type', 'type_for_register', 'user_type/id', 'currency_revaluation', 'include_in_yearly_move', 'has_partner_type_internal', 'has_partner_type_section', 'has_partner_type_external', 'has_partner_type_esc', 'has_partner_type_intermission', 'has_partner_type_local', 'has_partner_type_ex', 'has_partner_type_book', 'has_partner_type_empty' ]",USB,account.account,,[MASTER] GL Accounts,Valid,,1410
+msf_usb_sync_data_server.cp_gl_accounts,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['accrual_account','code', 'default_destination_id/id', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', 'type', 'type_for_register', 'user_type/id', 'currency_revaluation', 'include_in_yearly_move', 'has_partner_type_internal', 'has_partner_type_section', 'has_partner_type_external', 'has_partner_type_esc', 'has_partner_type_intermission', 'has_partner_type_local', 'has_partner_type_ex', 'has_partner_type_book', 'has_partner_type_empty', 'is_not_ad_correctable']",USB,account.account,,[MASTER] GL Accounts,Valid,,1410
 msf_usb_sync_data_server.cp_gl_accounts_tree,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],USB,account.account,,[MASTER] GL Accounts Tree,Valid,,1411
 msf_usb_sync_data_server.cp_analytical_journal_hq,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('instance_id.level', '=', 'section')]","['active', 'code', 'name', 'type','instance_id/id']",USB,account.analytic.journal,,[MASTER] Analytical Journal (HQ),Valid,,1420
 msf_usb_sync_data_server.cp_analytical_journal_coordo,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('instance_id.level', '=', 'coordo')]","['active', 'code', 'name', 'type','instance_id/id']",USB,account.analytic.journal,,[MASTER] Analytical Journal (Coordo),Valid,,1421