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

[jftempo]

=== modified file 'bin/addons/msf_printed_documents/printed_report.py'
--- bin/addons/msf_printed_documents/printed_report.py	2015-11-23 13:16:58 +0000
+++ bin/addons/msf_printed_documents/printed_report.py	2021-11-08 17:38:32 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF 
+#    Copyright (C) 2011 TeMPO Consulting, MSF
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,7 +22,7 @@
 from osv import osv
 from osv import fields
 from tools.translate import _
-
+from tools.safe_eval import safe_eval
 import re
 
 HELP_TARGET = '''
@@ -36,6 +36,7 @@
           ${eval(function)} => Return the value of the function. The function is a 
                                method of the object like function(self, cr, uid, ids)
 
+          ${_('String')}    => translate String
           %(year)s          => Current year (e.g: 2013, 2014, ...)
           %(month)s         => Current month number (e.g: 01, 02, ..., 12)
           %(day)s           => Current day of month number (e.g: 25)
@@ -102,7 +103,7 @@
         error = ''
         if report.target_filename:
             report_name = self.pool.get('ir.sequence')._process(cr, uid, report.target_filename)
-            values_to_compute = re.findall('\${((?:\w+.?)*)}', report_name)
+            values_to_compute = re.findall('\${((?:[\'"\w]+.?)*)}', report_name)
             vals_dict = {}
             # No possibility to compute the file name
             if values_to_compute and not active_model or not active_id:
@@ -115,12 +116,16 @@
                 vals_dict[field_name] = ''
                 model_doc = model_obj.browse(cr, uid, active_id, context=context)
                 # Use a function to compute the name
+                if field_name.startswith('_('):
+                    to_trans = field_name[3:-2]
+                    vals_dict[field_name] = _(to_trans)
+                    continue
                 if field_name.startswith('eval'):
                     func_name = field_name[5:-1]
                     try:
                         vals_dict.update({field_name: getattr(model_doc, func_name)(context=context)})
                         continue
-                    except AttributeError as e:
+                    except AttributeError:
                         error += _('%s : The function \'%s\' is not a valid function for the \'%s\' model.\n') % (field_name, func_name, report.model._name)
                         break
 
@@ -180,21 +185,21 @@
         Check the validity of the target filename of the report
         '''
         valid_fields_type = (
-                fields.many2one,
-                fields.selection,
-                fields.char,
-                fields.float,
-                fields.integer,
-                fields.date,
-                fields.datetime,
-                fields.time,
+            fields.many2one,
+            fields.selection,
+            fields.char,
+            fields.float,
+            fields.integer,
+            fields.date,
+            fields.datetime,
+            fields.time,
         )
         bad_type = False
 
         for report in self.browse(cr, uid, ids, context=context):
             if not report.target_filename:
                 continue
-    
+
             error = ''
             try:
                 report_name = self.pool.get('ir.sequence')._process(cr, uid, report.target_filename)
@@ -205,9 +210,16 @@
                 break
 
             # Check if the fields in ${} are valid
-            fields_name = re.findall('\${((?:\w+.?)*)}', report_name)
+            fields_name = re.findall('\${((?:[\'"\w+].?)*)}', report_name)
             for field_name in fields_name:
                 # Use a function to compute the name
+                if field_name.startswith('_('):
+                    try:
+                        safe_eval(field_name, locals_dict={'_': lambda *x: x})
+                    except:
+                        error += _('%s : invalid syntax') % field_name
+                        break
+                    continue
                 if field_name.startswith('eval'):
                     func_name = field_name[5:-1]
                     model_doc = self.pool.get(report.model)
@@ -241,7 +253,7 @@
                         error += _('%s : The field \'%s\' is not in \'%s\' model.\n') % (field_name, split_field[i], model_doc._name)
                         break
                         if not isinstance(model_doc._columns[field], valid_fields_type):
-                            bad_type = True                    
+                            bad_type = True
                             error += _('%s : The field \'%s\' is not a valid field type for report name.\n') % (field_name, field)
 
             if bad_type:
@@ -257,10 +269,10 @@
 
             if error:
                 raise osv.except_osv(_('Error'), error)
-    
+
         return True
 
-    _constraints = [ 
+    _constraints = [
         (_check_target_validity, 'The target filename given is not valid', ['target_filename']),
     ]
 
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-11-05 15:11:49 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-11-08 17:38:32 +0000
@@ -278,7 +278,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Accrual reversal entries"
-msgstr "Accrual reversal entries"
+msgstr "Ecritures d'extourne comptes de régul."
 
 #. module: account_mcdb
 #: view:account.analytic.line:0
@@ -616,7 +616,7 @@
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for bank reconciliation"
-msgstr "Ouvrir pour reconciliation des écritures bancaires"
+msgstr "Ouvrir pour réconciliation des écritures bancaires"
 
 #. module: analytic_distribution
 #: code:addons/analytic_distribution/wizard/analytic_distribution_wizard.py:1027
@@ -1433,11 +1433,6 @@
 msgid "This is use as task responsible"
 msgstr "Ceci est utilisé comme responsable de tâche"
 
-#. module: register_accounting
-#: report:cash.inventory:0
-msgid "Cashbox"
-msgstr "Cashbox"
-
 #. module: kit
 #: code:addons/kit/kit.py:340
 #, python-format
@@ -1993,7 +1988,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you generate and post all recurring entries?"
-msgstr "Did you generate and post all recurring entries?"
+msgstr "Avez-vous généré et comptabilisé les écritures périodiques ?"
 
 #. module: register_accounting
 #: report:addons/register_accounting/report/fully_report_xls.mako:743
@@ -10262,7 +10257,7 @@
 msgid "Yearly closure"
 msgstr "Clôture Annuelle"
 
-#. modules: msf_order_date, purchase, account, msf_outgoing, purchase_allocation_report, procurement, supplier_catalogue, documents_done, purchase_override, sale, sales_followup, out_step, sourcing, transport_mgmt, msf_supply_doc_export, stock_forecast, procurement_request, stock, stock_override
+#. modules: msf_order_date, purchase, account, msf_outgoing, purchase_allocation_report, procurement, supplier_catalogue, documents_done, purchase_override, sale, sales_followup, out_step, sourcing, transport_mgmt, msf_supply_doc_export, stock_forecast, procurement_request, stock, stock_override, register_accounting
 #: field:po.follow.up,confirmed_ok:0
 #: view:account.bank.statement:0
 #: selection:documents.done.wizard,display_state:0
@@ -10308,10 +10303,18 @@
 #: selection:sale.order.line,state_to_display:0
 #: selection:purchase.order.line,state_to_display:0
 #: code:addons/stock_override/report/delivery_order.py:61
+#: report:cash.inventory:0
+#: report:bank.reconciliation:0
 #, python-format
 msgid "Confirmed"
 msgstr "Confirmé"
 
+#. module: register_accounting
+#: report:cash.inventory:0
+#: report:bank.reconciliation:0
+msgid "Not confirmed"
+msgstr "Non confirmé"
+
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "PostgreSQL sequence"
@@ -15936,7 +15939,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you import and validate all payroll entries?"
-msgstr "Did you import and validate all payroll entries?"
+msgstr "Avez-vous importé et validé les écritures de paie ?"
 
 #. module: specific_rules
 #: model:ir.model,name:specific_rules.model_unconsistent_stock_report
@@ -19578,7 +19581,7 @@
 #: field:account.bank.statement,balance_end_real:0
 #: view:account.bank.statement:0
 msgid "Closing Balance"
-msgstr "Solde de clôture"
+msgstr "Solde Final"
 
 #. module: register_accounting
 #: code:addons/register_accounting/account_bank_statement.py:2397
@@ -22222,7 +22225,7 @@
 #: report:bank.reconciliation:0
 #: report:cash.inventory:0
 msgid "End of month balance state:"
-msgstr "End of month balance state:"
+msgstr "Statut du solde de fin de mois :"
 
 #. module: sourcing
 #: code:addons/sourcing/sale_order_line.py:848
@@ -22493,7 +22496,7 @@
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "Relevé bancaire utilisé pour la reconciliation bancaire"
+msgstr "Relevé bancaire utilisé pour la réconciliation bancaire"
 
 #. modules: msf_doc_import, register_accounting, account
 #: code:addons/msf_doc_import/account.py:587
@@ -23148,7 +23151,7 @@
 #. module: register_accounting
 #: view:account.bank.statement:0
 msgid "Are you sure you want to freeze closing balance?"
-msgstr "Etes-vous certain de vouloir geler le solde de clôture ?"
+msgstr "Etes-vous certain de vouloir geler le solde final ?"
 
 #. module: base
 #: selection:res.config.users,context_tz:0
@@ -23398,7 +23401,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Supplier refunds"
-msgstr "Remboursement Fournisseur"
+msgstr "Avoirs Fournisseur"
 
 #. modules: account_hq_entries, msf_homere_interface
 #: code:addons/account_hq_entries/wizard/hq_entries_validation.py:428
@@ -25798,7 +25801,7 @@
 #. module: register_accounting
 #: field:account.bank.statement,closing_balance_frozen:0
 msgid "Closing balance freezed?"
-msgstr "Solde de clôture gelé?"
+msgstr "Solde final gelé ?"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -25818,11 +25821,21 @@
 msgid "No first period found in the fiscal year %s."
 msgstr "No first period found in the fiscal year %s."
 
-#. modules: res_currency_functional, register_accounting
+#. module: res_currency_functional
 #: field:account.bank.statement.line,functional_out:0
 msgid "Func. Out"
 msgstr "Mnt Sortant"
 
+#. module: register_accounting
+#: report:addons/register_accounting/report/pending_cheque_xls.mako:229
+msgid "Func. Out"
+msgstr "Montant Sortant Fonc."
+
+#. module: register_accounting
+#: report:addons/register_accounting/report/pending_cheque_xls.mako:227
+msgid "Book. Out"
+msgstr "Montant Sortant Enreg."
+
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
@@ -26152,7 +26165,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Cash registers"
-msgstr "Cash registers"
+msgstr "Registres de caisse"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
@@ -26413,7 +26426,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you validate all the draft commitment vouchers?"
-msgstr "Did you validate all the draft commitment vouchers?"
+msgstr "Avez-vous validé les bons d'engagement en brouillon ?"
 
 #. module: consumption_calculation
 #: report:product.likely.expire.report_pdf:0
@@ -29235,7 +29248,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Recurring entries"
-msgstr "Recurring entries"
+msgstr "Ecritures périodiques"
 
 #. module: stock_schedule
 #: field:stock.frequence,monthly_choose_day:0
@@ -29605,7 +29618,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you check that exchange rates have been updated for the period?"
-msgstr "Did you check that exchange rates have been updated for the period?"
+msgstr "Avez-vous vérifié que le taux de change est à jour pour la période ?"
 
 #. module: sale
 #: report:addons/sale/report/sale_donation_stock_moves_report_xls.mako:131
@@ -29772,7 +29785,7 @@
 #. module: account_period_closing_level
 #: field:account.period,is_system:0
 msgid "System period ?"
-msgstr "System period ?"
+msgstr "Période système ?"
 
 #. modules: specific_rules, msf_tools, msf_supply_doc_export, stock_override, stock
 #: view:export.report.inconsistencies:0
@@ -30960,7 +30973,7 @@
 #: code:addons/msf_homere_interface/hr_payroll.py:369
 #, python-format
 msgid "Payroll B/S lines"
-msgstr "Lignes de paye du bilan"
+msgstr "Lignes de paie du bilan"
 
 #. module: msf_tools
 #: view:export.report.inconsistencies:0
@@ -32536,7 +32549,7 @@
 #. module: register_accounting
 #: field:account.bank.statement,closing_balance_frozen_date:0
 msgid "Closing balance frozen date"
-msgstr "Closing balance frozen date"
+msgstr "Date de gel du solde final"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -41032,7 +41045,7 @@
 #. module: register_accounting
 #: report:addons/register_accounting/report/pending_cheque_xls.mako:179
 msgid "PENDING CHEQUE"
-msgstr "PENDING CHEQUE"
+msgstr "RAPPORT DES CHÈQUES EN ATTENTE"
 
 #. modules: msf_processes, account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -41974,6 +41987,7 @@
 "          ${eval(function)} => Return the value of the function. The function is a \n"
 "                               method of the object like function(self, cr, uid, ids)\n"
 "\n"
+"          ${_('String')}    => translate String\n"
 "          %(year)s          => Current year (e.g: 2013, 2014, ...)\n"
 "          %(month)s         => Current month number (e.g: 01, 02, ..., 12)\n"
 "          %(day)s           => Current day of month number (e.g: 25)\n"
@@ -41998,6 +42012,7 @@
 "          ${eval(function)} => Retourne la valeur d'une fonction. La fonction est une \n"
 "                               méthode de l'objet comme function(self, cr, uid, ids)\n"
 "\n"
+"          ${_('String')}    => traduire String\n"
 "          %(year)s          => Année courante (e.g: 2013, 2014, ...)\n"
 "          %(month)s         => Numéro du mois courant (e.g: 01, 02, ..., 12)\n"
 "          %(day)s           => Numéro du jour du mois courant (e.g: 25)\n"
@@ -43065,11 +43080,6 @@
 msgid "Expat employee import"
 msgstr "Importation des travailleurs expatriés"
 
-#. module: register_accounting
-#: report:addons/register_accounting/report/fully_report_xls.mako:469
-msgid "CHEQUE REGISTER"
-msgstr "REGISTRE DE CHÈQUE"
-
 #. modules: account, finance
 #: view:account.move:0
 #: view:cash.request:0
@@ -43460,7 +43470,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you post Accrual Reversal entries?"
-msgstr "Did you post Accrual Reversal entries?"
+msgstr "Avez-vous comptabilisé les écritures d'extourne des comptes de régularisation ?"
 
 #. module: base
 #: model:res.currency,currency_name:base.MKD
@@ -43714,7 +43724,7 @@
 #: code:addons/account_period_closing_level/account_period.py:644
 #, python-format
 msgid "HQ entries"
-msgstr "HQ entries"
+msgstr "Ecritures HQ"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
@@ -45688,7 +45698,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you close all your registers?"
-msgstr "Did you close all your registers?"
+msgstr "Avez-vous fermé tous les registres ?"
 
 #. module: analytic_override
 #: field:account.analytic.account,intermission_restricted:0
@@ -50130,6 +50140,7 @@
 
 #. module: register_accounting
 #: model:ir.actions.report.xml,name:register_accounting.fully_report
+#: code:ir.actions.report.xml:name:fully.report
 msgid "Full Report"
 msgstr "Rapport Complet"
 
@@ -52159,7 +52170,7 @@
 #: view:account.entries.report:0
 #: view:account.period:0
 msgid "Unreconciled entries"
-msgstr "Unreconciled entries"
+msgstr "Ecritures non lettrées"
 
 #. module: base
 #: field:ir.model.fields,relation_field:0
@@ -53457,6 +53468,7 @@
 #: report:addons/account/report/free_allocation_report.mako:199
 #: report:addons/account/report/invoice_excel_export.mako:73
 #: report:addons/account/report/export_invoice.mako:0
+#: report:addons/register_accounting/report/fully_report_xls.mako:576
 #, python-format
 msgid "Account"
 msgstr "Compte"
@@ -56605,7 +56617,7 @@
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr "Solde de clôture basé sur la Caisse"
+msgstr "Solde final basé sur la Caisse"
 
 #. modules: threshold_value, product_nomenclature, order_nomenclature, consumption_calculation, specific_rules, kit, procurement_auto, procurement_cycle, mission_stock, procurement_report, stock
 #: view:monthly.review.consumption:0
@@ -58318,11 +58330,6 @@
 msgid "Delivery address name"
 msgstr "Delivery address name"
 
-#. module: register_accounting
-#: report:addons/register_accounting/report/fully_report_xls.mako:469
-msgid "CASH REGISTER"
-msgstr "REGISTRE DE CAISSE"
-
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
@@ -58674,7 +58681,7 @@
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr "Reconciliation bancaire"
+msgstr "Réconciliation bancaire"
 
 #. module: kit
 #: field:composition.item,item_stock_move_id:0
@@ -58772,7 +58779,6 @@
 #: report:addons/account_mcdb/report/report_account_bank_statement_line_xls.mako:57
 #: field:account.bank.statement.line,amount_in:0
 #: report:addons/register_accounting/report/cheque_inventory_xls.mako:170
-#: report:addons/register_accounting/report/pending_cheque_xls.mako:226
 #, python-format
 msgid "Amount In"
 msgstr "Montant Entrant"
@@ -60694,7 +60700,7 @@
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
 msgid "Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system."
-msgstr "Une reconciliation bancaire consiste à vérifier que votre relevé bancaire corresponde aux écritures (ou enregistrements) de ce compte dans votre système comptable."
+msgstr "Une réconciliation bancaire consiste à vérifier que votre relevé bancaire corresponde aux écritures (ou enregistrements) de ce compte dans votre système comptable."
 
 #. module: consumption_calculation
 #: field:expiry.quantity.report.line,expired_qty:0
@@ -62195,7 +62201,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you import and validate HQ entries (ONLY FOR COORDO)?"
-msgstr "Did you import and validate HQ entries (ONLY FOR COORDO)?"
+msgstr "Avez-vous importé et validé les écritures du HQ (SEULEMENT POUR LA COORDO) ?"
 
 #. module: sale
 #: code:addons/sale/sale_order.py:2176
@@ -65806,7 +65812,6 @@
 #: report:addons/account_mcdb/report/report_account_bank_statement_line_xls.mako:57
 #: field:account.bank.statement.line,amount_out:0
 #: report:addons/register_accounting/report/cheque_inventory_xls.mako:171
-#: report:addons/register_accounting/report/pending_cheque_xls.mako:227
 #, python-format
 msgid "Amount Out"
 msgstr "Montant Sortant"
@@ -66447,7 +66452,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Do closing period (Field) process"
-msgstr "Do closing period (Field) process"
+msgstr "Effectuer la clôture de la période (Terrain)"
 
 #. module: return_claim
 #: model:ir.model,name:return_claim.model_add_event
@@ -69966,12 +69971,12 @@
 #: report:addons/account/report/account_liquidity_balance.mako:174
 #: report:cash.inventory:0
 msgid "Closing balance"
-msgstr "Solde de clôture"
+msgstr "Solde final"
 
 #. module: register_accounting
 #: report:addons/register_accounting/report/fully_report_xls.mako:512
 msgid "Closing balance:"
-msgstr "Solde de Clôture :"
+msgstr "Solde final :"
 
 #. module: register_accounting
 #: report:addons/register_accounting/report/fully_report_xls.mako:510
@@ -75382,7 +75387,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you check open entries booked on accounts that can be reconciled?"
-msgstr "Did you check open entries booked on accounts that can be reconciled?"
+msgstr "Avez-vous vérifié les écritures enregistrées et non lettrées ?"
 
 #. module: msf_outgoing
 #: model:ir.module.module,description:msf_outgoing.module_meta_information
@@ -76518,11 +76523,20 @@
 msgid "Draft Picking Ticket"
 msgstr "Brouillon Bon de Picking"
 
-#. modules: register_accounting, res_currency_functional
+#. module: res_currency_functional
 #: field:account.bank.statement.line,functional_in:0
+msgid "Func. In"
+msgstr "Montant Entrant"
+
+#. module: register_accounting
 #: report:addons/register_accounting/report/pending_cheque_xls.mako:228
 msgid "Func. In"
-msgstr "Montant Entrant"
+msgstr "Montant Entrant Fonc."
+
+#. module: register_accounting
+#: report:addons/register_accounting/report/pending_cheque_xls.mako:226
+msgid "Book. In"
+msgstr "Montant Entrant Enreg."
 
 #. module: base
 #: model:res.currency,currency_name:base.SDG
@@ -77980,8 +77994,9 @@
 #. module: register_accounting
 #: report:bank.reconciliation:0
 #: model:ir.actions.report.xml,name:register_accounting.bank_reconciliation
+#: code:ir.actions.report.xml:name:bank.reconciliation
 msgid "Bank Reconciliation"
-msgstr "Reconciliation Bancaire"
+msgstr "Réconciliation Bancaire"
 
 #. module: sales_followup
 #: report:addons/sales_followup/report/sale_follow_up_report_xls.mako:227
@@ -79703,7 +79718,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Supplier direct invoices"
-msgstr "Supplier direct invoices"
+msgstr "Factures directes fournisseur"
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:697
@@ -88431,8 +88446,9 @@
 #. module: register_accounting
 #: report:cash.inventory:0
 #: model:ir.actions.report.xml,name:register_accounting.cash_inventory
+#: code:ir.actions.report.xml:name:cash.inventory
 msgid "Cash Reconciliation"
-msgstr "Cash Reconciliation"
+msgstr "Inventaire de Caisse"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -88622,7 +88638,7 @@
 #. module: register_accounting
 #: report:addons/register_accounting/report/cheque_inventory_xls.mako:132
 msgid "CHEQUE INVENTORY"
-msgstr "CHEQUE INVENTORY"
+msgstr "CHÈQUE INVENTAIRE"
 
 #. modules: documents_done, stock
 #: field:documents.done.wizard,expected_date:0
@@ -90720,14 +90736,26 @@
 msgid "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr "Valeur de crédit ou débit erronée dans le modèle (Crédit + Débit doit être supérieur à \"0\") !"
 
-#. modules: account, register_accounting, analytic_distribution, account_override, vertical_integration, msf_accrual
+#. modules: account, register_accounting
+#: report:cash.inventory:0
 #: field:account.cashbox.line,number:0
+msgid "Number"
+msgstr "Nombre"
+
+#. module: account
+#: report:addons/account/report/export_invoice.mako:88
+msgid "Number"
+msgstr "Numéro"
+
+#. modules: account_override, account, msf_accrual, register_accounting, analytic_distribution
 #: field:account.invoice,number:0
 #: field:account.commitment,name:0
-#: report:cash.inventory:0
+#: field:msf.accrual.line,entry_sequence:0
+#: field:wizard.import.cheque.lines,number:0
 #: field:wizard.account.invoice,number:0
-#: field:wizard.import.cheque.lines,number:0
+#: field:account.direct.invoice.wizard,number:0
 #: report:addons/account_override/report/open_invoices_xls.mako:329
+<<<<<<< TREE
 #: field:msf.accrual.line,entry_sequence:0
 #: field:account.direct.invoice.wizard,number:0
 msgid "Number"
@@ -90737,6 +90765,10 @@
 #: report:addons/account/report/export_invoice.mako:88
 msgid "Number"
 msgstr "Numéro"
+=======
+msgid "Number"
+msgstr "Entrée - séquence"
+>>>>>>> MERGE-SOURCE
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/account.py:303
@@ -92350,8 +92382,9 @@
 
 #. module: register_accounting
 #: model:ir.actions.report.xml,name:register_accounting.pending_cheque
+#: code:ir.actions.report.xml:name:pending.cheque
 msgid "Pending Cheque"
-msgstr "Pending Cheque"
+msgstr "Rapport des chèques en attente"
 
 #. module: financing_contract
 #: field:financing.contract.format.line,project_real_value:0
@@ -93292,11 +93325,6 @@
 msgid "Duplicate events from an instance are not allowed."
 msgstr "La duplication des événements d'une instance n'est pas autorisé."
 
-#. module: register_accounting
-#: report:addons/register_accounting/report/fully_report_xls.mako:469
-msgid "BANK REGISTER"
-msgstr "REGISTRE DE BANQUE"
-
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
@@ -93653,7 +93681,7 @@
 #: code:addons/register_accounting/account_cash_statement.py:221
 #, python-format
 msgid "Please confirm closing balance before closing register named '%s'"
-msgstr "Veuillez confirmer le solde de clôture avant de fermer le registre appelé '%s'"
+msgstr "Veuillez confirmer le solde final avant de fermer le registre appelé '%s'"
 
 #. module: stock
 #: field:product.product,track_incoming:0
@@ -96873,7 +96901,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Bank registers"
-msgstr "Bank registers"
+msgstr "Registres de banque"
 
 #. module: product_asset
 #: field:product.asset,hq_ref:0
@@ -98194,6 +98222,8 @@
 
 #. module: register_accounting
 #: model:ir.actions.report.xml,name:register_accounting.cheque_inventory_2
+#: code:ir.actions.report.xml:name:cheque.inventory.2
+#, python-format
 msgid "Cheque Inventory"
 msgstr "Chèque - Inventaire"
 
@@ -98381,7 +98411,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Cheque registers"
-msgstr "Cheque registers"
+msgstr "Registres de chèque"
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -99230,7 +99260,7 @@
 #. module: account_period_closing_level
 #: view:account.period:0
 msgid "Did you validate the Month End Revaluation (ONLY FOR OCA COORDO)?"
-msgstr "Did you validate the Month End Revaluation (ONLY FOR OCA COORDO)?"
+msgstr "Avez-vous validé la réévaluation de fin de mois ? (seulement pour OCA COORDO)"
 
 #. module: specific_rules
 #: model:ir.module.module,shortdesc:specific_rules.module_meta_information
@@ -99492,14 +99522,19 @@
 msgstr "Le Chèque %s a déjà été importé."
 
 #. module: register_accounting
-#: report:addons/register_accounting/report/fully_report_xls.mako:560
-msgid "Acct"
-msgstr "Cmpt"
-
-#. module: register_accounting
-#: report:addons/register_accounting/report/fully_report_xls.mako:469
-msgid "REPORT"
-msgstr "RAPPORT"
+#: report:addons/register_accounting/report/fully_report_xls.mako:453
+msgid "CASH REGISTER FULL REPORT"
+msgstr "RAPPORT COMPLET DU REGISTRE DE CAISSE"
+
+#. module: register_accounting
+#: report:addons/register_accounting/report/fully_report_xls.mako:453
+msgid "BANK REGISTER FULL REPORT"
+msgstr "RAPPORT COMPLET DU REGISTRE DE BANQUE"
+
+#. module: register_accounting
+#: report:addons/register_accounting/report/fully_report_xls.mako:453
+msgid "CHEQUE REGISTER FULL REPORT"
+msgstr "RAPPORT COMPLET DU REGISTRE DE CHÈQUE"
 
 #. module: register_accounting
 #: report:addons/register_accounting/report/fully_report_xls.mako:556
@@ -109327,7 +109362,7 @@
 #. module: account
 #: constraint:account.cashbox.line:0
 msgid "The values of the Closing Balance lines must be unique per register."
-msgstr "Les valeurs des lignes du Solde de Clôture doivent être uniques par registre."
+msgstr "Les valeurs des lignes du Solde Final doivent être uniques par registre."
 
 #. module: account
 #: report:account.invoice2:0
@@ -112996,6 +113031,7 @@
 msgid "Warning! There is a risk of producing inconsistent data if you cancel this line before it receives the delivery details and is changed into status \"Available Shipped\" after synchronization."
 msgstr "Attention! Si vous annulez cette ligne il y a un risque de générer des données incohérentes tant que le document n'a pas reçu les détails de la livraison et que son état n'a pas changé en \"Disponible Expédié\" après une synchro."
 
+<<<<<<< TREE
 #. module: procurement_cycle
 #: code:addons/procurement_cycle/replenishment.py:1926
 #, python-format
@@ -113090,3 +113126,9 @@
 #, python-format
 msgid "IVI: "
 msgstr "BII : "
+=======
+#. module: register_accounting
+#: report:cash.inventory:0
+msgid "Theoretical balance = Calculated balance - Unrecorded advances - Unrecorded expenses."
+msgstr "Solde théorique = Solde calculé - Avances non enregistrées - Dépenses non enregistrées."
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/register_accounting/register_accounting_report.xml'
--- bin/addons/register_accounting/register_accounting_report.xml	2018-10-31 11:17:56 +0000
+++ bin/addons/register_accounting/register_accounting_report.xml	2021-11-08 17:38:32 +0000
@@ -5,7 +5,7 @@
         <report id="cash_inventory"
         string="Cash Reconciliation"
         view_ids="register_accounting.view_cash_statement_tree,account.view_bank_statement_form2"
-        target_filename="Cash Reconciliation_${name}_%(year)s%(month)s%(day)s"
+        target_filename="${_('Cash Reconciliation')}_${name}_%(year)s%(month)s%(day)s"
         model="account.bank.statement"
         name="cash.inventory"
         rml="register_accounting/report/cash_inventory.rml"
@@ -22,7 +22,7 @@
         <report id="bank_reconciliation"
         string="Bank Reconciliation"
         view_ids="account.view_bank_statement_tree,account.view_bank_statement_form"
-        target_filename="Bank Reconciliation_${name}_%(year)s%(month)s%(day)s"
+        target_filename="${_('Bank Reconciliation')}_${name}_%(year)s%(month)s%(day)s"
         model="account.bank.statement"
         name="bank.reconciliation"
         rml="register_accounting/report/bank_reconciliation.rml"
@@ -34,7 +34,7 @@
         id="cheque_inventory_2"
         string="Cheque Inventory"
         view_ids="register_accounting.view_cheque_register_tree,register_accounting.view_cheque_register_form"
-        target_filename="Cheque Inventory_${name}_%(year)s%(month)s%(day)s"
+        target_filename="${_('Cheque Inventory')}_${name}_%(year)s%(month)s%(day)s"
         model="account.bank.statement"
         name="cheque.inventory.2"
         file="register_accounting/report/cheque_inventory_xls.mako"
@@ -48,7 +48,7 @@
         id="pending_cheque"
         string="Pending Cheque"
         view_ids="register_accounting.view_cheque_register_tree,register_accounting.view_cheque_register_form"
-        target_filename="Pending Cheque_${name}_%(year)s%(month)s%(day)s"
+        target_filename="${_('Pending Cheque')}_${name}_%(year)s%(month)s%(day)s"
         model="account.bank.statement"
         name="pending.cheque"
         file="register_accounting/report/pending_cheque_xls.mako"
@@ -86,7 +86,7 @@
 
         <report id="fully_report"
         string="Full Report"
-        target_filename="Full Report_${name}_${period_id.name}_%(year)s%(month)s%(day)s"
+        target_filename="${_('Full Report')}_${name}_${period_id.name}_%(year)s%(month)s%(day)s"
         model="account.bank.statement"
         name="fully.report"
         file="register_accounting/report/fully_report_xls.mako"
 
=== modified file 'bin/addons/register_accounting/report/bank_reconciliation.rml'
--- bin/addons/register_accounting/report/bank_reconciliation.rml	2019-10-31 10:04:44 +0000
+++ bin/addons/register_accounting/report/bank_reconciliation.rml	2021-11-08 17:38:32 +0000
@@ -114,7 +114,7 @@
 
       <para style="text">Register opening date: <b>[[ o.date and formatLang(o.date, date=True) or '' ]]</b></para>
       <para style="text">Register state: <b>[[ getSel(o, 'state') ]]</b></para>
-      <para style="text">End of month balance state: <b>[[ o.closing_balance_frozen and 'Confirmed' or 'Not confirmed' ]][[ o.closing_balance_frozen and o.closing_balance_frozen_date and (' ' + formatLang(o.closing_balance_frozen_date, date=True)) or '' ]]</b></para>
+      <para style="text">End of month balance state: <b>[[ o.closing_balance_frozen and translate('Confirmed') or translate('Not confirmed') ]][[ o.closing_balance_frozen and o.closing_balance_frozen_date and (' ' + formatLang(o.closing_balance_frozen_date, date=True)) or '' ]]</b></para>
       <para style="text">Register closing date: <b>[[ o.closing_date and o.closing_date != "False" and formatLang(o.closing_date, date=True) or '']]</b></para>
       <para style="text">Report date: <b>[[ formatLang(getNow(show_datetime=True), date_time=True) ]]</b></para>
 
 
=== modified file 'bin/addons/register_accounting/report/cash_inventory.rml'
--- bin/addons/register_accounting/report/cash_inventory.rml	2018-10-04 13:56:00 +0000
+++ bin/addons/register_accounting/report/cash_inventory.rml	2021-11-08 17:38:32 +0000
@@ -78,9 +78,8 @@
         </tr>
       </blockTable>
 
-      <spacer length="5"/>
+      <spacer length="18"/>
 
-      <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>Starting balance</b></para></td>
@@ -147,8 +146,9 @@
           </td>
         </tr>
       </blockTable>
+      <para style="text"><i>Theoretical balance = Calculated balance - Unrecorded advances - Unrecorded expenses.</i></para>
 
-      <spacer length="5"/>
+      <spacer length="10"/>
 
       <para style="text"><b>Comments:</b></para>
       <blockTable colWidths="180mm" rowHeights="20mm" style="table_comments">
@@ -160,7 +160,7 @@
       <spacer length="5"/>
       <para style="text">Register opening date: <b>[[ o.date and formatLang(o.date, date=True) or '' ]]</b></para>
       <para style="text">Register state: <b>[[ getSel(o, 'state') ]]</b></para>
-      <para style="text">End of month balance state: <b>[[ o.closing_balance_frozen and 'Confirmed' or 'Not confirmed' ]][[ o.closing_balance_frozen and o.closing_balance_frozen_date and (' ' + formatLang(o.closing_balance_frozen_date, date=True)) or '' ]]</b></para>
+      <para style="text">End of month balance state: <b>[[ o.closing_balance_frozen and translate('Confirmed') or translate('Not confirmed') ]][[ o.closing_balance_frozen and o.closing_balance_frozen_date and (' ' + formatLang(o.closing_balance_frozen_date, date=True)) or '' ]]</b></para>
       <para style="text">Register closing date: <b>[[ o.closing_date and o.closing_date != "False" and formatLang(o.closing_date, date=True) or '']]</b></para>
       <para style="text">Report date: <b>[[ formatLang(getNow(show_datetime=True), date_time=True) ]]</b></para>
       <para style="text"></para>
 
=== modified file 'bin/addons/register_accounting/report/fully_report_xls.mako'
--- bin/addons/register_accounting/report/fully_report_xls.mako	2019-02-08 15:25:48 +0000
+++ bin/addons/register_accounting/report/fully_report_xls.mako	2021-11-08 17:38:32 +0000
@@ -450,7 +450,7 @@
       <Column ss:Width="36" ss:Span="1"/>
       <Row ss:Height="19.3039">
         <Cell ss:MergeAcross="3" ss:StyleID="title">
-          <Data ss:Type="String">${o.journal_id.type == 'cash' and _('CASH REGISTER') or o.journal_id.type == 'bank' and _('BANK REGISTER') or o.journal_id.type == 'cheque' and _('CHEQUE REGISTER') or ''|x} ${_('REPORT')|x}</Data>
+          <Data ss:Type="String">${o.journal_id.type == 'cash' and _('CASH REGISTER FULL REPORT') or o.journal_id.type == 'bank' and _('BANK REGISTER FULL REPORT') or o.journal_id.type == 'cheque' and _('CHEQUE REGISTER FULL REPORT') or ''|x}</Data>
         </Cell>
       </Row>
       <Row ss:Height="14.5134">
@@ -573,7 +573,7 @@
           </Cell>
         % endif
         <Cell ss:StyleID="column_headers">
-          <Data ss:Type="String">${_('Acct')|x}</Data>
+          <Data ss:Type="String">${_('Account')|x}</Data>
         </Cell>
         <Cell ss:StyleID="column_headers">
           <Data ss:Type="String">${_('Third Parties')|x}</Data>
 
=== modified file 'bin/addons/register_accounting/report/pending_cheque_xls.mako'
--- bin/addons/register_accounting/report/pending_cheque_xls.mako	2017-01-17 13:30:54 +0000
+++ bin/addons/register_accounting/report/pending_cheque_xls.mako	2021-11-08 17:38:32 +0000
@@ -223,8 +223,8 @@
 		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Reference')}</Data></Cell>
 		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Account')}</Data></Cell>
 		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Third Parties')}</Data></Cell>
-		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Amount In')}</Data></Cell>
-		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Amount Out')}</Data></Cell>
+		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Book. In')}</Data></Cell>
+		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Book. Out')}</Data></Cell>
 		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. In')}</Data></Cell>
 		<Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. Out')}</Data></Cell>
     <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. CCY')}</Data></Cell>
 
=== modified file 'bin/tools/translate.py'
--- bin/tools/translate.py	2020-01-14 11:16:04 +0000
+++ bin/tools/translate.py	2021-11-08 17:38:32 +0000
@@ -762,6 +762,9 @@
                 fname = obj.report_xsl
                 parse_func = trans_parse_xsl
                 report_type = "xsl"
+            if obj.target_filename:
+                for code in re.findall('\${_\([\'"]([ \w]+)[\'"]\)}',  obj.target_filename):
+                    push_translation(module, 'code', 'ir.actions.report.xml', 'name:%s'%obj.report_name, encode(code))
             if fname and obj.report_type in ('pdf', 'xsl'):
                 try:
                     report_file = tools.file_open(fname)