From 1e9b385cd0a7c133cb017abc015e51e135865889 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 7 Jun 2020 15:58:33 +0200 Subject: [PATCH] account_bank_reconciliation_summary_xlsx: black, isort, etc. --- .../__manifest__.py | 30 +- .../models/account_move_line.py | 6 +- .../report/bank_reconciliation_xlsx.py | 298 ++++++++++-------- .../report/report.xml | 23 +- .../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 ++-- .../account_bank_reconciliation_summary_xlsx | 1 + .../setup.py | 6 + 11 files changed, 304 insertions(+), 259 deletions(-) create mode 120000 setup/account_bank_reconciliation_summary_xlsx/odoo/addons/account_bank_reconciliation_summary_xlsx create mode 100644 setup/account_bank_reconciliation_summary_xlsx/setup.py diff --git a/account_bank_reconciliation_summary_xlsx/__manifest__.py b/account_bank_reconciliation_summary_xlsx/__manifest__.py index 69f71bed..1534d503 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/models/account_move_line.py b/account_bank_reconciliation_summary_xlsx/models/account_move_line.py index 32268385..a38b26e7 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 @@ from odoo import fields, models 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 833cdb99..acf24d1a 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 @@ from odoo import _, fields, models 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 @@ class BankReconciliationXlsx(models.AbstractModel): 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 @@ class BankReconciliationXlsx(models.AbstractModel): 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 @@ class BankReconciliationXlsx(models.AbstractModel): 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 @@ class BankReconciliationXlsx(models.AbstractModel): 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 c7a9ce25..25c2e8de 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/views/account_bank_statement.xml b/account_bank_reconciliation_summary_xlsx/views/account_bank_statement.xml index 9b57a3ae..377e80ee 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 5340adb2..6d4b9677 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 0afd4b68..da8eec8a 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 591d0c32..b469f8a5 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 692c2c46..caba845e 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" + /> diff --git a/setup/account_bank_reconciliation_summary_xlsx/odoo/addons/account_bank_reconciliation_summary_xlsx b/setup/account_bank_reconciliation_summary_xlsx/odoo/addons/account_bank_reconciliation_summary_xlsx new file mode 120000 index 00000000..aa51326d --- /dev/null +++ b/setup/account_bank_reconciliation_summary_xlsx/odoo/addons/account_bank_reconciliation_summary_xlsx @@ -0,0 +1 @@ +../../../../account_bank_reconciliation_summary_xlsx \ No newline at end of file diff --git a/setup/account_bank_reconciliation_summary_xlsx/setup.py b/setup/account_bank_reconciliation_summary_xlsx/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_bank_reconciliation_summary_xlsx/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)