Unifield Server

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

  1. US-9081
  2. Merge into trunk
Proposed by jftempo
Status: Needs review
Proposed branch: lp:~julie-w/unifield-server/US-9081
Merge into: lp:unifield-server
Diff against target: 908 lines (+165/-108) (has conflicts)
8 files modified
bin/addons/msf_printed_documents/printed_report.py (+29/-17)
bin/addons/msf_profile/i18n/fr_MF.po (+119/-77)
bin/addons/register_accounting/register_accounting_report.xml (+5/-5)
bin/addons/register_accounting/report/bank_reconciliation.rml (+1/-1)
bin/addons/register_accounting/report/cash_inventory.rml (+4/-4)
bin/addons/register_accounting/report/fully_report_xls.mako (+2/-2)
bin/addons/register_accounting/report/pending_cheque_xls.mako (+2/-2)
bin/tools/translate.py (+3/-0)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-9081
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+411541@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_printed_documents/printed_report.py'
2--- bin/addons/msf_printed_documents/printed_report.py 2015-11-23 13:16:58 +0000
3+++ bin/addons/msf_printed_documents/printed_report.py 2021-11-08 17:38:32 +0000
4@@ -2,7 +2,7 @@
5 ##############################################################################
6 #
7 # OpenERP, Open Source Management Solution
8-# Copyright (C) 2011 TeMPO Consulting, MSF
9+# Copyright (C) 2011 TeMPO Consulting, MSF
10 #
11 # This program is free software: you can redistribute it and/or modify
12 # it under the terms of the GNU Affero General Public License as
13@@ -22,7 +22,7 @@
14 from osv import osv
15 from osv import fields
16 from tools.translate import _
17-
18+from tools.safe_eval import safe_eval
19 import re
20
21 HELP_TARGET = '''
22@@ -36,6 +36,7 @@
23 ${eval(function)} => Return the value of the function. The function is a
24 method of the object like function(self, cr, uid, ids)
25
26+ ${_('String')} => translate String
27 %(year)s => Current year (e.g: 2013, 2014, ...)
28 %(month)s => Current month number (e.g: 01, 02, ..., 12)
29 %(day)s => Current day of month number (e.g: 25)
30@@ -102,7 +103,7 @@
31 error = ''
32 if report.target_filename:
33 report_name = self.pool.get('ir.sequence')._process(cr, uid, report.target_filename)
34- values_to_compute = re.findall('\${((?:\w+.?)*)}', report_name)
35+ values_to_compute = re.findall('\${((?:[\'"\w]+.?)*)}', report_name)
36 vals_dict = {}
37 # No possibility to compute the file name
38 if values_to_compute and not active_model or not active_id:
39@@ -115,12 +116,16 @@
40 vals_dict[field_name] = ''
41 model_doc = model_obj.browse(cr, uid, active_id, context=context)
42 # Use a function to compute the name
43+ if field_name.startswith('_('):
44+ to_trans = field_name[3:-2]
45+ vals_dict[field_name] = _(to_trans)
46+ continue
47 if field_name.startswith('eval'):
48 func_name = field_name[5:-1]
49 try:
50 vals_dict.update({field_name: getattr(model_doc, func_name)(context=context)})
51 continue
52- except AttributeError as e:
53+ except AttributeError:
54 error += _('%s : The function \'%s\' is not a valid function for the \'%s\' model.\n') % (field_name, func_name, report.model._name)
55 break
56
57@@ -180,21 +185,21 @@
58 Check the validity of the target filename of the report
59 '''
60 valid_fields_type = (
61- fields.many2one,
62- fields.selection,
63- fields.char,
64- fields.float,
65- fields.integer,
66- fields.date,
67- fields.datetime,
68- fields.time,
69+ fields.many2one,
70+ fields.selection,
71+ fields.char,
72+ fields.float,
73+ fields.integer,
74+ fields.date,
75+ fields.datetime,
76+ fields.time,
77 )
78 bad_type = False
79
80 for report in self.browse(cr, uid, ids, context=context):
81 if not report.target_filename:
82 continue
83-
84+
85 error = ''
86 try:
87 report_name = self.pool.get('ir.sequence')._process(cr, uid, report.target_filename)
88@@ -205,9 +210,16 @@
89 break
90
91 # Check if the fields in ${} are valid
92- fields_name = re.findall('\${((?:\w+.?)*)}', report_name)
93+ fields_name = re.findall('\${((?:[\'"\w+].?)*)}', report_name)
94 for field_name in fields_name:
95 # Use a function to compute the name
96+ if field_name.startswith('_('):
97+ try:
98+ safe_eval(field_name, locals_dict={'_': lambda *x: x})
99+ except:
100+ error += _('%s : invalid syntax') % field_name
101+ break
102+ continue
103 if field_name.startswith('eval'):
104 func_name = field_name[5:-1]
105 model_doc = self.pool.get(report.model)
106@@ -241,7 +253,7 @@
107 error += _('%s : The field \'%s\' is not in \'%s\' model.\n') % (field_name, split_field[i], model_doc._name)
108 break
109 if not isinstance(model_doc._columns[field], valid_fields_type):
110- bad_type = True
111+ bad_type = True
112 error += _('%s : The field \'%s\' is not a valid field type for report name.\n') % (field_name, field)
113
114 if bad_type:
115@@ -257,10 +269,10 @@
116
117 if error:
118 raise osv.except_osv(_('Error'), error)
119-
120+
121 return True
122
123- _constraints = [
124+ _constraints = [
125 (_check_target_validity, 'The target filename given is not valid', ['target_filename']),
126 ]
127
128
129=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
130--- bin/addons/msf_profile/i18n/fr_MF.po 2021-11-05 15:11:49 +0000
131+++ bin/addons/msf_profile/i18n/fr_MF.po 2021-11-08 17:38:32 +0000
132@@ -278,7 +278,7 @@
133 #. module: account_period_closing_level
134 #: view:account.period:0
135 msgid "Accrual reversal entries"
136-msgstr "Accrual reversal entries"
137+msgstr "Ecritures d'extourne comptes de régul."
138
139 #. module: account_mcdb
140 #: view:account.analytic.line:0
141@@ -616,7 +616,7 @@
142 #. module: account
143 #: view:account.move.bank.reconcile:0
144 msgid "Open for bank reconciliation"
145-msgstr "Ouvrir pour reconciliation des écritures bancaires"
146+msgstr "Ouvrir pour réconciliation des écritures bancaires"
147
148 #. module: analytic_distribution
149 #: code:addons/analytic_distribution/wizard/analytic_distribution_wizard.py:1027
150@@ -1433,11 +1433,6 @@
151 msgid "This is use as task responsible"
152 msgstr "Ceci est utilisé comme responsable de tâche"
153
154-#. module: register_accounting
155-#: report:cash.inventory:0
156-msgid "Cashbox"
157-msgstr "Cashbox"
158-
159 #. module: kit
160 #: code:addons/kit/kit.py:340
161 #, python-format
162@@ -1993,7 +1988,7 @@
163 #. module: account_period_closing_level
164 #: view:account.period:0
165 msgid "Did you generate and post all recurring entries?"
166-msgstr "Did you generate and post all recurring entries?"
167+msgstr "Avez-vous généré et comptabilisé les écritures périodiques ?"
168
169 #. module: register_accounting
170 #: report:addons/register_accounting/report/fully_report_xls.mako:743
171@@ -10262,7 +10257,7 @@
172 msgid "Yearly closure"
173 msgstr "Clôture Annuelle"
174
175-#. 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
176+#. 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
177 #: field:po.follow.up,confirmed_ok:0
178 #: view:account.bank.statement:0
179 #: selection:documents.done.wizard,display_state:0
180@@ -10308,10 +10303,18 @@
181 #: selection:sale.order.line,state_to_display:0
182 #: selection:purchase.order.line,state_to_display:0
183 #: code:addons/stock_override/report/delivery_order.py:61
184+#: report:cash.inventory:0
185+#: report:bank.reconciliation:0
186 #, python-format
187 msgid "Confirmed"
188 msgstr "Confirmé"
189
190+#. module: register_accounting
191+#: report:cash.inventory:0
192+#: report:bank.reconciliation:0
193+msgid "Not confirmed"
194+msgstr "Non confirmé"
195+
196 #. module: base
197 #: selection:ir.sequence,implementation:0
198 msgid "PostgreSQL sequence"
199@@ -15936,7 +15939,7 @@
200 #. module: account_period_closing_level
201 #: view:account.period:0
202 msgid "Did you import and validate all payroll entries?"
203-msgstr "Did you import and validate all payroll entries?"
204+msgstr "Avez-vous importé et validé les écritures de paie ?"
205
206 #. module: specific_rules
207 #: model:ir.model,name:specific_rules.model_unconsistent_stock_report
208@@ -19578,7 +19581,7 @@
209 #: field:account.bank.statement,balance_end_real:0
210 #: view:account.bank.statement:0
211 msgid "Closing Balance"
212-msgstr "Solde de clôture"
213+msgstr "Solde Final"
214
215 #. module: register_accounting
216 #: code:addons/register_accounting/account_bank_statement.py:2397
217@@ -22222,7 +22225,7 @@
218 #: report:bank.reconciliation:0
219 #: report:cash.inventory:0
220 msgid "End of month balance state:"
221-msgstr "End of month balance state:"
222+msgstr "Statut du solde de fin de mois :"
223
224 #. module: sourcing
225 #: code:addons/sourcing/sale_order_line.py:848
226@@ -22493,7 +22496,7 @@
227 #. module: account
228 #: help:account.move.line,statement_id:0
229 msgid "The bank statement used for bank reconciliation"
230-msgstr "Relevé bancaire utilisé pour la reconciliation bancaire"
231+msgstr "Relevé bancaire utilisé pour la réconciliation bancaire"
232
233 #. modules: msf_doc_import, register_accounting, account
234 #: code:addons/msf_doc_import/account.py:587
235@@ -23148,7 +23151,7 @@
236 #. module: register_accounting
237 #: view:account.bank.statement:0
238 msgid "Are you sure you want to freeze closing balance?"
239-msgstr "Etes-vous certain de vouloir geler le solde de clôture ?"
240+msgstr "Etes-vous certain de vouloir geler le solde final ?"
241
242 #. module: base
243 #: selection:res.config.users,context_tz:0
244@@ -23398,7 +23401,7 @@
245 #. module: account_period_closing_level
246 #: view:account.period:0
247 msgid "Supplier refunds"
248-msgstr "Remboursement Fournisseur"
249+msgstr "Avoirs Fournisseur"
250
251 #. modules: account_hq_entries, msf_homere_interface
252 #: code:addons/account_hq_entries/wizard/hq_entries_validation.py:428
253@@ -25798,7 +25801,7 @@
254 #. module: register_accounting
255 #: field:account.bank.statement,closing_balance_frozen:0
256 msgid "Closing balance freezed?"
257-msgstr "Solde de clôture gelé?"
258+msgstr "Solde final gelé ?"
259
260 #. module: account
261 #: field:account.tax,tax_code_id:0
262@@ -25818,11 +25821,21 @@
263 msgid "No first period found in the fiscal year %s."
264 msgstr "No first period found in the fiscal year %s."
265
266-#. modules: res_currency_functional, register_accounting
267+#. module: res_currency_functional
268 #: field:account.bank.statement.line,functional_out:0
269 msgid "Func. Out"
270 msgstr "Mnt Sortant"
271
272+#. module: register_accounting
273+#: report:addons/register_accounting/report/pending_cheque_xls.mako:229
274+msgid "Func. Out"
275+msgstr "Montant Sortant Fonc."
276+
277+#. module: register_accounting
278+#: report:addons/register_accounting/report/pending_cheque_xls.mako:227
279+msgid "Book. Out"
280+msgstr "Montant Sortant Enreg."
281+
282 #. module: account
283 #: model:process.transition,note:account.process_transition_validentries0
284 msgid "Accountant validates the accounting entries coming from the invoice."
285@@ -26152,7 +26165,7 @@
286 #. module: account_period_closing_level
287 #: view:account.period:0
288 msgid "Cash registers"
289-msgstr "Cash registers"
290+msgstr "Registres de caisse"
291
292 #. module: stock
293 #: model:ir.actions.act_window,help:stock.action_picking_tree
294@@ -26413,7 +26426,7 @@
295 #. module: account_period_closing_level
296 #: view:account.period:0
297 msgid "Did you validate all the draft commitment vouchers?"
298-msgstr "Did you validate all the draft commitment vouchers?"
299+msgstr "Avez-vous validé les bons d'engagement en brouillon ?"
300
301 #. module: consumption_calculation
302 #: report:product.likely.expire.report_pdf:0
303@@ -29235,7 +29248,7 @@
304 #. module: account_period_closing_level
305 #: view:account.period:0
306 msgid "Recurring entries"
307-msgstr "Recurring entries"
308+msgstr "Ecritures périodiques"
309
310 #. module: stock_schedule
311 #: field:stock.frequence,monthly_choose_day:0
312@@ -29605,7 +29618,7 @@
313 #. module: account_period_closing_level
314 #: view:account.period:0
315 msgid "Did you check that exchange rates have been updated for the period?"
316-msgstr "Did you check that exchange rates have been updated for the period?"
317+msgstr "Avez-vous vérifié que le taux de change est à jour pour la période ?"
318
319 #. module: sale
320 #: report:addons/sale/report/sale_donation_stock_moves_report_xls.mako:131
321@@ -29772,7 +29785,7 @@
322 #. module: account_period_closing_level
323 #: field:account.period,is_system:0
324 msgid "System period ?"
325-msgstr "System period ?"
326+msgstr "Période système ?"
327
328 #. modules: specific_rules, msf_tools, msf_supply_doc_export, stock_override, stock
329 #: view:export.report.inconsistencies:0
330@@ -30960,7 +30973,7 @@
331 #: code:addons/msf_homere_interface/hr_payroll.py:369
332 #, python-format
333 msgid "Payroll B/S lines"
334-msgstr "Lignes de paye du bilan"
335+msgstr "Lignes de paie du bilan"
336
337 #. module: msf_tools
338 #: view:export.report.inconsistencies:0
339@@ -32536,7 +32549,7 @@
340 #. module: register_accounting
341 #: field:account.bank.statement,closing_balance_frozen_date:0
342 msgid "Closing balance frozen date"
343-msgstr "Closing balance frozen date"
344+msgstr "Date de gel du solde final"
345
346 #. module: stock
347 #: view:stock.change.product.qty:0
348@@ -41032,7 +41045,7 @@
349 #. module: register_accounting
350 #: report:addons/register_accounting/report/pending_cheque_xls.mako:179
351 msgid "PENDING CHEQUE"
352-msgstr "PENDING CHEQUE"
353+msgstr "RAPPORT DES CHÈQUES EN ATTENTE"
354
355 #. modules: msf_processes, account
356 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
357@@ -41974,6 +41987,7 @@
358 " ${eval(function)} => Return the value of the function. The function is a \n"
359 " method of the object like function(self, cr, uid, ids)\n"
360 "\n"
361+" ${_('String')} => translate String\n"
362 " %(year)s => Current year (e.g: 2013, 2014, ...)\n"
363 " %(month)s => Current month number (e.g: 01, 02, ..., 12)\n"
364 " %(day)s => Current day of month number (e.g: 25)\n"
365@@ -41998,6 +42012,7 @@
366 " ${eval(function)} => Retourne la valeur d'une fonction. La fonction est une \n"
367 " méthode de l'objet comme function(self, cr, uid, ids)\n"
368 "\n"
369+" ${_('String')} => traduire String\n"
370 " %(year)s => Année courante (e.g: 2013, 2014, ...)\n"
371 " %(month)s => Numéro du mois courant (e.g: 01, 02, ..., 12)\n"
372 " %(day)s => Numéro du jour du mois courant (e.g: 25)\n"
373@@ -43065,11 +43080,6 @@
374 msgid "Expat employee import"
375 msgstr "Importation des travailleurs expatriés"
376
377-#. module: register_accounting
378-#: report:addons/register_accounting/report/fully_report_xls.mako:469
379-msgid "CHEQUE REGISTER"
380-msgstr "REGISTRE DE CHÈQUE"
381-
382 #. modules: account, finance
383 #: view:account.move:0
384 #: view:cash.request:0
385@@ -43460,7 +43470,7 @@
386 #. module: account_period_closing_level
387 #: view:account.period:0
388 msgid "Did you post Accrual Reversal entries?"
389-msgstr "Did you post Accrual Reversal entries?"
390+msgstr "Avez-vous comptabilisé les écritures d'extourne des comptes de régularisation ?"
391
392 #. module: base
393 #: model:res.currency,currency_name:base.MKD
394@@ -43714,7 +43724,7 @@
395 #: code:addons/account_period_closing_level/account_period.py:644
396 #, python-format
397 msgid "HQ entries"
398-msgstr "HQ entries"
399+msgstr "Ecritures HQ"
400
401 #. module: account
402 #: field:account.bank.statement,total_entry_encoding:0
403@@ -45688,7 +45698,7 @@
404 #. module: account_period_closing_level
405 #: view:account.period:0
406 msgid "Did you close all your registers?"
407-msgstr "Did you close all your registers?"
408+msgstr "Avez-vous fermé tous les registres ?"
409
410 #. module: analytic_override
411 #: field:account.analytic.account,intermission_restricted:0
412@@ -50130,6 +50140,7 @@
413
414 #. module: register_accounting
415 #: model:ir.actions.report.xml,name:register_accounting.fully_report
416+#: code:ir.actions.report.xml:name:fully.report
417 msgid "Full Report"
418 msgstr "Rapport Complet"
419
420@@ -52159,7 +52170,7 @@
421 #: view:account.entries.report:0
422 #: view:account.period:0
423 msgid "Unreconciled entries"
424-msgstr "Unreconciled entries"
425+msgstr "Ecritures non lettrées"
426
427 #. module: base
428 #: field:ir.model.fields,relation_field:0
429@@ -53457,6 +53468,7 @@
430 #: report:addons/account/report/free_allocation_report.mako:199
431 #: report:addons/account/report/invoice_excel_export.mako:73
432 #: report:addons/account/report/export_invoice.mako:0
433+#: report:addons/register_accounting/report/fully_report_xls.mako:576
434 #, python-format
435 msgid "Account"
436 msgstr "Compte"
437@@ -56605,7 +56617,7 @@
438 #. module: account
439 #: help:account.bank.statement,balance_end_cash:0
440 msgid "Closing balance based on cashBox"
441-msgstr "Solde de clôture basé sur la Caisse"
442+msgstr "Solde final basé sur la Caisse"
443
444 #. modules: threshold_value, product_nomenclature, order_nomenclature, consumption_calculation, specific_rules, kit, procurement_auto, procurement_cycle, mission_stock, procurement_report, stock
445 #: view:monthly.review.consumption:0
446@@ -58318,11 +58330,6 @@
447 msgid "Delivery address name"
448 msgstr "Delivery address name"
449
450-#. module: register_accounting
451-#: report:addons/register_accounting/report/fully_report_xls.mako:469
452-msgid "CASH REGISTER"
453-msgstr "REGISTRE DE CAISSE"
454-
455 #. module: account
456 #: code:addons/account/wizard/account_move_journal.py:104
457 #, python-format
458@@ -58674,7 +58681,7 @@
459 #: view:account.move.bank.reconcile:0
460 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
461 msgid "Bank reconciliation"
462-msgstr "Reconciliation bancaire"
463+msgstr "Réconciliation bancaire"
464
465 #. module: kit
466 #: field:composition.item,item_stock_move_id:0
467@@ -58772,7 +58779,6 @@
468 #: report:addons/account_mcdb/report/report_account_bank_statement_line_xls.mako:57
469 #: field:account.bank.statement.line,amount_in:0
470 #: report:addons/register_accounting/report/cheque_inventory_xls.mako:170
471-#: report:addons/register_accounting/report/pending_cheque_xls.mako:226
472 #, python-format
473 msgid "Amount In"
474 msgstr "Montant Entrant"
475@@ -60694,7 +60700,7 @@
476 #. module: account
477 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
478 msgid "Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system."
479-msgstr "Une reconciliation bancaire consiste à vérifier que votre relevé bancaire corresponde aux écritures (ou enregistrements) de ce compte dans votre système comptable."
480+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."
481
482 #. module: consumption_calculation
483 #: field:expiry.quantity.report.line,expired_qty:0
484@@ -62195,7 +62201,7 @@
485 #. module: account_period_closing_level
486 #: view:account.period:0
487 msgid "Did you import and validate HQ entries (ONLY FOR COORDO)?"
488-msgstr "Did you import and validate HQ entries (ONLY FOR COORDO)?"
489+msgstr "Avez-vous importé et validé les écritures du HQ (SEULEMENT POUR LA COORDO) ?"
490
491 #. module: sale
492 #: code:addons/sale/sale_order.py:2176
493@@ -65806,7 +65812,6 @@
494 #: report:addons/account_mcdb/report/report_account_bank_statement_line_xls.mako:57
495 #: field:account.bank.statement.line,amount_out:0
496 #: report:addons/register_accounting/report/cheque_inventory_xls.mako:171
497-#: report:addons/register_accounting/report/pending_cheque_xls.mako:227
498 #, python-format
499 msgid "Amount Out"
500 msgstr "Montant Sortant"
501@@ -66447,7 +66452,7 @@
502 #. module: account_period_closing_level
503 #: view:account.period:0
504 msgid "Do closing period (Field) process"
505-msgstr "Do closing period (Field) process"
506+msgstr "Effectuer la clôture de la période (Terrain)"
507
508 #. module: return_claim
509 #: model:ir.model,name:return_claim.model_add_event
510@@ -69966,12 +69971,12 @@
511 #: report:addons/account/report/account_liquidity_balance.mako:174
512 #: report:cash.inventory:0
513 msgid "Closing balance"
514-msgstr "Solde de clôture"
515+msgstr "Solde final"
516
517 #. module: register_accounting
518 #: report:addons/register_accounting/report/fully_report_xls.mako:512
519 msgid "Closing balance:"
520-msgstr "Solde de Clôture :"
521+msgstr "Solde final :"
522
523 #. module: register_accounting
524 #: report:addons/register_accounting/report/fully_report_xls.mako:510
525@@ -75382,7 +75387,7 @@
526 #. module: account_period_closing_level
527 #: view:account.period:0
528 msgid "Did you check open entries booked on accounts that can be reconciled?"
529-msgstr "Did you check open entries booked on accounts that can be reconciled?"
530+msgstr "Avez-vous vérifié les écritures enregistrées et non lettrées ?"
531
532 #. module: msf_outgoing
533 #: model:ir.module.module,description:msf_outgoing.module_meta_information
534@@ -76518,11 +76523,20 @@
535 msgid "Draft Picking Ticket"
536 msgstr "Brouillon Bon de Picking"
537
538-#. modules: register_accounting, res_currency_functional
539+#. module: res_currency_functional
540 #: field:account.bank.statement.line,functional_in:0
541+msgid "Func. In"
542+msgstr "Montant Entrant"
543+
544+#. module: register_accounting
545 #: report:addons/register_accounting/report/pending_cheque_xls.mako:228
546 msgid "Func. In"
547-msgstr "Montant Entrant"
548+msgstr "Montant Entrant Fonc."
549+
550+#. module: register_accounting
551+#: report:addons/register_accounting/report/pending_cheque_xls.mako:226
552+msgid "Book. In"
553+msgstr "Montant Entrant Enreg."
554
555 #. module: base
556 #: model:res.currency,currency_name:base.SDG
557@@ -77980,8 +77994,9 @@
558 #. module: register_accounting
559 #: report:bank.reconciliation:0
560 #: model:ir.actions.report.xml,name:register_accounting.bank_reconciliation
561+#: code:ir.actions.report.xml:name:bank.reconciliation
562 msgid "Bank Reconciliation"
563-msgstr "Reconciliation Bancaire"
564+msgstr "Réconciliation Bancaire"
565
566 #. module: sales_followup
567 #: report:addons/sales_followup/report/sale_follow_up_report_xls.mako:227
568@@ -79703,7 +79718,7 @@
569 #. module: account_period_closing_level
570 #: view:account.period:0
571 msgid "Supplier direct invoices"
572-msgstr "Supplier direct invoices"
573+msgstr "Factures directes fournisseur"
574
575 #. module: msf_doc_import
576 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:697
577@@ -88431,8 +88446,9 @@
578 #. module: register_accounting
579 #: report:cash.inventory:0
580 #: model:ir.actions.report.xml,name:register_accounting.cash_inventory
581+#: code:ir.actions.report.xml:name:cash.inventory
582 msgid "Cash Reconciliation"
583-msgstr "Cash Reconciliation"
584+msgstr "Inventaire de Caisse"
585
586 #. module: purchase
587 #: help:purchase.report,date:0
588@@ -88622,7 +88638,7 @@
589 #. module: register_accounting
590 #: report:addons/register_accounting/report/cheque_inventory_xls.mako:132
591 msgid "CHEQUE INVENTORY"
592-msgstr "CHEQUE INVENTORY"
593+msgstr "CHÈQUE INVENTAIRE"
594
595 #. modules: documents_done, stock
596 #: field:documents.done.wizard,expected_date:0
597@@ -90720,14 +90736,26 @@
598 msgid "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
599 msgstr "Valeur de crédit ou débit erronée dans le modèle (Crédit + Débit doit être supérieur à \"0\") !"
600
601-#. modules: account, register_accounting, analytic_distribution, account_override, vertical_integration, msf_accrual
602+#. modules: account, register_accounting
603+#: report:cash.inventory:0
604 #: field:account.cashbox.line,number:0
605+msgid "Number"
606+msgstr "Nombre"
607+
608+#. module: account
609+#: report:addons/account/report/export_invoice.mako:88
610+msgid "Number"
611+msgstr "Numéro"
612+
613+#. modules: account_override, account, msf_accrual, register_accounting, analytic_distribution
614 #: field:account.invoice,number:0
615 #: field:account.commitment,name:0
616-#: report:cash.inventory:0
617+#: field:msf.accrual.line,entry_sequence:0
618+#: field:wizard.import.cheque.lines,number:0
619 #: field:wizard.account.invoice,number:0
620-#: field:wizard.import.cheque.lines,number:0
621+#: field:account.direct.invoice.wizard,number:0
622 #: report:addons/account_override/report/open_invoices_xls.mako:329
623+<<<<<<< TREE
624 #: field:msf.accrual.line,entry_sequence:0
625 #: field:account.direct.invoice.wizard,number:0
626 msgid "Number"
627@@ -90737,6 +90765,10 @@
628 #: report:addons/account/report/export_invoice.mako:88
629 msgid "Number"
630 msgstr "Numéro"
631+=======
632+msgid "Number"
633+msgstr "Entrée - séquence"
634+>>>>>>> MERGE-SOURCE
635
636 #. module: msf_doc_import
637 #: code:addons/msf_doc_import/account.py:303
638@@ -92350,8 +92382,9 @@
639
640 #. module: register_accounting
641 #: model:ir.actions.report.xml,name:register_accounting.pending_cheque
642+#: code:ir.actions.report.xml:name:pending.cheque
643 msgid "Pending Cheque"
644-msgstr "Pending Cheque"
645+msgstr "Rapport des chèques en attente"
646
647 #. module: financing_contract
648 #: field:financing.contract.format.line,project_real_value:0
649@@ -93292,11 +93325,6 @@
650 msgid "Duplicate events from an instance are not allowed."
651 msgstr "La duplication des événements d'une instance n'est pas autorisé."
652
653-#. module: register_accounting
654-#: report:addons/register_accounting/report/fully_report_xls.mako:469
655-msgid "BANK REGISTER"
656-msgstr "REGISTRE DE BANQUE"
657-
658 #. module: account
659 #: view:account.tax.code.template:0
660 msgid "Search tax template"
661@@ -93653,7 +93681,7 @@
662 #: code:addons/register_accounting/account_cash_statement.py:221
663 #, python-format
664 msgid "Please confirm closing balance before closing register named '%s'"
665-msgstr "Veuillez confirmer le solde de clôture avant de fermer le registre appelé '%s'"
666+msgstr "Veuillez confirmer le solde final avant de fermer le registre appelé '%s'"
667
668 #. module: stock
669 #: field:product.product,track_incoming:0
670@@ -96873,7 +96901,7 @@
671 #. module: account_period_closing_level
672 #: view:account.period:0
673 msgid "Bank registers"
674-msgstr "Bank registers"
675+msgstr "Registres de banque"
676
677 #. module: product_asset
678 #: field:product.asset,hq_ref:0
679@@ -98194,6 +98222,8 @@
680
681 #. module: register_accounting
682 #: model:ir.actions.report.xml,name:register_accounting.cheque_inventory_2
683+#: code:ir.actions.report.xml:name:cheque.inventory.2
684+#, python-format
685 msgid "Cheque Inventory"
686 msgstr "Chèque - Inventaire"
687
688@@ -98381,7 +98411,7 @@
689 #. module: account_period_closing_level
690 #: view:account.period:0
691 msgid "Cheque registers"
692-msgstr "Cheque registers"
693+msgstr "Registres de chèque"
694
695 #. module: stock
696 #: help:product.product,valuation:0
697@@ -99230,7 +99260,7 @@
698 #. module: account_period_closing_level
699 #: view:account.period:0
700 msgid "Did you validate the Month End Revaluation (ONLY FOR OCA COORDO)?"
701-msgstr "Did you validate the Month End Revaluation (ONLY FOR OCA COORDO)?"
702+msgstr "Avez-vous validé la réévaluation de fin de mois ? (seulement pour OCA COORDO)"
703
704 #. module: specific_rules
705 #: model:ir.module.module,shortdesc:specific_rules.module_meta_information
706@@ -99492,14 +99522,19 @@
707 msgstr "Le Chèque %s a déjà été importé."
708
709 #. module: register_accounting
710-#: report:addons/register_accounting/report/fully_report_xls.mako:560
711-msgid "Acct"
712-msgstr "Cmpt"
713-
714-#. module: register_accounting
715-#: report:addons/register_accounting/report/fully_report_xls.mako:469
716-msgid "REPORT"
717-msgstr "RAPPORT"
718+#: report:addons/register_accounting/report/fully_report_xls.mako:453
719+msgid "CASH REGISTER FULL REPORT"
720+msgstr "RAPPORT COMPLET DU REGISTRE DE CAISSE"
721+
722+#. module: register_accounting
723+#: report:addons/register_accounting/report/fully_report_xls.mako:453
724+msgid "BANK REGISTER FULL REPORT"
725+msgstr "RAPPORT COMPLET DU REGISTRE DE BANQUE"
726+
727+#. module: register_accounting
728+#: report:addons/register_accounting/report/fully_report_xls.mako:453
729+msgid "CHEQUE REGISTER FULL REPORT"
730+msgstr "RAPPORT COMPLET DU REGISTRE DE CHÈQUE"
731
732 #. module: register_accounting
733 #: report:addons/register_accounting/report/fully_report_xls.mako:556
734@@ -109327,7 +109362,7 @@
735 #. module: account
736 #: constraint:account.cashbox.line:0
737 msgid "The values of the Closing Balance lines must be unique per register."
738-msgstr "Les valeurs des lignes du Solde de Clôture doivent être uniques par registre."
739+msgstr "Les valeurs des lignes du Solde Final doivent être uniques par registre."
740
741 #. module: account
742 #: report:account.invoice2:0
743@@ -112996,6 +113031,7 @@
744 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."
745 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."
746
747+<<<<<<< TREE
748 #. module: procurement_cycle
749 #: code:addons/procurement_cycle/replenishment.py:1926
750 #, python-format
751@@ -113090,3 +113126,9 @@
752 #, python-format
753 msgid "IVI: "
754 msgstr "BII : "
755+=======
756+#. module: register_accounting
757+#: report:cash.inventory:0
758+msgid "Theoretical balance = Calculated balance - Unrecorded advances - Unrecorded expenses."
759+msgstr "Solde théorique = Solde calculé - Avances non enregistrées - Dépenses non enregistrées."
760+>>>>>>> MERGE-SOURCE
761
762=== modified file 'bin/addons/register_accounting/register_accounting_report.xml'
763--- bin/addons/register_accounting/register_accounting_report.xml 2018-10-31 11:17:56 +0000
764+++ bin/addons/register_accounting/register_accounting_report.xml 2021-11-08 17:38:32 +0000
765@@ -5,7 +5,7 @@
766 <report id="cash_inventory"
767 string="Cash Reconciliation"
768 view_ids="register_accounting.view_cash_statement_tree,account.view_bank_statement_form2"
769- target_filename="Cash Reconciliation_${name}_%(year)s%(month)s%(day)s"
770+ target_filename="${_('Cash Reconciliation')}_${name}_%(year)s%(month)s%(day)s"
771 model="account.bank.statement"
772 name="cash.inventory"
773 rml="register_accounting/report/cash_inventory.rml"
774@@ -22,7 +22,7 @@
775 <report id="bank_reconciliation"
776 string="Bank Reconciliation"
777 view_ids="account.view_bank_statement_tree,account.view_bank_statement_form"
778- target_filename="Bank Reconciliation_${name}_%(year)s%(month)s%(day)s"
779+ target_filename="${_('Bank Reconciliation')}_${name}_%(year)s%(month)s%(day)s"
780 model="account.bank.statement"
781 name="bank.reconciliation"
782 rml="register_accounting/report/bank_reconciliation.rml"
783@@ -34,7 +34,7 @@
784 id="cheque_inventory_2"
785 string="Cheque Inventory"
786 view_ids="register_accounting.view_cheque_register_tree,register_accounting.view_cheque_register_form"
787- target_filename="Cheque Inventory_${name}_%(year)s%(month)s%(day)s"
788+ target_filename="${_('Cheque Inventory')}_${name}_%(year)s%(month)s%(day)s"
789 model="account.bank.statement"
790 name="cheque.inventory.2"
791 file="register_accounting/report/cheque_inventory_xls.mako"
792@@ -48,7 +48,7 @@
793 id="pending_cheque"
794 string="Pending Cheque"
795 view_ids="register_accounting.view_cheque_register_tree,register_accounting.view_cheque_register_form"
796- target_filename="Pending Cheque_${name}_%(year)s%(month)s%(day)s"
797+ target_filename="${_('Pending Cheque')}_${name}_%(year)s%(month)s%(day)s"
798 model="account.bank.statement"
799 name="pending.cheque"
800 file="register_accounting/report/pending_cheque_xls.mako"
801@@ -86,7 +86,7 @@
802
803 <report id="fully_report"
804 string="Full Report"
805- target_filename="Full Report_${name}_${period_id.name}_%(year)s%(month)s%(day)s"
806+ target_filename="${_('Full Report')}_${name}_${period_id.name}_%(year)s%(month)s%(day)s"
807 model="account.bank.statement"
808 name="fully.report"
809 file="register_accounting/report/fully_report_xls.mako"
810
811=== modified file 'bin/addons/register_accounting/report/bank_reconciliation.rml'
812--- bin/addons/register_accounting/report/bank_reconciliation.rml 2019-10-31 10:04:44 +0000
813+++ bin/addons/register_accounting/report/bank_reconciliation.rml 2021-11-08 17:38:32 +0000
814@@ -114,7 +114,7 @@
815
816 <para style="text">Register opening date: <b>[[ o.date and formatLang(o.date, date=True) or '' ]]</b></para>
817 <para style="text">Register state: <b>[[ getSel(o, 'state') ]]</b></para>
818- <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>
819+ <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>
820 <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>
821 <para style="text">Report date: <b>[[ formatLang(getNow(show_datetime=True), date_time=True) ]]</b></para>
822
823
824=== modified file 'bin/addons/register_accounting/report/cash_inventory.rml'
825--- bin/addons/register_accounting/report/cash_inventory.rml 2018-10-04 13:56:00 +0000
826+++ bin/addons/register_accounting/report/cash_inventory.rml 2021-11-08 17:38:32 +0000
827@@ -78,9 +78,8 @@
828 </tr>
829 </blockTable>
830
831- <spacer length="5"/>
832+ <spacer length="18"/>
833
834- <para style="text"><b>Cashbox</b></para>
835 <blockTable colWidths="30mm,30mm,30mm,30mm,30mm,30mm" style="table_reconciliation_balance">
836 <tr>
837 <td><para style="center"><b>Starting balance</b></para></td>
838@@ -147,8 +146,9 @@
839 </td>
840 </tr>
841 </blockTable>
842+ <para style="text"><i>Theoretical balance = Calculated balance - Unrecorded advances - Unrecorded expenses.</i></para>
843
844- <spacer length="5"/>
845+ <spacer length="10"/>
846
847 <para style="text"><b>Comments:</b></para>
848 <blockTable colWidths="180mm" rowHeights="20mm" style="table_comments">
849@@ -160,7 +160,7 @@
850 <spacer length="5"/>
851 <para style="text">Register opening date: <b>[[ o.date and formatLang(o.date, date=True) or '' ]]</b></para>
852 <para style="text">Register state: <b>[[ getSel(o, 'state') ]]</b></para>
853- <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>
854+ <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>
855 <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>
856 <para style="text">Report date: <b>[[ formatLang(getNow(show_datetime=True), date_time=True) ]]</b></para>
857 <para style="text"></para>
858
859=== modified file 'bin/addons/register_accounting/report/fully_report_xls.mako'
860--- bin/addons/register_accounting/report/fully_report_xls.mako 2019-02-08 15:25:48 +0000
861+++ bin/addons/register_accounting/report/fully_report_xls.mako 2021-11-08 17:38:32 +0000
862@@ -450,7 +450,7 @@
863 <Column ss:Width="36" ss:Span="1"/>
864 <Row ss:Height="19.3039">
865 <Cell ss:MergeAcross="3" ss:StyleID="title">
866- <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>
867+ <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>
868 </Cell>
869 </Row>
870 <Row ss:Height="14.5134">
871@@ -573,7 +573,7 @@
872 </Cell>
873 % endif
874 <Cell ss:StyleID="column_headers">
875- <Data ss:Type="String">${_('Acct')|x}</Data>
876+ <Data ss:Type="String">${_('Account')|x}</Data>
877 </Cell>
878 <Cell ss:StyleID="column_headers">
879 <Data ss:Type="String">${_('Third Parties')|x}</Data>
880
881=== modified file 'bin/addons/register_accounting/report/pending_cheque_xls.mako'
882--- bin/addons/register_accounting/report/pending_cheque_xls.mako 2017-01-17 13:30:54 +0000
883+++ bin/addons/register_accounting/report/pending_cheque_xls.mako 2021-11-08 17:38:32 +0000
884@@ -223,8 +223,8 @@
885 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Reference')}</Data></Cell>
886 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Account')}</Data></Cell>
887 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Third Parties')}</Data></Cell>
888- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Amount In')}</Data></Cell>
889- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Amount Out')}</Data></Cell>
890+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Book. In')}</Data></Cell>
891+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Book. Out')}</Data></Cell>
892 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. In')}</Data></Cell>
893 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. Out')}</Data></Cell>
894 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. CCY')}</Data></Cell>
895
896=== modified file 'bin/tools/translate.py'
897--- bin/tools/translate.py 2020-01-14 11:16:04 +0000
898+++ bin/tools/translate.py 2021-11-08 17:38:32 +0000
899@@ -762,6 +762,9 @@
900 fname = obj.report_xsl
901 parse_func = trans_parse_xsl
902 report_type = "xsl"
903+ if obj.target_filename:
904+ for code in re.findall('\${_\([\'"]([ \w]+)[\'"]\)}', obj.target_filename):
905+ push_translation(module, 'code', 'ir.actions.report.xml', 'name:%s'%obj.report_name, encode(code))
906 if fname and obj.report_type in ('pdf', 'xsl'):
907 try:
908 report_file = tools.file_open(fname)

Subscribers

People subscribed via source and target branches