From 1957472742b76416b0f47a163acaba07d5bc54bd Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 9 Jun 2017 00:05:30 +0200 Subject: [PATCH 01/24] Add module account_bank_reconciliation_summary_xlsx --- .../README.rst | 65 ++++++ .../__init__.py | 4 + .../__manifest__.py | 18 ++ .../models/__init__.py | 3 + .../models/account_bank_statement.py | 22 ++ .../report/__init__.py | 3 + .../report/bank_reconciliation_xlsx.py | 200 ++++++++++++++++++ .../report/report.xml | 18 ++ .../views/account_bank_statement_view.xml | 23 ++ 9 files changed, 356 insertions(+) create mode 100644 account_bank_reconciliation_summary_xlsx/README.rst create mode 100644 account_bank_reconciliation_summary_xlsx/__init__.py create mode 100644 account_bank_reconciliation_summary_xlsx/__manifest__.py create mode 100644 account_bank_reconciliation_summary_xlsx/models/__init__.py create mode 100644 account_bank_reconciliation_summary_xlsx/models/account_bank_statement.py create mode 100644 account_bank_reconciliation_summary_xlsx/report/__init__.py create mode 100644 account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py create mode 100644 account_bank_reconciliation_summary_xlsx/report/report.xml create mode 100644 account_bank_reconciliation_summary_xlsx/views/account_bank_statement_view.xml diff --git a/account_bank_reconciliation_summary_xlsx/README.rst b/account_bank_reconciliation_summary_xlsx/README.rst new file mode 100644 index 00000000000..e0a3f6eec92 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/README.rst @@ -0,0 +1,65 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +=============================== +Bank Reconciliation Report XLSX +=============================== + +This module adds a Bank Reconciliation Report in Odoo in XLSX format. For each bank journal, the report displays: + +1. The balance of the bank account in the accounting, +2. The list of journal items of the bank account not linked to any bank statement lines, +3. The list of draft bank statement lines not linked to any journal items, +4. The computed balance of the bank account at the bank. + +The last field (computed balance of the bank account at the bank) must be compared to the real bank account balance at the bank. If there is a difference, you need to find the erreor in the accounting. The field *Computed balance of the bank account at the bank* is a formula, so you can easily change its computation to try to find the difference with the real bank account balance at the bank. + +Configuration +============= + +This module doesn't require any configuration. + +Usage +===== + +You can get the Bank Reconciliation Report from: + +* the form view of a bank bournal: click on *Print > Bank Reconciliation XLSX* +* the tree view of journals: select one or several journals and click on *Print > Bank Reconciliation XLSX* (if you selected several bank journals, you will get one tab per journal) +* the form view of a bank statement: click on the button *Bank Reconciliation Report*. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/91/10.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Contributors +------------ + +* Alexis de Lattre + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_bank_reconciliation_summary_xlsx/__init__.py b/account_bank_reconciliation_summary_xlsx/__init__.py new file mode 100644 index 00000000000..7a6c1b0355b --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +from . import models +from . import report diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py new file mode 100644 index 00000000000..680a34e3d16 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Account Bank Statement Reconciliation Summary', + 'version': '10.0.1.0.0', + 'license': 'AGPL-3', + 'author': "Akretion,Odoo Community Association (OCA)", + 'website': 'http://www.akretion.com', + 'summary': 'Adds an XLSX report to help on bank statement reconciliation', + 'depends': ['account', 'report_xlsx'], + 'data': [ + 'report/report.xml', + 'views/account_bank_statement_view.xml', + ], + 'installable': True, +} diff --git a/account_bank_reconciliation_summary_xlsx/models/__init__.py b/account_bank_reconciliation_summary_xlsx/models/__init__.py new file mode 100644 index 00000000000..ac1164737b6 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/models/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import account_bank_statement diff --git a/account_bank_reconciliation_summary_xlsx/models/account_bank_statement.py b/account_bank_reconciliation_summary_xlsx/models/account_bank_statement.py new file mode 100644 index 00000000000..d43c4219f1d --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/models/account_bank_statement.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion France (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models + + +class AccountBankStatement(models.Model): + _inherit = 'account.bank.statement' + + def print_reconciliation_xlsx(self): + self.ensure_one() + action = { + 'type': 'ir.actions.report.xml', + 'report_name': 'bank.reconciliation.xlsx', + 'datas': { + 'model': 'account.journal', + 'ids': [self.journal_id.id], + }, + 'context': self._context, + } + return action diff --git a/account_bank_reconciliation_summary_xlsx/report/__init__.py b/account_bank_reconciliation_summary_xlsx/report/__init__.py new file mode 100644 index 00000000000..ce3ccb2cf2a --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/report/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import bank_reconciliation_xlsx diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py new file mode 100644 index 00000000000..4e96c0972a3 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -0,0 +1,200 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion France (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.report_xlsx.report.report_xlsx import ReportXlsx +from odoo import _ +from odoo.tools import DEFAULT_SERVER_DATE_FORMAT +from datetime import datetime + + +class BankReconciliationXlsx(ReportXlsx): + + def generate_xlsx_report(self, workbook, data, journals): + no_bank_journal = True + for o in journals.filtered(lambda o: o.type == 'bank'): + no_bank_journal = False + # Start styles + doc_title = workbook.add_format({'bold': True, 'font_size': 16}) + col_title = workbook.add_format({ + 'bold': True, 'bg_color': '#e2e2fa', + 'text_wrap': True, 'font_size': 10, + }) + title_right = workbook.add_format({ + 'bold': True, 'bg_color': '#e6e6fa', + 'font_size': 10, 'align': 'right', + }) + label_bold = workbook.add_format({ + 'bold': True, 'text_wrap': False, 'font_size': 10}) + none = workbook.add_format({ + 'bold': True, 'font_size': 10, 'align': 'right'}) + regular = workbook.add_format({'font_size': 10}) + lang_code = self.env.user.lang + lang = False + if lang_code: + lang = self.env['res.lang'].search([('code', '=', lang_code)]) + if not lang: + lang = self.env['res.lang'].search([], limit=1) + xls_date_format = lang.date_format.replace('%Y', 'yyyy').\ + replace('%m', 'mm').replace('%d', 'dd').replace('%y', 'yy') + if '%' in xls_date_format: + # fallback + xls_date_format = 'yyyy-mm-dd' + regular_date = workbook.add_format({ + 'num_format': xls_date_format, + 'font_size': 10, + 'align': 'left'}) + cur_format = u'#%s##0%s00 %s' % ( + lang.thousands_sep or '', + lang.decimal_point or '', + o.company_id.currency_id.symbol or + o.company_id.currency_id.name) + regular_currency = workbook.add_format( + {'num_format': cur_format, 'font_size': 10}) + regular_currency_bg = workbook.add_format({ + 'num_format': cur_format, 'font_size': 10, + 'bg_color': '#f6f6ff'}) + # End styles + + sheet = workbook.add_worksheet(o.code or o.name) + sheet.write( + 0, 0, _('%s - Bank Reconciliation') % o.display_name, + doc_title) + sheet.set_row(0, 26) + sheet.set_row(1, 25) + sheet.set_column(0, 0, 10) + sheet.set_column(1, 1, 40) + sheet.set_column(2, 2, 15) + sheet.set_column(3, 3, 25) + sheet.set_column(4, 4, 12) + sheet.set_column(5, 5, 14) + sheet.set_column(6, 6, 22) + row = 2 + sheet.write(row, 0, _("Date:"), label_bold) + # I can't use fields.Date.context_today(self) + sheet.write(row, 1, datetime.today(), regular_date) + # 1) Show accounting balance of bank account + bank_account = o.default_debit_account_id + sheet.write( + row, 3, + _('Balance %s:') % bank_account.code, title_right) + amount_field = 'balance' + # TODO: add support for bank accounts in foreign currency + # if not o.currency_id else 'amount_currency' + query = """ + SELECT sum(%s) FROM account_move_line + WHERE account_id=%%s""" % (amount_field,) + self.env.cr.execute(query, (bank_account.id,)) + query_results = self.env.cr.dictfetchall() + if query_results: + account_bal = query_results[0].get('sum') or 0.0 + else: + account_bal = 0.0 + + sheet.write(row, 4, account_bal, regular_currency_bg) + bank_bal = account_bal + formula = '=E%d' % (row + 1) + # 2) Show account move line that are not linked to bank account + row += 2 + sheet.write( + row, 0, _( + 'Journal items of account %s not linked to a bank ' + 'statement line:') % bank_account.code, + label_bold) + mlines = self.env['account.move.line'].search([ + ('account_id', '=', bank_account.id), + ('journal_id', '=', o.id), # to avoid initial line + ('statement_id', '=', False)]) + if not mlines: + sheet.write(row, 4, _('NONE'), none) + else: + row += 1 + sheet.write(row, 0, _('Date'), col_title) + sheet.write(row, 1, _('Label'), col_title) + sheet.write(row, 2, _('Ref.'), col_title) + sheet.write(row, 3, _('Partner'), col_title) + sheet.write(row, 4, _('Amount'), col_title) + sheet.write(row, 5, _('Move Number'), col_title) + sheet.write(row, 6, _('Counter-part'), col_title) + m_start_row = m_end_row = row + 1 + for mline in mlines: + row += 1 + m_end_row = row + move = mline.move_id + bank_bal -= mline.balance + date_dt = datetime.strptime( + mline.date, DEFAULT_SERVER_DATE_FORMAT) + sheet.write(row, 0, date_dt, regular_date) + sheet.write(row, 1, mline.name, regular) + sheet.write(row, 2, mline.ref or '', regular) + sheet.write( + row, 3, mline.partner_id.display_name or '', regular) + sheet.write(row, 4, mline.balance, regular_currency) + sheet.write(row, 5, move.name, regular) + # counter-part accounts + cpart = [] + for line in move.line_ids: + if ( + line.account_id != bank_account and + line.account_id.code not in cpart): + cpart.append(line.account_id.code) + sheet.write(row, 6, ' ,'.join(cpart), regular) + + formula += '-SUM(E%d:E%d)' % (m_start_row + 1, m_end_row + 1) + + # 3) Add draft bank statement lines + row += 2 # skip 1 line + sheet.write( + row, 0, _( + 'Draft bank statement lines:'), + label_bold) + blines = self.env['account.bank.statement.line'].search([ + ('journal_entry_ids', '=', False), + ('journal_id', '=', o.id)]) + if not blines: + sheet.write(row, 4, _('NONE'), none) + else: + row += 1 + sheet.write(row, 0, _('Date'), col_title) + sheet.write(row, 1, _('Label'), col_title) + sheet.write(row, 2, _('Ref.'), col_title) + sheet.write(row, 3, _('Partner'), col_title) + sheet.write(row, 4, _('Amount'), col_title) + sheet.write(row, 5, _('Statement Ref.'), col_title) + b_start_row = b_end_row = row + 1 + for bline in blines: + row += 1 + b_end_row = row + bank_bal += bline.amount + date_dt = datetime.strptime( + bline.date, DEFAULT_SERVER_DATE_FORMAT) + sheet.write(row, 0, date_dt, regular_date) + sheet.write(row, 1, bline.name, regular) + sheet.write(row, 2, bline.ref or '', regular) + sheet.write( + row, 3, bline.partner_id.display_name or '', regular) + sheet.write(row, 4, bline.amount, regular_currency) + sheet.write( + row, 5, bline.statement_id.name or '', + regular_currency) + formula += '+SUM(E%d:E%d)' % (b_start_row + 1, b_end_row + 1) + + # 4) Theoric bank account balance at the bank + row += 2 + sheet.write( + row, 3, _('Computed Bank Account Balance at the Bank:'), + title_right) + sheet.write_formula( + row, 4, formula, regular_currency_bg, bank_bal) + if no_bank_journal: + sheet = workbook.add_worksheet(_('No Bank Journal')) + sheet.set_row(0, 30) + warn_msg = workbook.add_format( + {'bold': True, 'font_size': 16, 'font_color': '#003b6f'}) + sheet.write( + 0, 0, _( + "No bank journal selected. " + "This report is only for bank journals."), warn_msg) + + +BankReconciliationXlsx('report.bank.reconciliation.xlsx', 'account.journal') diff --git a/account_bank_reconciliation_summary_xlsx/report/report.xml b/account_bank_reconciliation_summary_xlsx/report/report.xml new file mode 100644 index 00000000000..c7cb9677469 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/report/report.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/account_bank_reconciliation_summary_xlsx/views/account_bank_statement_view.xml b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement_view.xml new file mode 100644 index 00000000000..e124089b378 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement_view.xml @@ -0,0 +1,23 @@ + + + + + + + + bank_rec_summary.account.bank.statement.form + account.bank.statement + + + + + + + + From 88db839b0550c3040f9ed91b62b2b906ef74f844 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 9 Jun 2017 00:38:54 +0200 Subject: [PATCH 02/24] Currency formatting with lang != en_US --- .../report/bank_reconciliation_xlsx.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py index 4e96c0972a3..7c908ec2a09 100644 --- a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -44,11 +44,12 @@ def generate_xlsx_report(self, workbook, data, journals): 'num_format': xls_date_format, 'font_size': 10, 'align': 'left'}) - cur_format = u'#%s##0%s00 %s' % ( - lang.thousands_sep or '', - lang.decimal_point or '', + cur_format = u'#,##0.00 %s' % ( o.company_id.currency_id.symbol or o.company_id.currency_id.name) + # It seems that Excel replaces automatically the decimal + # and thousand separator by those of the language under which + # Excel runs regular_currency = workbook.add_format( {'num_format': cur_format, 'font_size': 10}) regular_currency_bg = workbook.add_format({ From 315d8b93f03501c75d04a17a9b5dd4e83081d7d8 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 9 Jun 2017 00:42:27 +0200 Subject: [PATCH 03/24] Update module name and summary --- account_bank_reconciliation_summary_xlsx/__manifest__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index 680a34e3d16..fc857293511 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -3,12 +3,12 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Account Bank Statement Reconciliation Summary', + 'name': 'Bank Reconciliation Report', 'version': '10.0.1.0.0', 'license': 'AGPL-3', 'author': "Akretion,Odoo Community Association (OCA)", 'website': 'http://www.akretion.com', - 'summary': 'Adds an XLSX report to help on bank statement reconciliation', + 'summary': 'Adds an XLSX report to help on bank reconciliation', 'depends': ['account', 'report_xlsx'], 'data': [ 'report/report.xml', From 66b99559ee47b68642d93f9bce6a39586b0cb8e3 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 29 Oct 2017 00:29:01 +0200 Subject: [PATCH 04/24] Support bank reconciliation summary on date != today Add wizard for that report --- .../__init__.py | 1 + .../__manifest__.py | 4 +- .../models/__init__.py | 1 + .../models/account_move_line.py | 13 +++++ .../report/bank_reconciliation_xlsx.py | 58 ++++++++++++------- ...nt_view.xml => account_bank_statement.xml} | 0 .../views/account_move_line.xml | 22 +++++++ .../wizard/__init__.py | 3 + .../bank_reconciliation_report_wizard.py | 41 +++++++++++++ ...bank_reconciliation_report_wizard_view.xml | 36 ++++++++++++ 10 files changed, 157 insertions(+), 22 deletions(-) create mode 100644 account_bank_reconciliation_summary_xlsx/models/account_move_line.py rename account_bank_reconciliation_summary_xlsx/views/{account_bank_statement_view.xml => account_bank_statement.xml} (100%) create mode 100644 account_bank_reconciliation_summary_xlsx/views/account_move_line.xml create mode 100644 account_bank_reconciliation_summary_xlsx/wizard/__init__.py create mode 100644 account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py create mode 100644 account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml diff --git a/account_bank_reconciliation_summary_xlsx/__init__.py b/account_bank_reconciliation_summary_xlsx/__init__.py index 7a6c1b0355b..de9509a6776 100644 --- a/account_bank_reconciliation_summary_xlsx/__init__.py +++ b/account_bank_reconciliation_summary_xlsx/__init__.py @@ -2,3 +2,4 @@ from . import models from . import report +from . import wizard diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index fc857293511..0f25db90feb 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -12,7 +12,9 @@ 'depends': ['account', 'report_xlsx'], 'data': [ 'report/report.xml', - 'views/account_bank_statement_view.xml', + 'views/account_bank_statement.xml', + 'views/account_move_line.xml', + 'wizard/bank_reconciliation_report_wizard_view.xml', ], 'installable': True, } diff --git a/account_bank_reconciliation_summary_xlsx/models/__init__.py b/account_bank_reconciliation_summary_xlsx/models/__init__.py index ac1164737b6..a7a3402d9bd 100644 --- a/account_bank_reconciliation_summary_xlsx/models/__init__.py +++ b/account_bank_reconciliation_summary_xlsx/models/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import account_bank_statement +from . import account_move_line diff --git a/account_bank_reconciliation_summary_xlsx/models/account_move_line.py b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py new file mode 100644 index 00000000000..217270129f9 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountMoveLine(models.Model): + _inherit = 'account.move.line' + + statement_line_date = fields.Date( + string='Statement Line Date', + related='move_id.statement_line_id.date', store=True, readonly=True) diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py index 7c908ec2a09..9eb123629b9 100644 --- a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.addons.report_xlsx.report.report_xlsx import ReportXlsx -from odoo import _ +from odoo import fields, _ from odoo.tools import DEFAULT_SERVER_DATE_FORMAT from datetime import datetime @@ -11,10 +11,22 @@ class BankReconciliationXlsx(ReportXlsx): def generate_xlsx_report(self, workbook, data, journals): + # I can't use fields.Date.context_today(self) + date = data.get('date') or datetime.today() + date_dt = fields.Date.from_string(date) no_bank_journal = True for o in journals.filtered(lambda o: o.type == 'bank'): no_bank_journal = False # Start styles + lang_code = self.env.user.lang + lang = False + if lang_code: + lang = self.env['res.lang'].search([('code', '=', lang_code)]) + if not lang: + lang = self.env['res.lang'].search([], limit=1) + xls_date_format = lang.date_format.replace('%Y', 'yyyy').\ + replace('%m', 'mm').replace('%d', 'dd').replace('%y', 'yy') + doc_title = workbook.add_format({'bold': True, 'font_size': 16}) col_title = workbook.add_format({ 'bold': True, 'bg_color': '#e2e2fa', @@ -24,19 +36,16 @@ def generate_xlsx_report(self, workbook, data, journals): 'bold': True, 'bg_color': '#e6e6fa', 'font_size': 10, 'align': 'right', }) + title_date = workbook.add_format({ + 'bg_color': '#f6f6ff', 'bold': True, + 'num_format': xls_date_format, + 'font_size': 10, + 'align': 'left'}) label_bold = workbook.add_format({ 'bold': True, 'text_wrap': False, 'font_size': 10}) none = workbook.add_format({ 'bold': True, 'font_size': 10, 'align': 'right'}) regular = workbook.add_format({'font_size': 10}) - lang_code = self.env.user.lang - lang = False - if lang_code: - lang = self.env['res.lang'].search([('code', '=', lang_code)]) - if not lang: - lang = self.env['res.lang'].search([], limit=1) - xls_date_format = lang.date_format.replace('%Y', 'yyyy').\ - replace('%m', 'mm').replace('%d', 'dd').replace('%y', 'yy') if '%' in xls_date_format: # fallback xls_date_format = 'yyyy-mm-dd' @@ -71,10 +80,10 @@ def generate_xlsx_report(self, workbook, data, journals): sheet.set_column(5, 5, 14) sheet.set_column(6, 6, 22) row = 2 - sheet.write(row, 0, _("Date:"), label_bold) - # I can't use fields.Date.context_today(self) - sheet.write(row, 1, datetime.today(), regular_date) + sheet.write(row, 0, _("Date:"), title_right) + sheet.write(row, 1, date_dt, title_date) # 1) Show accounting balance of bank account + row += 1 bank_account = o.default_debit_account_id sheet.write( row, 3, @@ -84,8 +93,8 @@ def generate_xlsx_report(self, workbook, data, journals): # if not o.currency_id else 'amount_currency' query = """ SELECT sum(%s) FROM account_move_line - WHERE account_id=%%s""" % (amount_field,) - self.env.cr.execute(query, (bank_account.id,)) + WHERE account_id=%%s AND date <= %%s""" % (amount_field, ) + self.env.cr.execute(query, (bank_account.id, date)) query_results = self.env.cr.dictfetchall() if query_results: account_bal = query_results[0].get('sum') or 0.0 @@ -95,7 +104,8 @@ def generate_xlsx_report(self, workbook, data, journals): sheet.write(row, 4, account_bal, regular_currency_bg) bank_bal = account_bal formula = '=E%d' % (row + 1) - # 2) Show account move line that are not linked to bank account + # 2) Show account move line that are not linked to bank statement + # line or linked to a statement line after the date row += 2 sheet.write( row, 0, _( @@ -105,7 +115,9 @@ def generate_xlsx_report(self, workbook, data, journals): mlines = self.env['account.move.line'].search([ ('account_id', '=', bank_account.id), ('journal_id', '=', o.id), # to avoid initial line - ('statement_id', '=', False)]) + ('date', '<=', date), + '|', ('statement_line_date', '=', False), + ('statement_line_date', '>', date)]) if not mlines: sheet.write(row, 4, _('NONE'), none) else: @@ -115,8 +127,9 @@ def generate_xlsx_report(self, workbook, data, journals): sheet.write(row, 2, _('Ref.'), col_title) sheet.write(row, 3, _('Partner'), col_title) sheet.write(row, 4, _('Amount'), col_title) - sheet.write(row, 5, _('Move Number'), col_title) - sheet.write(row, 6, _('Counter-part'), col_title) + sheet.write(row, 5, _('Statement Line Date'), col_title) + sheet.write(row, 6, _('Move Number'), col_title) + sheet.write(row, 7, _('Counter-part'), col_title) m_start_row = m_end_row = row + 1 for mline in mlines: row += 1 @@ -131,7 +144,9 @@ def generate_xlsx_report(self, workbook, data, journals): sheet.write( row, 3, mline.partner_id.display_name or '', regular) sheet.write(row, 4, mline.balance, regular_currency) - sheet.write(row, 5, move.name, regular) + sheet.write( + row, 5, mline.statement_line_date, regular_date) + sheet.write(row, 6, move.name, regular) # counter-part accounts cpart = [] for line in move.line_ids: @@ -139,7 +154,7 @@ def generate_xlsx_report(self, workbook, data, journals): line.account_id != bank_account and line.account_id.code not in cpart): cpart.append(line.account_id.code) - sheet.write(row, 6, ' ,'.join(cpart), regular) + sheet.write(row, 7, ' ,'.join(cpart), regular) formula += '-SUM(E%d:E%d)' % (m_start_row + 1, m_end_row + 1) @@ -151,7 +166,8 @@ def generate_xlsx_report(self, workbook, data, journals): label_bold) blines = self.env['account.bank.statement.line'].search([ ('journal_entry_ids', '=', False), - ('journal_id', '=', o.id)]) + ('journal_id', '=', o.id), + ('date', '<=', date)]) if not blines: sheet.write(row, 4, _('NONE'), none) else: diff --git a/account_bank_reconciliation_summary_xlsx/views/account_bank_statement_view.xml b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml similarity index 100% rename from account_bank_reconciliation_summary_xlsx/views/account_bank_statement_view.xml rename to account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml diff --git a/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml b/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml new file mode 100644 index 00000000000..7e03af6cfbb --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml @@ -0,0 +1,22 @@ + + + + + + + + bank_rec_summarry.account_move_line_form + account.move.line + + + + + + + + + + diff --git a/account_bank_reconciliation_summary_xlsx/wizard/__init__.py b/account_bank_reconciliation_summary_xlsx/wizard/__init__.py new file mode 100644 index 00000000000..02696cfe964 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/wizard/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import bank_reconciliation_report_wizard diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py new file mode 100644 index 00000000000..1370a98ad39 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class BankReconciliationReportWizard(models.TransientModel): + _name = "bank.reconciliation.report.wizard" + _description = "Bank Reconciliation Report Wizard" + + @api.model + def _default_journal_ids(self): + journals = self.env['account.journal'].search([ + ('type', '=', 'bank'), + ('company_id', '=', self.env.user.company_id.id)]) + return journals + + company_id = fields.Many2one( + 'res.company', string='Company', + default=lambda self: self.env.user.company_id) + date = fields.Date( + required=True, + default=fields.Date.context_today) + journal_ids = fields.Many2many( + 'account.journal', string='Bank Journals', + domain=[('type', '=', 'bank')], required=True, + default=_default_journal_ids) + + def open_xlsx(self): + action = { + 'type': 'ir.actions.report.xml', + 'report_name': 'bank.reconciliation.xlsx', + 'datas': { + 'model': 'account.journal', + 'ids': self.journal_ids.ids, + 'date': self.date, + }, + 'context': self._context, + } + return action diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml new file mode 100644 index 00000000000..841d8ff1892 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml @@ -0,0 +1,36 @@ + + + + + + + bank.reconciliation.report.wizard.form + bank.reconciliation.report.wizard + +
+ + + + + +
+
+
+ + + + + Bank Reconciliation Report + bank.reconciliation.report.wizard + form + new + + + + + From 862549e6bfdcf43b6986653f4b11f4bc1e728b71 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 29 Oct 2017 02:16:48 +0200 Subject: [PATCH 05/24] Fine tune layout bank reconciliation report Report is technically linked to wizard, not to account.journal --- .../__manifest__.py | 2 +- .../models/__init__.py | 1 - .../models/account_bank_statement.py | 22 ------- .../report/bank_reconciliation_xlsx.py | 61 +++++++++++-------- .../report/report.xml | 2 +- .../views/account_bank_statement.xml | 4 +- .../bank_reconciliation_report_wizard.py | 8 +-- ...bank_reconciliation_report_wizard_view.xml | 3 +- 8 files changed, 44 insertions(+), 59 deletions(-) delete mode 100644 account_bank_reconciliation_summary_xlsx/models/account_bank_statement.py diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index 0f25db90feb..97b80d3256e 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -12,9 +12,9 @@ 'depends': ['account', 'report_xlsx'], 'data': [ 'report/report.xml', + 'wizard/bank_reconciliation_report_wizard_view.xml', 'views/account_bank_statement.xml', 'views/account_move_line.xml', - 'wizard/bank_reconciliation_report_wizard_view.xml', ], 'installable': True, } diff --git a/account_bank_reconciliation_summary_xlsx/models/__init__.py b/account_bank_reconciliation_summary_xlsx/models/__init__.py index a7a3402d9bd..0c1006db3e7 100644 --- a/account_bank_reconciliation_summary_xlsx/models/__init__.py +++ b/account_bank_reconciliation_summary_xlsx/models/__init__.py @@ -1,4 +1,3 @@ # -*- coding: utf-8 -*- -from . import account_bank_statement from . import account_move_line diff --git a/account_bank_reconciliation_summary_xlsx/models/account_bank_statement.py b/account_bank_reconciliation_summary_xlsx/models/account_bank_statement.py deleted file mode 100644 index d43c4219f1d..00000000000 --- a/account_bank_reconciliation_summary_xlsx/models/account_bank_statement.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion France (Alexis de Lattre ) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import models - - -class AccountBankStatement(models.Model): - _inherit = 'account.bank.statement' - - def print_reconciliation_xlsx(self): - self.ensure_one() - action = { - 'type': 'ir.actions.report.xml', - 'report_name': 'bank.reconciliation.xlsx', - 'datas': { - 'model': 'account.journal', - 'ids': [self.journal_id.id], - }, - 'context': self._context, - } - return action diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py index 9eb123629b9..b9ca49cdaf2 100644 --- a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -10,12 +10,11 @@ class BankReconciliationXlsx(ReportXlsx): - def generate_xlsx_report(self, workbook, data, journals): - # I can't use fields.Date.context_today(self) - date = data.get('date') or datetime.today() + def generate_xlsx_report(self, workbook, data, wizard): + date = wizard.date date_dt = fields.Date.from_string(date) no_bank_journal = True - for o in journals.filtered(lambda o: o.type == 'bank'): + for o in wizard.journal_ids: no_bank_journal = False # Start styles lang_code = self.env.user.lang @@ -77,14 +76,17 @@ def generate_xlsx_report(self, workbook, data, journals): sheet.set_column(2, 2, 15) sheet.set_column(3, 3, 25) sheet.set_column(4, 4, 12) - sheet.set_column(5, 5, 14) - sheet.set_column(6, 6, 22) + sheet.set_column(5, 5, 18) + sheet.set_column(6, 6, 14) + sheet.set_column(7, 7, 14) row = 2 sheet.write(row, 0, _("Date:"), title_right) sheet.write(row, 1, date_dt, title_date) # 1) Show accounting balance of bank account - row += 1 + row += 2 bank_account = o.default_debit_account_id + for col in range(3): + sheet.write(row, col, '', title_right) sheet.write( row, 3, _('Balance %s:') % bank_account.code, title_right) @@ -122,30 +124,33 @@ def generate_xlsx_report(self, workbook, data, journals): sheet.write(row, 4, _('NONE'), none) else: row += 1 - sheet.write(row, 0, _('Date'), col_title) - sheet.write(row, 1, _('Label'), col_title) - sheet.write(row, 2, _('Ref.'), col_title) - sheet.write(row, 3, _('Partner'), col_title) - sheet.write(row, 4, _('Amount'), col_title) - sheet.write(row, 5, _('Statement Line Date'), col_title) - sheet.write(row, 6, _('Move Number'), col_title) - sheet.write(row, 7, _('Counter-part'), col_title) + col_labels = [ + _('Date'), _('Label'), _('Ref.'), _('Partner'), + _('Amount'), _('Statement Line Date'), _('Move Number'), + _('Counter-part')] + col = 0 + for col_label in col_labels: + sheet.write(row, col, col_label, col_title) + col += 1 m_start_row = m_end_row = row + 1 for mline in mlines: row += 1 m_end_row = row move = mline.move_id bank_bal -= mline.balance - date_dt = datetime.strptime( - mline.date, DEFAULT_SERVER_DATE_FORMAT) + date_dt = fields.Date.from_string(mline.date) sheet.write(row, 0, date_dt, regular_date) sheet.write(row, 1, mline.name, regular) sheet.write(row, 2, mline.ref or '', regular) sheet.write( row, 3, mline.partner_id.display_name or '', regular) sheet.write(row, 4, mline.balance, regular_currency) - sheet.write( - row, 5, mline.statement_line_date, regular_date) + if mline.statement_line_date: + stl_date_dt = fields.Date.from_string( + mline.statement_line_date) + else: + stl_date_dt = '' + sheet.write(row, 5, stl_date_dt, regular_date) sheet.write(row, 6, move.name, regular) # counter-part accounts cpart = [] @@ -172,12 +177,13 @@ def generate_xlsx_report(self, workbook, data, journals): sheet.write(row, 4, _('NONE'), none) else: row += 1 - sheet.write(row, 0, _('Date'), col_title) - sheet.write(row, 1, _('Label'), col_title) - sheet.write(row, 2, _('Ref.'), col_title) - sheet.write(row, 3, _('Partner'), col_title) - sheet.write(row, 4, _('Amount'), col_title) - sheet.write(row, 5, _('Statement Ref.'), col_title) + col_labels = [ + _('Date'), _('Label'), _('Ref.'), + _('Partner'), _('Amount'), _('Statement Ref.'), '', ''] + col = 0 + for col_label in col_labels: + sheet.write(row, col, col_label, col_title) + col += 1 b_start_row = b_end_row = row + 1 for bline in blines: row += 1 @@ -198,6 +204,8 @@ def generate_xlsx_report(self, workbook, data, journals): # 4) Theoric bank account balance at the bank row += 2 + for col in range(3): + sheet.write(row, col, '', title_right) sheet.write( row, 3, _('Computed Bank Account Balance at the Bank:'), title_right) @@ -214,4 +222,5 @@ def generate_xlsx_report(self, workbook, data, journals): "This report is only for bank journals."), warn_msg) -BankReconciliationXlsx('report.bank.reconciliation.xlsx', 'account.journal') +BankReconciliationXlsx( + 'report.bank.reconciliation.xlsx', 'bank.reconciliation.report.wizard') diff --git a/account_bank_reconciliation_summary_xlsx/report/report.xml b/account_bank_reconciliation_summary_xlsx/report/report.xml index c7cb9677469..8a855b440ff 100644 --- a/account_bank_reconciliation_summary_xlsx/report/report.xml +++ b/account_bank_reconciliation_summary_xlsx/report/report.xml @@ -8,7 +8,7 @@ diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py index 1370a98ad39..9c887bd5676 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py @@ -16,9 +16,6 @@ def _default_journal_ids(self): ('company_id', '=', self.env.user.company_id.id)]) return journals - company_id = fields.Many2one( - 'res.company', string='Company', - default=lambda self: self.env.user.company_id) date = fields.Date( required=True, default=fields.Date.context_today) @@ -32,8 +29,9 @@ def open_xlsx(self): 'type': 'ir.actions.report.xml', 'report_name': 'bank.reconciliation.xlsx', 'datas': { - 'model': 'account.journal', - 'ids': self.journal_ids.ids, + 'model': self._name, + 'ids': self.ids, + 'journal_ids': self.journal_ids.ids, 'date': self.date, }, 'context': self._context, diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml index 841d8ff1892..8ee3d6e6fed 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml @@ -6,13 +6,13 @@ + bank.reconciliation.report.wizard.form bank.reconciliation.report.wizard
- @@ -33,4 +33,5 @@ + From 3b1927d5da8a026d2b18bc629566a225b9b0d01f Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 29 Oct 2017 02:22:41 +0200 Subject: [PATCH 06/24] Put menu entry of Bank Reconciliation Report under OCA reports --- account_bank_reconciliation_summary_xlsx/README.rst | 5 ++--- account_bank_reconciliation_summary_xlsx/__manifest__.py | 2 +- .../wizard/bank_reconciliation_report_wizard_view.xml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/README.rst b/account_bank_reconciliation_summary_xlsx/README.rst index e0a3f6eec92..fd4cb162e10 100644 --- a/account_bank_reconciliation_summary_xlsx/README.rst +++ b/account_bank_reconciliation_summary_xlsx/README.rst @@ -23,10 +23,9 @@ This module doesn't require any configuration. Usage ===== -You can get the Bank Reconciliation Report from: +You can launch the Bank Reconciliation Report wizard from: -* the form view of a bank bournal: click on *Print > Bank Reconciliation XLSX* -* the tree view of journals: select one or several journals and click on *Print > Bank Reconciliation XLSX* (if you selected several bank journals, you will get one tab per journal) +* the menu *Accounting > Reports > OCA accounting reports > Bank Reconciliation*, * the form view of a bank statement: click on the button *Bank Reconciliation Report*. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index 97b80d3256e..4ea8f420858 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -9,7 +9,7 @@ 'author': "Akretion,Odoo Community Association (OCA)", 'website': 'http://www.akretion.com', 'summary': 'Adds an XLSX report to help on bank reconciliation', - 'depends': ['account', 'report_xlsx'], + 'depends': ['account_financial_report_qweb', 'report_xlsx'], 'data': [ 'report/report.xml', 'wizard/bank_reconciliation_report_wizard_view.xml', diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml index 8ee3d6e6fed..13227916613 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml @@ -25,13 +25,13 @@ - Bank Reconciliation Report + Bank Reconciliation bank.reconciliation.report.wizard form new - + From a09e143672a4774fb8bcb3f04442eb8cc8995682 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 29 Oct 2017 12:32:08 +0100 Subject: [PATCH 07/24] =?UTF-8?q?Fix=20typo=20in=20README=20found=20by=20R?= =?UTF-8?q?apha=C3=ABl=20Valyi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account_bank_reconciliation_summary_xlsx/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_bank_reconciliation_summary_xlsx/README.rst b/account_bank_reconciliation_summary_xlsx/README.rst index fd4cb162e10..447639d4157 100644 --- a/account_bank_reconciliation_summary_xlsx/README.rst +++ b/account_bank_reconciliation_summary_xlsx/README.rst @@ -13,7 +13,7 @@ This module adds a Bank Reconciliation Report in Odoo in XLSX format. For each b 3. The list of draft bank statement lines not linked to any journal items, 4. The computed balance of the bank account at the bank. -The last field (computed balance of the bank account at the bank) must be compared to the real bank account balance at the bank. If there is a difference, you need to find the erreor in the accounting. The field *Computed balance of the bank account at the bank* is a formula, so you can easily change its computation to try to find the difference with the real bank account balance at the bank. +The last field (computed balance of the bank account at the bank) must be compared to the real bank account balance at the bank. If there is a difference, you need to find the error in the accounting. The field *Computed balance of the bank account at the bank* is a formula, so you can easily change its computation to try to find the difference with the real bank account balance at the bank. Configuration ============= From 3e629a5a0359b1647cb8c5ff4c60377129d4e780 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sat, 24 Mar 2018 14:18:38 +0100 Subject: [PATCH 08/24] Access to Bank reconciliation report from accounting dashboard Code written during the Tryton conference at JDLL 2018 :) --- .../__manifest__.py | 1 + .../views/account_journal.xml | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 account_bank_reconciliation_summary_xlsx/views/account_journal.xml diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index 4ea8f420858..de9c9a43e18 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -15,6 +15,7 @@ 'wizard/bank_reconciliation_report_wizard_view.xml', 'views/account_bank_statement.xml', 'views/account_move_line.xml', + 'views/account_journal.xml', ], 'installable': True, } diff --git a/account_bank_reconciliation_summary_xlsx/views/account_journal.xml b/account_bank_reconciliation_summary_xlsx/views/account_journal.xml new file mode 100644 index 00000000000..35c9d9997ac --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/views/account_journal.xml @@ -0,0 +1,31 @@ + + + + + + + + bank_reconciliation_summarry.account_journal_dashboard + account.journal + + + +
+
+ Report +
+ +
+ + + + + + From 907ebd71d72c240091bd250782eed020a4a59036 Mon Sep 17 00:00:00 2001 From: Mourad EL HADJ MIMOUNE Date: Tue, 4 Dec 2018 16:29:45 +0100 Subject: [PATCH 09/24] add fr.po & filter default journal by bank_account_id & usee statement.display_name --- .../i18n/fr.po | 216 ++++++++++++++++++ .../report/bank_reconciliation_xlsx.py | 2 +- .../bank_reconciliation_report_wizard.py | 4 +- 3 files changed, 220 insertions(+), 2 deletions(-) create mode 100644 account_bank_reconciliation_summary_xlsx/i18n/fr.po diff --git a/account_bank_reconciliation_summary_xlsx/i18n/fr.po b/account_bank_reconciliation_summary_xlsx/i18n/fr.po new file mode 100644 index 00000000000..2cfe1d922eb --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/i18n/fr.po @@ -0,0 +1,216 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_bank_reconciliation_summary_xlsx +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-12-04 10:29+0000\n" +"PO-Revision-Date: 2018-12-04 10:29+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:70 +#, python-format +msgid "%s - Bank Reconciliation" +msgstr "%s - Rapprochement bancaire" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +msgid "Report" +msgstr "Raport" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:129 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:182 +#, python-format +msgid "Amount" +msgstr "Montant" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:92 +#, python-format +msgid "Balance %s:" +msgstr "Balance %s:" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_journal_ids +msgid "Bank Journals" +msgstr "Journaux de banque" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.act_window,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_action +#: model:ir.ui.menu,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_menu +#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +msgid "Bank Reconciliation" +msgstr "Rapprochement bancaire" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form +msgid "Bank Reconciliation Report" +msgstr "Raport rapprochement bancaire" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_bank_reconciliation_report_wizard +msgid "Bank Reconciliation Report Wizard" +msgstr "Wizard raport rapprochement bancaire" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.report.xml,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +msgid "Bank Reconciliation XLSX" +msgstr "XLSX rapprochement bancaire" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +msgid "Cancel" +msgstr "Annuler" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:210 +#, python-format +msgid "Computed Bank Account Balance at the Bank:" +msgstr "Solde calculé du compte bancaire :" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:130 +#, python-format +msgid "Counter-part" +msgstr "Contre partie" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_create_uid +msgid "Created by" +msgstr "Créé par" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_create_date +msgid "Created on" +msgstr "Créé le" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:181 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_date +#, python-format +msgid "Date" +msgstr "Date " + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:83 +#, python-format +msgid "Date:" +msgstr "Date:" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_display_name +msgid "Display Name" +msgstr "Nom affiché" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:169 +#, python-format +msgid "Draft bank statement lines:" +msgstr "Lines non validées du relevé bancaire:" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +msgid "Export XLSX" +msgstr "Export XLSX" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_id +msgid "ID" +msgstr "ID" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_account_move_line +msgid "Journal Item" +msgstr "Écriture comptable" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:113 +#, python-format +msgid "Journal items of account %s not linked to a bank statement line:" +msgstr "Ecritures comptables du compte %s not liés à une ligne de relevé bancaire :" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:181 +#, python-format +msgid "Label" +msgstr "Libellé" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard___last_update +msgid "Last Modified on" +msgstr "Dernière modification le" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_write_uid +msgid "Last Updated by" +msgstr "Mis à jour par" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_write_date +msgid "Last Updated on" +msgstr "Mis à jour le" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:129 +#, python-format +msgid "Move Number" +msgstr "Numéro pièce comptables" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:124 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:177 +#, python-format +msgid "NONE" +msgstr "Rien" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:215 +#, python-format +msgid "No Bank Journal" +msgstr "Pas de journal de banque" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:220 +#, python-format +msgid "No bank journal selected. This report is only for bank journals." +msgstr "Pas de journal de banque sélectionné. Ce rapport est uniquement pour les journaux de banque." + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:182 +#, python-format +msgid "Partner" +msgstr "Partenaire" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:181 +#, python-format +msgid "Ref." +msgstr "Ref." + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:129 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_account_move_line_statement_line_date +#, python-format +msgid "Statement Line Date" +msgstr "Date ligne relevé" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:182 +#, python-format +msgid "Statement Ref." +msgstr "Ref. relevé" + diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py index b9ca49cdaf2..2e1fcd2d2cd 100644 --- a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -198,7 +198,7 @@ def generate_xlsx_report(self, workbook, data, wizard): row, 3, bline.partner_id.display_name or '', regular) sheet.write(row, 4, bline.amount, regular_currency) sheet.write( - row, 5, bline.statement_id.name or '', + row, 5, bline.statement_id.display_name or '', regular_currency) formula += '+SUM(E%d:E%d)' % (b_start_row + 1, b_end_row + 1) diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py index 9c887bd5676..61040e2bb7f 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py @@ -13,7 +13,9 @@ class BankReconciliationReportWizard(models.TransientModel): def _default_journal_ids(self): journals = self.env['account.journal'].search([ ('type', '=', 'bank'), - ('company_id', '=', self.env.user.company_id.id)]) + ('bank_account_id', '!=', False), + ('company_id', '=', self.env.user.company_id.id), + ]) return journals date = fields.Date( From 956d9c9d377b03d30ea55dc0d292a942f46d8323 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 15 Jan 2019 17:13:03 +0100 Subject: [PATCH 10/24] Add company name in title of the XLSX report --- .../report/bank_reconciliation_xlsx.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py index 2e1fcd2d2cd..635de7845a9 100644 --- a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -67,7 +67,9 @@ def generate_xlsx_report(self, workbook, data, wizard): sheet = workbook.add_worksheet(o.code or o.name) sheet.write( - 0, 0, _('%s - Bank Reconciliation') % o.display_name, + 0, 0, + _('%s - %s - Bank Reconciliation') % ( + o.company_id.name, o.display_name), doc_title) sheet.set_row(0, 26) sheet.set_row(1, 25) From 6b4062051d5a9970c09b3b64aeeafdf9061deb19 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sat, 2 Mar 2019 15:26:05 +0100 Subject: [PATCH 11/24] Fix FR translation --- .../i18n/fr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/i18n/fr.po b/account_bank_reconciliation_summary_xlsx/i18n/fr.po index 2cfe1d922eb..e745e11e5b3 100644 --- a/account_bank_reconciliation_summary_xlsx/i18n/fr.po +++ b/account_bank_reconciliation_summary_xlsx/i18n/fr.po @@ -24,7 +24,7 @@ msgstr "%s - Rapprochement bancaire" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view msgid "Report" -msgstr "Raport" +msgstr "Rapport" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:129 @@ -55,7 +55,7 @@ msgstr "Rapprochement bancaire" #: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form #: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form msgid "Bank Reconciliation Report" -msgstr "Raport rapprochement bancaire" +msgstr "Rapport rapprochement bancaire" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_bank_reconciliation_report_wizard @@ -65,7 +65,7 @@ msgstr "Wizard raport rapprochement bancaire" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.report.xml,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx msgid "Bank Reconciliation XLSX" -msgstr "XLSX rapprochement bancaire" +msgstr "Rapprochement bancaire XLSX" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form @@ -76,7 +76,7 @@ msgstr "Annuler" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:210 #, python-format msgid "Computed Bank Account Balance at the Bank:" -msgstr "Solde calculé du compte bancaire :" +msgstr "Solde théorique du compte bancaire :" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:130 @@ -106,7 +106,7 @@ msgstr "Date " #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:83 #, python-format msgid "Date:" -msgstr "Date:" +msgstr "Date :" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_display_name @@ -117,7 +117,7 @@ msgstr "Nom affiché" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:169 #, python-format msgid "Draft bank statement lines:" -msgstr "Lines non validées du relevé bancaire:" +msgstr "Lignes non validées du relevé bancaire :" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form @@ -138,7 +138,7 @@ msgstr "Écriture comptable" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:113 #, python-format msgid "Journal items of account %s not linked to a bank statement line:" -msgstr "Ecritures comptables du compte %s not liés à une ligne de relevé bancaire :" +msgstr "Ecritures comptables du compte %s non liées à une ligne de relevé bancaire :" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 @@ -166,7 +166,7 @@ msgstr "Mis à jour le" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:129 #, python-format msgid "Move Number" -msgstr "Numéro pièce comptables" +msgstr "Numéro de pièce" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:124 From 56e7fb362042e18880ea3cdbd33e4ecb9628ad6a Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sat, 2 Mar 2019 18:31:32 +0100 Subject: [PATCH 12/24] [MIG] account_bank_reconciliation_summary_xlsx from v10 to v12 --- .../__init__.py | 2 - .../__manifest__.py | 12 +- .../models/__init__.py | 2 - .../models/account_move_line.py | 6 +- .../readme/CONFIGURE.rst | 1 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 8 + .../readme/USAGE.rst | 5 + .../report/__init__.py | 2 - .../report/bank_reconciliation_xlsx.py | 155 ++++++++++-------- .../report/report.xml | 5 +- .../views/account_bank_statement.xml | 3 +- .../views/account_journal.xml | 5 +- .../views/account_move_line.xml | 5 +- .../wizard/__init__.py | 2 - .../bank_reconciliation_report_wizard.py | 21 +-- ...bank_reconciliation_report_wizard_view.xml | 11 +- 17 files changed, 139 insertions(+), 107 deletions(-) create mode 100644 account_bank_reconciliation_summary_xlsx/readme/CONFIGURE.rst create mode 100644 account_bank_reconciliation_summary_xlsx/readme/CONTRIBUTORS.rst create mode 100644 account_bank_reconciliation_summary_xlsx/readme/DESCRIPTION.rst create mode 100644 account_bank_reconciliation_summary_xlsx/readme/USAGE.rst diff --git a/account_bank_reconciliation_summary_xlsx/__init__.py b/account_bank_reconciliation_summary_xlsx/__init__.py index de9509a6776..7660e7bf616 100644 --- a/account_bank_reconciliation_summary_xlsx/__init__.py +++ b/account_bank_reconciliation_summary_xlsx/__init__.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from . import models from . import report from . import wizard diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index de9c9a43e18..c81f994830f 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -1,15 +1,15 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion (Alexis de Lattre ) +# Copyright 2017-2019 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Bank Reconciliation Report', - 'version': '10.0.1.0.0', + 'version': '12.0.1.0.0', 'license': 'AGPL-3', 'author': "Akretion,Odoo Community Association (OCA)", - 'website': 'http://www.akretion.com', - 'summary': 'Adds an XLSX report to help on bank reconciliation', - 'depends': ['account_financial_report_qweb', 'report_xlsx'], + 'website': 'https://github.com/OCA/account-financial-reporting', + 'summary': 'XLSX report to help on bank reconciliation', + 'depends': ['account_financial_report', 'report_xlsx'], 'data': [ 'report/report.xml', 'wizard/bank_reconciliation_report_wizard_view.xml', diff --git a/account_bank_reconciliation_summary_xlsx/models/__init__.py b/account_bank_reconciliation_summary_xlsx/models/__init__.py index 0c1006db3e7..8795b3bea64 100644 --- a/account_bank_reconciliation_summary_xlsx/models/__init__.py +++ b/account_bank_reconciliation_summary_xlsx/models/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import account_move_line diff --git a/account_bank_reconciliation_summary_xlsx/models/account_move_line.py b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py index 217270129f9..a9f2605c251 100644 --- a/account_bank_reconciliation_summary_xlsx/models/account_move_line.py +++ b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py @@ -1,5 +1,5 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion (Alexis de Lattre ) +# Copyright 2017-2019 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import fields, models @@ -10,4 +10,4 @@ class AccountMoveLine(models.Model): statement_line_date = fields.Date( string='Statement Line Date', - related='move_id.statement_line_id.date', store=True, readonly=True) + related='statement_line_id.date', store=True) diff --git a/account_bank_reconciliation_summary_xlsx/readme/CONFIGURE.rst b/account_bank_reconciliation_summary_xlsx/readme/CONFIGURE.rst new file mode 100644 index 00000000000..8b3e65610f7 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/readme/CONFIGURE.rst @@ -0,0 +1 @@ +This module doesn't require any configuration. diff --git a/account_bank_reconciliation_summary_xlsx/readme/CONTRIBUTORS.rst b/account_bank_reconciliation_summary_xlsx/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..ff65d68ce6d --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Alexis de Lattre diff --git a/account_bank_reconciliation_summary_xlsx/readme/DESCRIPTION.rst b/account_bank_reconciliation_summary_xlsx/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..d75d9ec3fc5 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/readme/DESCRIPTION.rst @@ -0,0 +1,8 @@ +This module adds a Bank Reconciliation Report in Odoo in XLSX format. For each bank journal, the report displays: + +1. The balance of the bank account in the accounting, +2. The list of journal items of the bank account not linked to any bank statement lines, +3. The list of draft bank statement lines not linked to any journal items, +4. The computed balance of the bank account at the bank. + +The last field (computed balance of the bank account at the bank) must be compared to the real bank account balance at the bank. If there is a difference, you need to find the error in the accounting. The field *Computed balance of the bank account at the bank* is a formula, so you can easily change its computation to try to find the difference with the real bank account balance at the bank. diff --git a/account_bank_reconciliation_summary_xlsx/readme/USAGE.rst b/account_bank_reconciliation_summary_xlsx/readme/USAGE.rst new file mode 100644 index 00000000000..49384754ef1 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/readme/USAGE.rst @@ -0,0 +1,5 @@ +You can launch the Bank Reconciliation Report wizard from: + +* the menu *Invoicing > Reporting > OCA accounting reports > Bank Reconciliation*, +* the form view of a bank statement: click on the button *Bank Reconciliation Report*, +* the invoicing dashboard: on a bank journal, click on the options, then select *Bank Reconciliation*. diff --git a/account_bank_reconciliation_summary_xlsx/report/__init__.py b/account_bank_reconciliation_summary_xlsx/report/__init__.py index ce3ccb2cf2a..c23e36d8c00 100644 --- a/account_bank_reconciliation_summary_xlsx/report/__init__.py +++ b/account_bank_reconciliation_summary_xlsx/report/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import bank_reconciliation_xlsx diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py index 635de7845a9..c415b43dc95 100644 --- a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -1,14 +1,76 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion France (Alexis de Lattre ) +# Copyright 2017-2019 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo.addons.report_xlsx.report.report_xlsx import ReportXlsx -from odoo import fields, _ -from odoo.tools import DEFAULT_SERVER_DATE_FORMAT -from datetime import datetime +from odoo import _, fields, models -class BankReconciliationXlsx(ReportXlsx): +class BankReconciliationXlsx(models.AbstractModel): + _name = 'report.bank.reconciliation.xlsx' + _inherit = 'report.report_xlsx.abstract' + + def _compute_account_balance(self, journal, date): + bank_account = journal.default_debit_account_id + amount_field = 'balance' + # TODO: add support for bank accounts in foreign currency + # if not o.currency_id else 'amount_currency' + query = """ + SELECT sum(%s) FROM account_move_line + WHERE account_id=%%s AND date <= %%s""" % (amount_field, ) + self.env.cr.execute(query, (bank_account.id, date)) + query_results = self.env.cr.dictfetchall() + if query_results: + account_bal = query_results[0].get('sum') or 0.0 + else: + account_bal = 0.0 + return account_bal + + def _prepare_move_lines(self, journal, date): + bank_account = journal.default_debit_account_id + mlines = self.env['account.move.line'].search([ + ('account_id', '=', bank_account.id), + ('journal_id', '=', journal.id), # to avoid initial line + ('date', '<=', date), + '|', ('statement_line_date', '=', False), + ('statement_line_date', '>', date)]) + res = [] + for mline in mlines: + move = mline.move_id + cpart = [] + for line in move.line_ids: + if ( + line.account_id != bank_account and + line.account_id.code not in cpart): + cpart.append(line.account_id.code) + counterpart = ' ,'.join(cpart) + res.append({ + 'date': mline.date, + 'label': mline.name, + 'ref': mline.ref or '', + 'partner': mline.partner_id.display_name or '', + 'amount': mline.balance, + 'statement_line_date': mline.statement_line_date or '', + 'move_number': move.name, + 'counterpart': counterpart, + }) + return res + + def _prepare_draft_statement_lines(self, journal, date): + blines = self.env['account.bank.statement.line'].search([ + ('journal_entry_ids', '=', False), + ('journal_id', '=', journal.id), + ('date', '<=', date)]) + res = [] + for bline in blines: + res.append({ + 'date': bline.date, + 'label': bline.name, + 'ref': bline.ref or '', + 'partner': bline.partner_id.display_name or '', + 'amount': bline.amount, + 'statement_ref': bline.statement_id.display_name, + }) + return res def generate_xlsx_report(self, workbook, data, wizard): date = wizard.date @@ -92,18 +154,7 @@ def generate_xlsx_report(self, workbook, data, wizard): sheet.write( row, 3, _('Balance %s:') % bank_account.code, title_right) - amount_field = 'balance' - # TODO: add support for bank accounts in foreign currency - # if not o.currency_id else 'amount_currency' - query = """ - SELECT sum(%s) FROM account_move_line - WHERE account_id=%%s AND date <= %%s""" % (amount_field, ) - self.env.cr.execute(query, (bank_account.id, date)) - query_results = self.env.cr.dictfetchall() - if query_results: - account_bal = query_results[0].get('sum') or 0.0 - else: - account_bal = 0.0 + account_bal = self._compute_account_balance(o, date) sheet.write(row, 4, account_bal, regular_currency_bg) bank_bal = account_bal @@ -116,12 +167,7 @@ def generate_xlsx_report(self, workbook, data, wizard): 'Journal items of account %s not linked to a bank ' 'statement line:') % bank_account.code, label_bold) - mlines = self.env['account.move.line'].search([ - ('account_id', '=', bank_account.id), - ('journal_id', '=', o.id), # to avoid initial line - ('date', '<=', date), - '|', ('statement_line_date', '=', False), - ('statement_line_date', '>', date)]) + mlines = self._prepare_move_lines(o, date) if not mlines: sheet.write(row, 4, _('NONE'), none) else: @@ -138,30 +184,16 @@ def generate_xlsx_report(self, workbook, data, wizard): for mline in mlines: row += 1 m_end_row = row - move = mline.move_id - bank_bal -= mline.balance - date_dt = fields.Date.from_string(mline.date) - sheet.write(row, 0, date_dt, regular_date) - sheet.write(row, 1, mline.name, regular) - sheet.write(row, 2, mline.ref or '', regular) + bank_bal -= mline['amount'] + sheet.write(row, 0, mline['date'], regular_date) + sheet.write(row, 1, mline['label'], regular) + sheet.write(row, 2, mline['ref'], regular) + sheet.write(row, 3, mline['partner'], regular) + sheet.write(row, 4, mline['amount'], regular_currency) sheet.write( - row, 3, mline.partner_id.display_name or '', regular) - sheet.write(row, 4, mline.balance, regular_currency) - if mline.statement_line_date: - stl_date_dt = fields.Date.from_string( - mline.statement_line_date) - else: - stl_date_dt = '' - sheet.write(row, 5, stl_date_dt, regular_date) - sheet.write(row, 6, move.name, regular) - # counter-part accounts - cpart = [] - for line in move.line_ids: - if ( - line.account_id != bank_account and - line.account_id.code not in cpart): - cpart.append(line.account_id.code) - sheet.write(row, 7, ' ,'.join(cpart), regular) + row, 5, mline['statement_line_date'], regular_date) + sheet.write(row, 6, mline['move_number'], regular) + sheet.write(row, 7, mline['counterpart'], regular) formula += '-SUM(E%d:E%d)' % (m_start_row + 1, m_end_row + 1) @@ -171,10 +203,7 @@ def generate_xlsx_report(self, workbook, data, wizard): row, 0, _( 'Draft bank statement lines:'), label_bold) - blines = self.env['account.bank.statement.line'].search([ - ('journal_entry_ids', '=', False), - ('journal_id', '=', o.id), - ('date', '<=', date)]) + blines = self._prepare_draft_statement_lines(o, date) if not blines: sheet.write(row, 4, _('NONE'), none) else: @@ -190,18 +219,14 @@ def generate_xlsx_report(self, workbook, data, wizard): for bline in blines: row += 1 b_end_row = row - bank_bal += bline.amount - date_dt = datetime.strptime( - bline.date, DEFAULT_SERVER_DATE_FORMAT) - sheet.write(row, 0, date_dt, regular_date) - sheet.write(row, 1, bline.name, regular) - sheet.write(row, 2, bline.ref or '', regular) - sheet.write( - row, 3, bline.partner_id.display_name or '', regular) - sheet.write(row, 4, bline.amount, regular_currency) + bank_bal += bline['amount'] + sheet.write(row, 0, bline['date'], regular_date) + sheet.write(row, 1, bline['label'], regular) + sheet.write(row, 2, bline['ref'], regular) + sheet.write(row, 3, bline['partner'], regular) + sheet.write(row, 4, bline['amount'], regular_currency) sheet.write( - row, 5, bline.statement_id.display_name or '', - regular_currency) + row, 5, bline['statement_ref'], regular_currency) formula += '+SUM(E%d:E%d)' % (b_start_row + 1, b_end_row + 1) # 4) Theoric bank account balance at the bank @@ -222,7 +247,3 @@ def generate_xlsx_report(self, workbook, data, wizard): 0, 0, _( "No bank journal selected. " "This report is only for bank journals."), warn_msg) - - -BankReconciliationXlsx( - 'report.bank.reconciliation.xlsx', 'bank.reconciliation.report.wizard') diff --git a/account_bank_reconciliation_summary_xlsx/report/report.xml b/account_bank_reconciliation_summary_xlsx/report/report.xml index 8a855b440ff..0ad61e125b2 100644 --- a/account_bank_reconciliation_summary_xlsx/report/report.xml +++ b/account_bank_reconciliation_summary_xlsx/report/report.xml @@ -1,6 +1,7 @@ @@ -13,6 +14,8 @@ report_type="xlsx" name="bank.reconciliation.xlsx" file="bank.reconciliation.xlsx" + print_report_name="'bank_reconciliation-%s' % (object.date)" /> + diff --git a/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml index 63a36f618ce..6b0b087bde1 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml @@ -1,6 +1,7 @@ diff --git a/account_bank_reconciliation_summary_xlsx/views/account_journal.xml b/account_bank_reconciliation_summary_xlsx/views/account_journal.xml index 35c9d9997ac..4f85740c8d4 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_journal.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_journal.xml @@ -1,6 +1,7 @@ @@ -13,7 +14,7 @@ -
+
Report
diff --git a/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml b/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml index 7e03af6cfbb..0bddde15d14 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml @@ -1,6 +1,7 @@ @@ -8,7 +9,7 @@ - bank_rec_summarry.account_move_line_form + bank_rec_summary.account_move_line_form account.move.line diff --git a/account_bank_reconciliation_summary_xlsx/wizard/__init__.py b/account_bank_reconciliation_summary_xlsx/wizard/__init__.py index 02696cfe964..4ca3cb46cf4 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/__init__.py +++ b/account_bank_reconciliation_summary_xlsx/wizard/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import bank_reconciliation_report_wizard diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py index 61040e2bb7f..e93752be531 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py @@ -1,5 +1,5 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion (Alexis de Lattre ) +# Copyright 2017-2019 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, fields, models @@ -24,18 +24,11 @@ def _default_journal_ids(self): journal_ids = fields.Many2many( 'account.journal', string='Bank Journals', domain=[('type', '=', 'bank')], required=True, - default=_default_journal_ids) + default=lambda self: self._default_journal_ids()) def open_xlsx(self): - action = { - 'type': 'ir.actions.report.xml', - 'report_name': 'bank.reconciliation.xlsx', - 'datas': { - 'model': self._name, - 'ids': self.ids, - 'journal_ids': self.journal_ids.ids, - 'date': self.date, - }, - 'context': self._context, - } + report = self.env.ref( + 'account_bank_reconciliation_summary_xlsx.' + 'bank_reconciliation_xlsx') + action = report.report_action(self) return action diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml index 13227916613..ebcd4db72fa 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml @@ -1,6 +1,7 @@ @@ -18,7 +19,7 @@
@@ -31,7 +32,11 @@ new - + From b7da7e01c7595525873d4c5c7c7b468a02abd23d Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 7 Jun 2020 15:52:43 +0200 Subject: [PATCH 13/24] [MIG] account_bank_reconciliation_summary_xlsx to v13 --- account_bank_reconciliation_summary_xlsx/__manifest__.py | 4 ++-- .../models/account_move_line.py | 2 +- .../report/bank_reconciliation_xlsx.py | 3 ++- account_bank_reconciliation_summary_xlsx/report/report.xml | 2 +- .../views/account_bank_statement.xml | 2 +- .../views/account_journal.xml | 2 +- .../views/account_move_line.xml | 2 +- .../wizard/bank_reconciliation_report_wizard.py | 2 +- .../wizard/bank_reconciliation_report_wizard_view.xml | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index c81f994830f..69f71bedabe 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -1,10 +1,10 @@ -# Copyright 2017-2019 Akretion France (http://www.akretion.com/) +# Copyright 2017-2020 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Bank Reconciliation Report', - 'version': '12.0.1.0.0', + 'version': '13.0.1.0.0', 'license': 'AGPL-3', 'author': "Akretion,Odoo Community Association (OCA)", 'website': 'https://github.com/OCA/account-financial-reporting', diff --git a/account_bank_reconciliation_summary_xlsx/models/account_move_line.py b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py index a9f2605c251..32268385fb8 100644 --- a/account_bank_reconciliation_summary_xlsx/models/account_move_line.py +++ b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py @@ -1,4 +1,4 @@ -# Copyright 2017-2019 Akretion France (http://www.akretion.com/) +# Copyright 2017-2020 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py index c415b43dc95..833cdb999ae 100644 --- a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -1,4 +1,4 @@ -# Copyright 2017-2019 Akretion France (http://www.akretion.com/) +# Copyright 2017-2020 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -7,6 +7,7 @@ class BankReconciliationXlsx(models.AbstractModel): _name = 'report.bank.reconciliation.xlsx' + _description = 'Bank Reconciliation XLSX Report' _inherit = 'report.report_xlsx.abstract' def _compute_account_balance(self, journal, date): diff --git a/account_bank_reconciliation_summary_xlsx/report/report.xml b/account_bank_reconciliation_summary_xlsx/report/report.xml index 0ad61e125b2..c7a9ce257be 100644 --- a/account_bank_reconciliation_summary_xlsx/report/report.xml +++ b/account_bank_reconciliation_summary_xlsx/report/report.xml @@ -1,6 +1,6 @@ diff --git a/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml index 6b0b087bde1..9b57a3ae3ea 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml @@ -1,6 +1,6 @@ diff --git a/account_bank_reconciliation_summary_xlsx/views/account_journal.xml b/account_bank_reconciliation_summary_xlsx/views/account_journal.xml index 4f85740c8d4..5340adb2073 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_journal.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_journal.xml @@ -1,6 +1,6 @@ diff --git a/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml b/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml index 0bddde15d14..0afd4b68aa0 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml @@ -1,6 +1,6 @@ diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py index e93752be531..591d0c32a43 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py @@ -1,4 +1,4 @@ -# Copyright 2017-2019 Akretion France (http://www.akretion.com/) +# Copyright 2017-2020 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml index ebcd4db72fa..692c2c46c47 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml @@ -1,6 +1,6 @@ From 1c484cbbec1cd062d3beace993245f50e6bc8455 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 7 Jun 2020 15:58:33 +0200 Subject: [PATCH 14/24] account_bank_reconciliation_summary_xlsx: black, isort, etc. --- .../README.rst | 76 ++- .../__manifest__.py | 30 +- ...count_bank_reconciliation_summary_xlsx.pot | 226 +++++++++ .../i18n/fr.po | 105 +++-- .../models/account_move_line.py | 6 +- .../report/bank_reconciliation_xlsx.py | 298 +++++++----- .../report/report.xml | 23 +- .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 441 ++++++++++++++++++ .../views/account_bank_statement.xml | 33 +- .../views/account_journal.xml | 48 +- .../views/account_move_line.xml | 25 +- .../bank_reconciliation_report_wizard.py | 29 +- ...bank_reconciliation_report_wizard_view.xml | 64 +-- 14 files changed, 1075 insertions(+), 329 deletions(-) create mode 100644 account_bank_reconciliation_summary_xlsx/i18n/account_bank_reconciliation_summary_xlsx.pot create mode 100644 account_bank_reconciliation_summary_xlsx/static/description/icon.png create mode 100644 account_bank_reconciliation_summary_xlsx/static/description/index.html diff --git a/account_bank_reconciliation_summary_xlsx/README.rst b/account_bank_reconciliation_summary_xlsx/README.rst index 447639d4157..2e10403b5df 100644 --- a/account_bank_reconciliation_summary_xlsx/README.rst +++ b/account_bank_reconciliation_summary_xlsx/README.rst @@ -1,10 +1,29 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - -=============================== -Bank Reconciliation Report XLSX -=============================== +========================== +Bank Reconciliation Report +========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github + :target: https://github.com/OCA/account-financial-reporting/tree/13.0/account_bank_reconciliation_summary_xlsx + :alt: OCA/account-financial-reporting +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-financial-reporting-13-0/account-financial-reporting-13-0-account_bank_reconciliation_summary_xlsx + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/91/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module adds a Bank Reconciliation Report in Odoo in XLSX format. For each bank journal, the report displays: @@ -15,6 +34,11 @@ This module adds a Bank Reconciliation Report in Odoo in XLSX format. For each b The last field (computed balance of the bank account at the bank) must be compared to the real bank account balance at the bank. If there is a difference, you need to find the error in the accounting. The field *Computed balance of the bank account at the bank* is a formula, so you can easily change its computation to try to find the difference with the real bank account balance at the bank. +**Table of contents** + +.. contents:: + :local: + Configuration ============= @@ -25,40 +49,46 @@ Usage You can launch the Bank Reconciliation Report wizard from: -* the menu *Accounting > Reports > OCA accounting reports > Bank Reconciliation*, -* the form view of a bank statement: click on the button *Bank Reconciliation Report*. - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/91/10.0 +* the menu *Invoicing > Reporting > OCA accounting reports > Bank Reconciliation*, +* the form view of a bank statement: click on the button *Bank Reconciliation Report*, +* the invoicing dashboard: on a bank journal, click on the options, then select *Bank Reconciliation*. Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= +Authors +~~~~~~~ + +* Akretion + Contributors ------------- +~~~~~~~~~~~~ * Alexis de Lattre -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/account-financial-reporting `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index 69f71bedabe..1534d503cd9 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -3,19 +3,19 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Bank Reconciliation Report', - 'version': '13.0.1.0.0', - 'license': 'AGPL-3', - 'author': "Akretion,Odoo Community Association (OCA)", - 'website': 'https://github.com/OCA/account-financial-reporting', - 'summary': 'XLSX report to help on bank reconciliation', - 'depends': ['account_financial_report', 'report_xlsx'], - 'data': [ - 'report/report.xml', - 'wizard/bank_reconciliation_report_wizard_view.xml', - 'views/account_bank_statement.xml', - 'views/account_move_line.xml', - 'views/account_journal.xml', - ], - 'installable': True, + "name": "Bank Reconciliation Report", + "version": "13.0.1.0.0", + "license": "AGPL-3", + "author": "Akretion,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-financial-reporting", + "summary": "XLSX report to help on bank reconciliation", + "depends": ["account_financial_report", "report_xlsx"], + "data": [ + "report/report.xml", + "wizard/bank_reconciliation_report_wizard_view.xml", + "views/account_bank_statement.xml", + "views/account_move_line.xml", + "views/account_journal.xml", + ], + "installable": True, } diff --git a/account_bank_reconciliation_summary_xlsx/i18n/account_bank_reconciliation_summary_xlsx.pot b/account_bank_reconciliation_summary_xlsx/i18n/account_bank_reconciliation_summary_xlsx.pot new file mode 100644 index 00000000000..82ee8ec2649 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/i18n/account_bank_reconciliation_summary_xlsx.pot @@ -0,0 +1,226 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_bank_reconciliation_summary_xlsx +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "%s - %s - Bank Reconciliation" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.report,print_report_name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +msgid "'bank_reconciliation-%s' % (object.date)" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +msgid "Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Amount" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Balance %s:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__journal_ids +msgid "Bank Journals" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.act_window,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_action +#: model:ir.ui.menu,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_menu +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +msgid "Bank Reconciliation" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form +msgid "Bank Reconciliation Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_bank_reconciliation_report_wizard +msgid "Bank Reconciliation Report Wizard" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.report,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +msgid "Bank Reconciliation XLSX" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_report_bank_reconciliation_xlsx +msgid "Bank Reconciliation XLSX Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +msgid "Cancel" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Computed Bank Account Balance at the Bank:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Counter-part" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_uid +msgid "Created by" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_date +msgid "Created on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__date +#, python-format +msgid "Date" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Date:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__display_name +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__display_name +msgid "Display Name" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Draft bank statement lines:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +msgid "Export XLSX" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__id +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__id +msgid "ID" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Journal items of account %s not linked to a bank statement line:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Label" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard____last_update +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx____last_update +msgid "Last Modified on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_date +msgid "Last Updated on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Move Number" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "NONE" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "No Bank Journal" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "No bank journal selected. This report is only for bank journals." +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Partner" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Ref." +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_account_move_line__statement_line_date +#, python-format +msgid "Statement Line Date" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Statement Ref." +msgstr "" diff --git a/account_bank_reconciliation_summary_xlsx/i18n/fr.po b/account_bank_reconciliation_summary_xlsx/i18n/fr.po index e745e11e5b3..eb6688aed84 100644 --- a/account_bank_reconciliation_summary_xlsx/i18n/fr.po +++ b/account_bank_reconciliation_summary_xlsx/i18n/fr.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_bank_reconciliation_summary_xlsx +# * account_bank_reconciliation_summary_xlsx # msgid "" msgstr "" @@ -10,50 +10,55 @@ msgstr "" "PO-Revision-Date: 2018-12-04 10:29+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:70 -#, python-format -msgid "%s - Bank Reconciliation" +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, fuzzy, python-format +msgid "%s - %s - Bank Reconciliation" msgstr "%s - Rapprochement bancaire" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +#: model:ir.actions.report,print_report_name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +msgid "'bank_reconciliation-%s' % (object.date)" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view msgid "Report" msgstr "Rapport" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:129 -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:182 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Amount" msgstr "Montant" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:92 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Balance %s:" msgstr "Balance %s:" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_journal_ids +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__journal_ids msgid "Bank Journals" msgstr "Journaux de banque" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.act_window,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_action #: model:ir.ui.menu,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_menu -#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view msgid "Bank Reconciliation" msgstr "Rapprochement bancaire" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form -#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form msgid "Bank Reconciliation Report" msgstr "Rapport rapprochement bancaire" @@ -63,69 +68,76 @@ msgid "Bank Reconciliation Report Wizard" msgstr "Wizard raport rapprochement bancaire" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.actions.report.xml,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +#: model:ir.actions.report,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx msgid "Bank Reconciliation XLSX" msgstr "Rapprochement bancaire XLSX" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_report_bank_reconciliation_xlsx +#, fuzzy +msgid "Bank Reconciliation XLSX Report" +msgstr "Rapport rapprochement bancaire" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form msgid "Cancel" msgstr "Annuler" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:210 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Computed Bank Account Balance at the Bank:" msgstr "Solde théorique du compte bancaire :" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:130 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Counter-part" msgstr "Contre partie" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_create_uid +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_uid msgid "Created by" msgstr "Créé par" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_create_date +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_date msgid "Created on" msgstr "Créé le" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:181 -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_date +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__date #, python-format msgid "Date" msgstr "Date " #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:83 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Date:" msgstr "Date :" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_display_name +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__display_name +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__display_name msgid "Display Name" msgstr "Nom affiché" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:169 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Draft bank statement lines:" msgstr "Lignes non validées du relevé bancaire :" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form msgid "Export XLSX" msgstr "Export XLSX" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_id +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__id +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__id msgid "ID" msgstr "ID" @@ -135,82 +147,81 @@ msgid "Journal Item" msgstr "Écriture comptable" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:113 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Journal items of account %s not linked to a bank statement line:" -msgstr "Ecritures comptables du compte %s non liées à une ligne de relevé bancaire :" +msgstr "" +"Ecritures comptables du compte %s non liées à une ligne de relevé bancaire :" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:181 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Label" msgstr "Libellé" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard___last_update +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard____last_update +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx____last_update msgid "Last Modified on" msgstr "Dernière modification le" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_write_uid +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_uid msgid "Last Updated by" msgstr "Mis à jour par" #. module: account_bank_reconciliation_summary_xlsx -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard_write_date +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_date msgid "Last Updated on" msgstr "Mis à jour le" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:129 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Move Number" msgstr "Numéro de pièce" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:124 -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:177 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "NONE" msgstr "Rien" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:215 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "No Bank Journal" msgstr "Pas de journal de banque" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:220 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "No bank journal selected. This report is only for bank journals." -msgstr "Pas de journal de banque sélectionné. Ce rapport est uniquement pour les journaux de banque." +msgstr "" +"Pas de journal de banque sélectionné. Ce rapport est uniquement pour les " +"journaux de banque." #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:182 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Partner" msgstr "Partenaire" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:128 -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:181 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Ref." msgstr "Ref." #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:129 -#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_account_move_line_statement_line_date +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_account_move_line__statement_line_date #, python-format msgid "Statement Line Date" msgstr "Date ligne relevé" #. module: account_bank_reconciliation_summary_xlsx -#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:182 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Statement Ref." msgstr "Ref. relevé" - diff --git a/account_bank_reconciliation_summary_xlsx/models/account_move_line.py b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py index 32268385fb8..a38b26e72d4 100644 --- a/account_bank_reconciliation_summary_xlsx/models/account_move_line.py +++ b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py @@ -6,8 +6,8 @@ class AccountMoveLine(models.Model): - _inherit = 'account.move.line' + _inherit = "account.move.line" statement_line_date = fields.Date( - string='Statement Line Date', - related='statement_line_id.date', store=True) + string="Statement Line Date", related="statement_line_id.date", store=True + ) diff --git a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py index 833cdb999ae..acf24d1a8ba 100644 --- a/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py +++ b/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py @@ -6,71 +6,82 @@ class BankReconciliationXlsx(models.AbstractModel): - _name = 'report.bank.reconciliation.xlsx' - _description = 'Bank Reconciliation XLSX Report' - _inherit = 'report.report_xlsx.abstract' + _name = "report.bank.reconciliation.xlsx" + _description = "Bank Reconciliation XLSX Report" + _inherit = "report.report_xlsx.abstract" def _compute_account_balance(self, journal, date): bank_account = journal.default_debit_account_id - amount_field = 'balance' # TODO: add support for bank accounts in foreign currency # if not o.currency_id else 'amount_currency' query = """ - SELECT sum(%s) FROM account_move_line - WHERE account_id=%%s AND date <= %%s""" % (amount_field, ) + SELECT sum(balance) FROM account_move_line + WHERE account_id=%s AND date <= %s""" self.env.cr.execute(query, (bank_account.id, date)) query_results = self.env.cr.dictfetchall() if query_results: - account_bal = query_results[0].get('sum') or 0.0 + account_bal = query_results[0].get("sum") or 0.0 else: account_bal = 0.0 return account_bal def _prepare_move_lines(self, journal, date): bank_account = journal.default_debit_account_id - mlines = self.env['account.move.line'].search([ - ('account_id', '=', bank_account.id), - ('journal_id', '=', journal.id), # to avoid initial line - ('date', '<=', date), - '|', ('statement_line_date', '=', False), - ('statement_line_date', '>', date)]) + mlines = self.env["account.move.line"].search( + [ + ("account_id", "=", bank_account.id), + ("journal_id", "=", journal.id), # to avoid initial line + ("date", "<=", date), + "|", + ("statement_line_date", "=", False), + ("statement_line_date", ">", date), + ] + ) res = [] for mline in mlines: move = mline.move_id cpart = [] for line in move.line_ids: if ( - line.account_id != bank_account and - line.account_id.code not in cpart): + line.account_id != bank_account + and line.account_id.code not in cpart + ): cpart.append(line.account_id.code) - counterpart = ' ,'.join(cpart) - res.append({ - 'date': mline.date, - 'label': mline.name, - 'ref': mline.ref or '', - 'partner': mline.partner_id.display_name or '', - 'amount': mline.balance, - 'statement_line_date': mline.statement_line_date or '', - 'move_number': move.name, - 'counterpart': counterpart, - }) + counterpart = " ,".join(cpart) + res.append( + { + "date": mline.date, + "label": mline.name, + "ref": mline.ref or "", + "partner": mline.partner_id.display_name or "", + "amount": mline.balance, + "statement_line_date": mline.statement_line_date or "", + "move_number": move.name, + "counterpart": counterpart, + } + ) return res def _prepare_draft_statement_lines(self, journal, date): - blines = self.env['account.bank.statement.line'].search([ - ('journal_entry_ids', '=', False), - ('journal_id', '=', journal.id), - ('date', '<=', date)]) + blines = self.env["account.bank.statement.line"].search( + [ + ("journal_entry_ids", "=", False), + ("journal_id", "=", journal.id), + ("date", "<=", date), + ] + ) res = [] for bline in blines: - res.append({ - 'date': bline.date, - 'label': bline.name, - 'ref': bline.ref or '', - 'partner': bline.partner_id.display_name or '', - 'amount': bline.amount, - 'statement_ref': bline.statement_id.display_name, - }) + res.append( + { + "date": bline.date, + "label": bline.name, + "ref": bline.ref or "", + "partner": bline.partner_id.display_name or "", + "amount": bline.amount, + "statement_ref": bline.statement_id.display_name, + } + ) return res def generate_xlsx_report(self, workbook, data, wizard): @@ -83,57 +94,77 @@ def generate_xlsx_report(self, workbook, data, wizard): lang_code = self.env.user.lang lang = False if lang_code: - lang = self.env['res.lang'].search([('code', '=', lang_code)]) + lang = self.env["res.lang"].search([("code", "=", lang_code)]) if not lang: - lang = self.env['res.lang'].search([], limit=1) - xls_date_format = lang.date_format.replace('%Y', 'yyyy').\ - replace('%m', 'mm').replace('%d', 'dd').replace('%y', 'yy') + lang = self.env["res.lang"].search([], limit=1) + xls_date_format = ( + lang.date_format.replace("%Y", "yyyy") + .replace("%m", "mm") + .replace("%d", "dd") + .replace("%y", "yy") + ) - doc_title = workbook.add_format({'bold': True, 'font_size': 16}) - col_title = workbook.add_format({ - 'bold': True, 'bg_color': '#e2e2fa', - 'text_wrap': True, 'font_size': 10, - }) - title_right = workbook.add_format({ - 'bold': True, 'bg_color': '#e6e6fa', - 'font_size': 10, 'align': 'right', - }) - title_date = workbook.add_format({ - 'bg_color': '#f6f6ff', 'bold': True, - 'num_format': xls_date_format, - 'font_size': 10, - 'align': 'left'}) - label_bold = workbook.add_format({ - 'bold': True, 'text_wrap': False, 'font_size': 10}) - none = workbook.add_format({ - 'bold': True, 'font_size': 10, 'align': 'right'}) - regular = workbook.add_format({'font_size': 10}) - if '%' in xls_date_format: + doc_title = workbook.add_format({"bold": True, "font_size": 16}) + col_title = workbook.add_format( + { + "bold": True, + "bg_color": "#e2e2fa", + "text_wrap": True, + "font_size": 10, + } + ) + title_right = workbook.add_format( + { + "bold": True, + "bg_color": "#e6e6fa", + "font_size": 10, + "align": "right", + } + ) + title_date = workbook.add_format( + { + "bg_color": "#f6f6ff", + "bold": True, + "num_format": xls_date_format, + "font_size": 10, + "align": "left", + } + ) + label_bold = workbook.add_format( + {"bold": True, "text_wrap": False, "font_size": 10} + ) + none = workbook.add_format( + {"bold": True, "font_size": 10, "align": "right"} + ) + regular = workbook.add_format({"font_size": 10}) + if "%" in xls_date_format: # fallback - xls_date_format = 'yyyy-mm-dd' - regular_date = workbook.add_format({ - 'num_format': xls_date_format, - 'font_size': 10, - 'align': 'left'}) - cur_format = u'#,##0.00 %s' % ( - o.company_id.currency_id.symbol or - o.company_id.currency_id.name) + xls_date_format = "yyyy-mm-dd" + regular_date = workbook.add_format( + {"num_format": xls_date_format, "font_size": 10, "align": "left"} + ) + cur_format = u"#,##0.00 %s" % ( + o.company_id.currency_id.symbol or o.company_id.currency_id.name + ) # It seems that Excel replaces automatically the decimal # and thousand separator by those of the language under which # Excel runs regular_currency = workbook.add_format( - {'num_format': cur_format, 'font_size': 10}) - regular_currency_bg = workbook.add_format({ - 'num_format': cur_format, 'font_size': 10, - 'bg_color': '#f6f6ff'}) + {"num_format": cur_format, "font_size": 10} + ) + regular_currency_bg = workbook.add_format( + {"num_format": cur_format, "font_size": 10, "bg_color": "#f6f6ff"} + ) # End styles sheet = workbook.add_worksheet(o.code or o.name) sheet.write( - 0, 0, - _('%s - %s - Bank Reconciliation') % ( - o.company_id.name, o.display_name), - doc_title) + 0, + 0, + _("%s - %s - Bank Reconciliation") + % (o.company_id.name, o.display_name), + doc_title, + ) sheet.set_row(0, 26) sheet.set_row(1, 25) sheet.set_column(0, 0, 10) @@ -151,32 +182,38 @@ def generate_xlsx_report(self, workbook, data, wizard): row += 2 bank_account = o.default_debit_account_id for col in range(3): - sheet.write(row, col, '', title_right) - sheet.write( - row, 3, - _('Balance %s:') % bank_account.code, title_right) + sheet.write(row, col, "", title_right) + sheet.write(row, 3, _("Balance %s:") % bank_account.code, title_right) account_bal = self._compute_account_balance(o, date) sheet.write(row, 4, account_bal, regular_currency_bg) bank_bal = account_bal - formula = '=E%d' % (row + 1) + formula = "=E%d" % (row + 1) # 2) Show account move line that are not linked to bank statement # line or linked to a statement line after the date row += 2 sheet.write( - row, 0, _( - 'Journal items of account %s not linked to a bank ' - 'statement line:') % bank_account.code, - label_bold) + row, + 0, + _("Journal items of account %s not linked to a bank " "statement line:") + % bank_account.code, + label_bold, + ) mlines = self._prepare_move_lines(o, date) if not mlines: - sheet.write(row, 4, _('NONE'), none) + sheet.write(row, 4, _("NONE"), none) else: row += 1 col_labels = [ - _('Date'), _('Label'), _('Ref.'), _('Partner'), - _('Amount'), _('Statement Line Date'), _('Move Number'), - _('Counter-part')] + _("Date"), + _("Label"), + _("Ref."), + _("Partner"), + _("Amount"), + _("Statement Line Date"), + _("Move Number"), + _("Counter-part"), + ] col = 0 for col_label in col_labels: sheet.write(row, col, col_label, col_title) @@ -185,33 +222,36 @@ def generate_xlsx_report(self, workbook, data, wizard): for mline in mlines: row += 1 m_end_row = row - bank_bal -= mline['amount'] - sheet.write(row, 0, mline['date'], regular_date) - sheet.write(row, 1, mline['label'], regular) - sheet.write(row, 2, mline['ref'], regular) - sheet.write(row, 3, mline['partner'], regular) - sheet.write(row, 4, mline['amount'], regular_currency) - sheet.write( - row, 5, mline['statement_line_date'], regular_date) - sheet.write(row, 6, mline['move_number'], regular) - sheet.write(row, 7, mline['counterpart'], regular) + bank_bal -= mline["amount"] + sheet.write(row, 0, mline["date"], regular_date) + sheet.write(row, 1, mline["label"], regular) + sheet.write(row, 2, mline["ref"], regular) + sheet.write(row, 3, mline["partner"], regular) + sheet.write(row, 4, mline["amount"], regular_currency) + sheet.write(row, 5, mline["statement_line_date"], regular_date) + sheet.write(row, 6, mline["move_number"], regular) + sheet.write(row, 7, mline["counterpart"], regular) - formula += '-SUM(E%d:E%d)' % (m_start_row + 1, m_end_row + 1) + formula += "-SUM(E%d:E%d)" % (m_start_row + 1, m_end_row + 1) # 3) Add draft bank statement lines row += 2 # skip 1 line - sheet.write( - row, 0, _( - 'Draft bank statement lines:'), - label_bold) + sheet.write(row, 0, _("Draft bank statement lines:"), label_bold) blines = self._prepare_draft_statement_lines(o, date) if not blines: - sheet.write(row, 4, _('NONE'), none) + sheet.write(row, 4, _("NONE"), none) else: row += 1 col_labels = [ - _('Date'), _('Label'), _('Ref.'), - _('Partner'), _('Amount'), _('Statement Ref.'), '', ''] + _("Date"), + _("Label"), + _("Ref."), + _("Partner"), + _("Amount"), + _("Statement Ref."), + "", + "", + ] col = 0 for col_label in col_labels: sheet.write(row, col, col_label, col_title) @@ -220,31 +260,35 @@ def generate_xlsx_report(self, workbook, data, wizard): for bline in blines: row += 1 b_end_row = row - bank_bal += bline['amount'] - sheet.write(row, 0, bline['date'], regular_date) - sheet.write(row, 1, bline['label'], regular) - sheet.write(row, 2, bline['ref'], regular) - sheet.write(row, 3, bline['partner'], regular) - sheet.write(row, 4, bline['amount'], regular_currency) - sheet.write( - row, 5, bline['statement_ref'], regular_currency) - formula += '+SUM(E%d:E%d)' % (b_start_row + 1, b_end_row + 1) + bank_bal += bline["amount"] + sheet.write(row, 0, bline["date"], regular_date) + sheet.write(row, 1, bline["label"], regular) + sheet.write(row, 2, bline["ref"], regular) + sheet.write(row, 3, bline["partner"], regular) + sheet.write(row, 4, bline["amount"], regular_currency) + sheet.write(row, 5, bline["statement_ref"], regular_currency) + formula += "+SUM(E%d:E%d)" % (b_start_row + 1, b_end_row + 1) # 4) Theoric bank account balance at the bank row += 2 for col in range(3): - sheet.write(row, col, '', title_right) + sheet.write(row, col, "", title_right) sheet.write( - row, 3, _('Computed Bank Account Balance at the Bank:'), - title_right) - sheet.write_formula( - row, 4, formula, regular_currency_bg, bank_bal) + row, 3, _("Computed Bank Account Balance at the Bank:"), title_right + ) + sheet.write_formula(row, 4, formula, regular_currency_bg, bank_bal) if no_bank_journal: - sheet = workbook.add_worksheet(_('No Bank Journal')) + sheet = workbook.add_worksheet(_("No Bank Journal")) sheet.set_row(0, 30) warn_msg = workbook.add_format( - {'bold': True, 'font_size': 16, 'font_color': '#003b6f'}) + {"bold": True, "font_size": 16, "font_color": "#003b6f"} + ) sheet.write( - 0, 0, _( + 0, + 0, + _( "No bank journal selected. " - "This report is only for bank journals."), warn_msg) + "This report is only for bank journals." + ), + warn_msg, + ) diff --git a/account_bank_reconciliation_summary_xlsx/report/report.xml b/account_bank_reconciliation_summary_xlsx/report/report.xml index c7a9ce257be..25c2e8de6d3 100644 --- a/account_bank_reconciliation_summary_xlsx/report/report.xml +++ b/account_bank_reconciliation_summary_xlsx/report/report.xml @@ -1,21 +1,18 @@ - + - - - + - diff --git a/account_bank_reconciliation_summary_xlsx/static/description/icon.png b/account_bank_reconciliation_summary_xlsx/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_bank_reconciliation_summary_xlsx/static/description/index.html b/account_bank_reconciliation_summary_xlsx/static/description/index.html new file mode 100644 index 00000000000..ee0ef2d8285 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/static/description/index.html @@ -0,0 +1,441 @@ + + + + + + +Bank Reconciliation Report + + + +
+

Bank Reconciliation Report

+ + +

Beta License: AGPL-3 OCA/account-financial-reporting Translate me on Weblate Try me on Runbot

+

This module adds a Bank Reconciliation Report in Odoo in XLSX format. For each bank journal, the report displays:

+
    +
  1. The balance of the bank account in the accounting,
    2. +
  2. The list of journal items of the bank account not linked to any bank statement lines,
    3. +
  3. The list of draft bank statement lines not linked to any journal items,
    4. +
  4. The computed balance of the bank account at the bank.
    5. +
+

The last field (computed balance of the bank account at the bank) must be compared to the real bank account balance at the bank. If there is a difference, you need to find the error in the accounting. The field Computed balance of the bank account at the bank is a formula, so you can easily change its computation to try to find the difference with the real bank account balance at the bank.

+

Table of contents

+ +
+

Configuration

+

This module doesn’t require any configuration.

+
+
+

Usage

+

You can launch the Bank Reconciliation Report wizard from:

+
    +
  • the menu Invoicing > Reporting > OCA accounting reports > Bank Reconciliation,
    • +
  • the form view of a bank statement: click on the button Bank Reconciliation Report,
    • +
  • the invoicing dashboard: on a bank journal, click on the options, then select Bank Reconciliation.
    • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/account-financial-reporting project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml index 9b57a3ae3ea..377e80eebcf 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml @@ -1,24 +1,23 @@ - + - - - - - bank_rec_summary.account.bank.statement.form - account.bank.statement - - - - - - - + + bank_rec_summary.account.bank.statement.form + account.bank.statement + + + + + diff --git a/account_bank_reconciliation_summary_xlsx/views/account_journal.xml b/account_bank_reconciliation_summary_xlsx/views/account_journal.xml index 5340adb2073..6d4b9677d97 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_journal.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_journal.xml @@ -1,32 +1,32 @@ - + - - - - - bank_reconciliation_summarry.account_journal_dashboard - account.journal - - - -
-
- Report + + + bank_reconciliation_summarry.account_journal_dashboard + account.journal + + + +
+
+ Report +
+
- -
- - - - - + + + diff --git a/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml b/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml index 0afd4b68aa0..da8eec8abe0 100644 --- a/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml +++ b/account_bank_reconciliation_summary_xlsx/views/account_move_line.xml @@ -1,23 +1,18 @@ - + - - - - - bank_rec_summary.account_move_line_form - account.move.line - - - - + + bank_rec_summary.account_move_line_form + account.move.line + + + + + - - - - + diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py index 591d0c32a43..b469f8a552b 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard.py @@ -11,24 +11,27 @@ class BankReconciliationReportWizard(models.TransientModel): @api.model def _default_journal_ids(self): - journals = self.env['account.journal'].search([ - ('type', '=', 'bank'), - ('bank_account_id', '!=', False), - ('company_id', '=', self.env.user.company_id.id), - ]) + journals = self.env["account.journal"].search( + [ + ("type", "=", "bank"), + ("bank_account_id", "!=", False), + ("company_id", "=", self.env.user.company_id.id), + ] + ) return journals - date = fields.Date( - required=True, - default=fields.Date.context_today) + date = fields.Date(required=True, default=fields.Date.context_today) journal_ids = fields.Many2many( - 'account.journal', string='Bank Journals', - domain=[('type', '=', 'bank')], required=True, - default=lambda self: self._default_journal_ids()) + "account.journal", + string="Bank Journals", + domain=[("type", "=", "bank")], + required=True, + default=lambda self: self._default_journal_ids(), + ) def open_xlsx(self): report = self.env.ref( - 'account_bank_reconciliation_summary_xlsx.' - 'bank_reconciliation_xlsx') + "account_bank_reconciliation_summary_xlsx." "bank_reconciliation_xlsx" + ) action = report.report_action(self) return action diff --git a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml index 692c2c46c47..caba845e593 100644 --- a/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml +++ b/account_bank_reconciliation_summary_xlsx/wizard/bank_reconciliation_report_wizard_view.xml @@ -1,42 +1,42 @@ - + - - - - - bank.reconciliation.report.wizard.form - bank.reconciliation.report.wizard - -
- - - - -
-
-
- - - - - Bank Reconciliation - bank.reconciliation.report.wizard - form - new - - - + bank.reconciliation.report.wizard.form + bank.reconciliation.report.wizard + +
+ + + + +
+
+
+ + + + Bank Reconciliation + bank.reconciliation.report.wizard + form + new + + - - + sequence="100" + /> From ef474ef63751bb5bf0275c0ea10043b74b83af37 Mon Sep 17 00:00:00 2001 From: jabelchi Date: Mon, 2 May 2022 08:52:40 +0000 Subject: [PATCH 15/24] Added translation using Weblate (Catalan) --- .../i18n/ca.po | 227 ++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 account_bank_reconciliation_summary_xlsx/i18n/ca.po diff --git a/account_bank_reconciliation_summary_xlsx/i18n/ca.po b/account_bank_reconciliation_summary_xlsx/i18n/ca.po new file mode 100644 index 00000000000..e47a3b95e2d --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/i18n/ca.po @@ -0,0 +1,227 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_bank_reconciliation_summary_xlsx +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "%s - %s - Bank Reconciliation" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.report,print_report_name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +msgid "'bank_reconciliation-%s' % (object.date)" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +msgid "Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Amount" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Balance %s:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__journal_ids +msgid "Bank Journals" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.act_window,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_action +#: model:ir.ui.menu,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_menu +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +msgid "Bank Reconciliation" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form +msgid "Bank Reconciliation Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_bank_reconciliation_report_wizard +msgid "Bank Reconciliation Report Wizard" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.report,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +msgid "Bank Reconciliation XLSX" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_report_bank_reconciliation_xlsx +msgid "Bank Reconciliation XLSX Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +msgid "Cancel" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Computed Bank Account Balance at the Bank:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Counter-part" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_uid +msgid "Created by" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_date +msgid "Created on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__date +#, python-format +msgid "Date" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Date:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__display_name +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__display_name +msgid "Display Name" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Draft bank statement lines:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +msgid "Export XLSX" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__id +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__id +msgid "ID" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Journal items of account %s not linked to a bank statement line:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Label" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard____last_update +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx____last_update +msgid "Last Modified on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_date +msgid "Last Updated on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Move Number" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "NONE" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "No Bank Journal" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "No bank journal selected. This report is only for bank journals." +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Partner" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Ref." +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_account_move_line__statement_line_date +#, python-format +msgid "Statement Line Date" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Statement Ref." +msgstr "" From 3482fa89cf60dac59c9d498b8ce8ca2eb5660c26 Mon Sep 17 00:00:00 2001 From: jabelchi Date: Mon, 2 May 2022 09:01:24 +0000 Subject: [PATCH 16/24] Translated using Weblate (Catalan) Currently translated at 94.4% (34 of 36 strings) Translation: account-financial-reporting-13.0/account-financial-reporting-13.0-account_bank_reconciliation_summary_xlsx Translate-URL: https://translation.odoo-community.org/projects/account-financial-reporting-13-0/account-financial-reporting-13-0-account_bank_reconciliation_summary_xlsx/ca/ --- .../i18n/ca.po | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/i18n/ca.po b/account_bank_reconciliation_summary_xlsx/i18n/ca.po index e47a3b95e2d..d72bafda6db 100644 --- a/account_bank_reconciliation_summary_xlsx/i18n/ca.po +++ b/account_bank_reconciliation_summary_xlsx/i18n/ca.po @@ -6,19 +6,21 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2022-05-02 11:05+0000\n" +"Last-Translator: jabelchi \n" "Language-Team: none\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "%s - %s - Bank Reconciliation" -msgstr "" +msgstr "%s - %s - Conciliació bancària" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.report,print_report_name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx @@ -28,80 +30,80 @@ msgstr "" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view msgid "Report" -msgstr "" +msgstr "Informe" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Amount" -msgstr "" +msgstr "Import" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Balance %s:" -msgstr "" +msgstr "Saldo %s:" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__journal_ids msgid "Bank Journals" -msgstr "" +msgstr "Diaris bancaris" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.act_window,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_action #: model:ir.ui.menu,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_menu #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view msgid "Bank Reconciliation" -msgstr "" +msgstr "Conciliació bancària" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form msgid "Bank Reconciliation Report" -msgstr "" +msgstr "Informe de conciliació bancària" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_bank_reconciliation_report_wizard msgid "Bank Reconciliation Report Wizard" -msgstr "" +msgstr "Informe de l'assistent de conciliació bancària" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.report,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx msgid "Bank Reconciliation XLSX" -msgstr "" +msgstr "Conciliació bancària XLSX" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_report_bank_reconciliation_xlsx msgid "Bank Reconciliation XLSX Report" -msgstr "" +msgstr "Informe XLSX conciliació bancària" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form msgid "Cancel" -msgstr "" +msgstr "Cancela" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Computed Bank Account Balance at the Bank:" -msgstr "" +msgstr "Saldo calculat del compte del banc:" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Counter-part" -msgstr "" +msgstr "Contrapartida" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_uid msgid "Created by" -msgstr "" +msgstr "Creat per" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_date msgid "Created on" -msgstr "" +msgstr "Creat el" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 @@ -109,76 +111,77 @@ msgstr "" #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__date #, python-format msgid "Date" -msgstr "" +msgstr "Data" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Date:" -msgstr "" +msgstr "Data:" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__display_name #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__display_name msgid "Display Name" -msgstr "" +msgstr "Nom a mostrar" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Draft bank statement lines:" -msgstr "" +msgstr "Línies no validades de l'extracte bancari:" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form msgid "Export XLSX" -msgstr "" +msgstr "Exportat XLSX" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__id #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__id msgid "ID" -msgstr "" +msgstr "ID" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_account_move_line msgid "Journal Item" -msgstr "" +msgstr "Apunt comptable" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Journal items of account %s not linked to a bank statement line:" msgstr "" +"Apunts comptables del compte %s no enllaçades a una línia d'extracte bancari:" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Label" -msgstr "" +msgstr "Etiqueta" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard____last_update #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx____last_update msgid "Last Modified on" -msgstr "" +msgstr "Darrera modificació el" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Darreta actualització per" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_date msgid "Last Updated on" -msgstr "" +msgstr "Darrera actualització el" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Move Number" -msgstr "" +msgstr "Número de moviment" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 @@ -191,37 +194,39 @@ msgstr "" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "No Bank Journal" -msgstr "" +msgstr "Sense diari bancari" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "No bank journal selected. This report is only for bank journals." msgstr "" +"No s'ha seleccionat diari bancari. Aquest informe només és per diaris " +"bancaris." #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Partner" -msgstr "" +msgstr "Partner" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Ref." -msgstr "" +msgstr "Ref." #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_account_move_line__statement_line_date #, python-format msgid "Statement Line Date" -msgstr "" +msgstr "Data de la línia de l'extracte" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Statement Ref." -msgstr "" +msgstr "Referència de l'extracte" From 6e8cbc088fe849fbf7111564e3031a63e7b62994 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 1 Aug 2022 18:54:20 +0200 Subject: [PATCH 17/24] [FIX] inconsistent string format in account_bank_reconciliation_summary_xlsx in i18n/fr.po As a result, Odoo was crashing (with an empty stacktrace ?) when triggering the export --- account_bank_reconciliation_summary_xlsx/__manifest__.py | 2 +- account_bank_reconciliation_summary_xlsx/i18n/fr.po | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index 1534d503cd9..bdef91e7af1 100644 --- a/account_bank_reconciliation_summary_xlsx/__manifest__.py +++ b/account_bank_reconciliation_summary_xlsx/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Bank Reconciliation Report", - "version": "13.0.1.0.0", + "version": "13.0.1.0.1", "license": "AGPL-3", "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-financial-reporting", diff --git a/account_bank_reconciliation_summary_xlsx/i18n/fr.po b/account_bank_reconciliation_summary_xlsx/i18n/fr.po index eb6688aed84..690277d069e 100644 --- a/account_bank_reconciliation_summary_xlsx/i18n/fr.po +++ b/account_bank_reconciliation_summary_xlsx/i18n/fr.po @@ -18,9 +18,8 @@ msgstr "" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 -#, fuzzy, python-format msgid "%s - %s - Bank Reconciliation" -msgstr "%s - Rapprochement bancaire" +msgstr "%s - %s - Rapprochement bancaire" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.report,print_report_name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx From 0337c03d8ba82c63fd0e69818e04baf83ffe1b76 Mon Sep 17 00:00:00 2001 From: "Luis D. Lafaurie" Date: Thu, 11 Aug 2022 16:12:26 +0000 Subject: [PATCH 18/24] Added translation using Weblate (Spanish) --- .../i18n/es.po | 227 ++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 account_bank_reconciliation_summary_xlsx/i18n/es.po diff --git a/account_bank_reconciliation_summary_xlsx/i18n/es.po b/account_bank_reconciliation_summary_xlsx/i18n/es.po new file mode 100644 index 00000000000..90f1580fad9 --- /dev/null +++ b/account_bank_reconciliation_summary_xlsx/i18n/es.po @@ -0,0 +1,227 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_bank_reconciliation_summary_xlsx +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "%s - %s - Bank Reconciliation" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.report,print_report_name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +msgid "'bank_reconciliation-%s' % (object.date)" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +msgid "Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Amount" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Balance %s:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__journal_ids +msgid "Bank Journals" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.act_window,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_action +#: model:ir.ui.menu,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_menu +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view +msgid "Bank Reconciliation" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form +msgid "Bank Reconciliation Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_bank_reconciliation_report_wizard +msgid "Bank Reconciliation Report Wizard" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.actions.report,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx +msgid "Bank Reconciliation XLSX" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_report_bank_reconciliation_xlsx +msgid "Bank Reconciliation XLSX Report" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +msgid "Cancel" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Computed Bank Account Balance at the Bank:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Counter-part" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_uid +msgid "Created by" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_date +msgid "Created on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__date +#, python-format +msgid "Date" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Date:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__display_name +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__display_name +msgid "Display Name" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Draft bank statement lines:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form +msgid "Export XLSX" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__id +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__id +msgid "ID" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Journal items of account %s not linked to a bank statement line:" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Label" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard____last_update +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx____last_update +msgid "Last Modified on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_date +msgid "Last Updated on" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Move Number" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "NONE" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "No Bank Journal" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "No bank journal selected. This report is only for bank journals." +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Partner" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Ref." +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_account_move_line__statement_line_date +#, python-format +msgid "Statement Line Date" +msgstr "" + +#. module: account_bank_reconciliation_summary_xlsx +#: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 +#, python-format +msgid "Statement Ref." +msgstr "" From 0e8247601c97b1bee93431303f2c9e36112f2c8d Mon Sep 17 00:00:00 2001 From: "Luis D. Lafaurie" Date: Thu, 11 Aug 2022 16:35:18 +0000 Subject: [PATCH 19/24] Translated using Weblate (Spanish) Currently translated at 94.4% (34 of 36 strings) Translation: account-financial-reporting-13.0/account-financial-reporting-13.0-account_bank_reconciliation_summary_xlsx Translate-URL: https://translation.odoo-community.org/projects/account-financial-reporting-13-0/account-financial-reporting-13-0-account_bank_reconciliation_summary_xlsx/es/ --- .../i18n/es.po | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/i18n/es.po b/account_bank_reconciliation_summary_xlsx/i18n/es.po index 90f1580fad9..82263090c7b 100644 --- a/account_bank_reconciliation_summary_xlsx/i18n/es.po +++ b/account_bank_reconciliation_summary_xlsx/i18n/es.po @@ -6,102 +6,104 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2022-08-11 19:07+0000\n" +"Last-Translator: Luis D. Lafaurie \n" "Language-Team: none\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "%s - %s - Bank Reconciliation" -msgstr "" +msgstr "%s - %s - Conciliación bancaria" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.report,print_report_name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx msgid "'bank_reconciliation-%s' % (object.date)" -msgstr "" +msgstr "'bank_reconciliation-%s' % (object.date)" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view msgid "Report" -msgstr "" +msgstr "Informe" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Amount" -msgstr "" +msgstr "Importe" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Balance %s:" -msgstr "" +msgstr "Saldo %s:" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__journal_ids msgid "Bank Journals" -msgstr "" +msgstr "Diarios de banco" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.act_window,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_action #: model:ir.ui.menu,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_menu #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view msgid "Bank Reconciliation" -msgstr "" +msgstr "Conciliación bancaria" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.view_bank_statement_form msgid "Bank Reconciliation Report" -msgstr "" +msgstr "Informe de conciliación bancaria" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_bank_reconciliation_report_wizard msgid "Bank Reconciliation Report Wizard" -msgstr "" +msgstr "Asistente para informe de conciliación bancaria" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.report,name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx msgid "Bank Reconciliation XLSX" -msgstr "" +msgstr "Conciliación bancaria XLSX" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_report_bank_reconciliation_xlsx msgid "Bank Reconciliation XLSX Report" -msgstr "" +msgstr "Informe de conciliación bancaria XLSX" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form msgid "Cancel" -msgstr "" +msgstr "Cancelar" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Computed Bank Account Balance at the Bank:" -msgstr "" +msgstr "Saldo en cuenta bancaria calculado por el banco:" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Counter-part" -msgstr "" +msgstr "Contra-partida" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_uid msgid "Created by" -msgstr "" +msgstr "Creado por" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__create_date msgid "Created on" -msgstr "" +msgstr "Creado el" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 @@ -109,19 +111,19 @@ msgstr "" #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__date #, python-format msgid "Date" -msgstr "" +msgstr "Fecha" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Date:" -msgstr "" +msgstr "Fecha:" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__display_name #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__display_name msgid "Display Name" -msgstr "" +msgstr "Nombre mostrado" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 @@ -132,47 +134,49 @@ msgstr "" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form msgid "Export XLSX" -msgstr "" +msgstr "Exportar XLSX" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__id #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx__id msgid "ID" -msgstr "" +msgstr "ID" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model,name:account_bank_reconciliation_summary_xlsx.model_account_move_line msgid "Journal Item" -msgstr "" +msgstr "Apunte contable" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Journal items of account %s not linked to a bank statement line:" msgstr "" +"Apuntes contables de la cuenta %s no asociados a alguna línea del extracto " +"bancario:" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Label" -msgstr "" +msgstr "Etiqueta" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard____last_update #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_report_bank_reconciliation_xlsx____last_update msgid "Last Modified on" -msgstr "" +msgstr "Modificado el" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Actualizado por" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_bank_reconciliation_report_wizard__write_date msgid "Last Updated on" -msgstr "" +msgstr "Actualizado el" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 @@ -185,43 +189,44 @@ msgstr "" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "NONE" -msgstr "" +msgstr "NINGUNO" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "No Bank Journal" -msgstr "" +msgstr "Sin diario de banco" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "No bank journal selected. This report is only for bank journals." msgstr "" +"Sin diario de banco seleccionado. Este informe es solo para diarios de banco." #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Partner" -msgstr "" +msgstr "Empresa" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Ref." -msgstr "" +msgstr "Ref." #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #: model:ir.model.fields,field_description:account_bank_reconciliation_summary_xlsx.field_account_move_line__statement_line_date #, python-format msgid "Statement Line Date" -msgstr "" +msgstr "Fecha de la línea del extracto" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Statement Ref." -msgstr "" +msgstr "Ref. del extracto" From 263f713db251cc6dcddbb7efd2d62463d52002dd Mon Sep 17 00:00:00 2001 From: "Luis D. Lafaurie" Date: Fri, 12 Aug 2022 15:30:01 +0000 Subject: [PATCH 20/24] Translated using Weblate (Spanish) Currently translated at 100.0% (36 of 36 strings) Translation: account-financial-reporting-13.0/account-financial-reporting-13.0-account_bank_reconciliation_summary_xlsx Translate-URL: https://translation.odoo-community.org/projects/account-financial-reporting-13-0/account-financial-reporting-13-0-account_bank_reconciliation_summary_xlsx/es/ --- account_bank_reconciliation_summary_xlsx/i18n/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/i18n/es.po b/account_bank_reconciliation_summary_xlsx/i18n/es.po index 82263090c7b..2ba3b58ca47 100644 --- a/account_bank_reconciliation_summary_xlsx/i18n/es.po +++ b/account_bank_reconciliation_summary_xlsx/i18n/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2022-08-11 19:07+0000\n" +"PO-Revision-Date: 2022-08-12 18:07+0000\n" "Last-Translator: Luis D. Lafaurie \n" "Language-Team: none\n" "Language: es\n" @@ -129,7 +129,7 @@ msgstr "Nombre mostrado" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Draft bank statement lines:" -msgstr "" +msgstr "Borrador de líneas del extracto bancario:" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.bank_reconciliation_report_wizard_form @@ -182,7 +182,7 @@ msgstr "Actualizado el" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "Move Number" -msgstr "" +msgstr "Número del movimiento" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 From 4e2b0a31681340ec077a1ff34b6944477e222f53 Mon Sep 17 00:00:00 2001 From: pere-aquarian Date: Fri, 30 Sep 2022 22:31:45 +0000 Subject: [PATCH 21/24] Translated using Weblate (Catalan) Currently translated at 100.0% (36 of 36 strings) Translation: account-financial-reporting-13.0/account-financial-reporting-13.0-account_bank_reconciliation_summary_xlsx Translate-URL: https://translation.odoo-community.org/projects/account-financial-reporting-13-0/account-financial-reporting-13-0-account_bank_reconciliation_summary_xlsx/ca/ --- .../README.rst | 15 ++++--- .../i18n/ca.po | 8 ++-- .../static/description/index.html | 42 ++++++++++--------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/account_bank_reconciliation_summary_xlsx/README.rst b/account_bank_reconciliation_summary_xlsx/README.rst index 2e10403b5df..cef99847e84 100644 --- a/account_bank_reconciliation_summary_xlsx/README.rst +++ b/account_bank_reconciliation_summary_xlsx/README.rst @@ -2,10 +2,13 @@ Bank Reconciliation Report ========================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:1fa0fb10ebc3b655f25d3b94ebc3dd12bb866ffffd030f72c525562c3cfaa9fa + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -19,11 +22,11 @@ Bank Reconciliation Report .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/account-financial-reporting-13-0/account-financial-reporting-13-0-account_bank_reconciliation_summary_xlsx :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/91/13.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=13.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module adds a Bank Reconciliation Report in Odoo in XLSX format. For each bank journal, the report displays: @@ -58,7 +61,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed +If you spotted it first, help us to smash it by providing a detailed and welcomed `feedback `_. Do not contact contributors directly about support or help with technical issues. diff --git a/account_bank_reconciliation_summary_xlsx/i18n/ca.po b/account_bank_reconciliation_summary_xlsx/i18n/ca.po index d72bafda6db..a4a9ce58d43 100644 --- a/account_bank_reconciliation_summary_xlsx/i18n/ca.po +++ b/account_bank_reconciliation_summary_xlsx/i18n/ca.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2022-05-02 11:05+0000\n" -"Last-Translator: jabelchi \n" +"PO-Revision-Date: 2022-10-01 01:07+0000\n" +"Last-Translator: pere-aquarian \n" "Language-Team: none\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "%s - %s - Conciliació bancària" #. module: account_bank_reconciliation_summary_xlsx #: model:ir.actions.report,print_report_name:account_bank_reconciliation_summary_xlsx.bank_reconciliation_xlsx msgid "'bank_reconciliation-%s' % (object.date)" -msgstr "" +msgstr "'bank_reconciliation-%s' % (object.date)" #. module: account_bank_reconciliation_summary_xlsx #: model_terms:ir.ui.view,arch_db:account_bank_reconciliation_summary_xlsx.account_journal_dashboard_kanban_view @@ -188,7 +188,7 @@ msgstr "Número de moviment" #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 #, python-format msgid "NONE" -msgstr "" +msgstr "Cap" #. module: account_bank_reconciliation_summary_xlsx #: code:addons/account_bank_reconciliation_summary_xlsx/report/bank_reconciliation_xlsx.py:0 diff --git a/account_bank_reconciliation_summary_xlsx/static/description/index.html b/account_bank_reconciliation_summary_xlsx/static/description/index.html index ee0ef2d8285..6ecf6fc97f4 100644 --- a/account_bank_reconciliation_summary_xlsx/static/description/index.html +++ b/account_bank_reconciliation_summary_xlsx/static/description/index.html @@ -1,20 +1,20 @@ - + - + Bank Reconciliation Report