From b5203ec65b416297f8e3063febce8cfb629670f4 Mon Sep 17 00:00:00 2001 From: mymage Date: Sat, 28 Sep 2024 14:40:23 +0000 Subject: [PATCH] [FIX]l10n_it_central_journal_reportlab: formatting and partner logic Fixed grouped formatting (moved values under correct columns, shifted to the right) Moved content of column "name" under "ref" (as it is the account_move ref) --- .../wizard/print_giornale.py | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/l10n_it_central_journal_reportlab/wizard/print_giornale.py b/l10n_it_central_journal_reportlab/wizard/print_giornale.py index 5a661aef6f26..75983c3dcfe6 100644 --- a/l10n_it_central_journal_reportlab/wizard/print_giornale.py +++ b/l10n_it_central_journal_reportlab/wizard/print_giornale.py @@ -134,7 +134,7 @@ def get_grupped_line_reportlab_ids(self): am.name AS move_name, aa.code AS account_code, aa.name AS account_name, - COALESCE(am.ref, '') AS name, + COALESCE(am.ref, '') AS ref, SUM(aml.debit) AS debit, SUM(aml.credit) AS credit FROM @@ -155,7 +155,8 @@ def get_grupped_line_reportlab_ids(self): ORDER BY am.date, am.name, - aa.code + aa.code, + am.ref; """ params = { "date_from": wizard.date_move_line_from, @@ -319,6 +320,12 @@ def get_initial_balance_data_report_giornale(self): ] return initial_balance_data + def _compute_aml_grouped_name(self, line): + """ + When the account move lines are grouped, the "Name" column is left empty. + This method can be inherited to compute it as desired.""" + return "" + def get_grupped_final_tables_report_giornale( self, list_grupped_line, tables, start_row, width_available ): @@ -345,11 +352,12 @@ def get_grupped_final_tables_report_giornale( continue start_row += 1 - row = Paragraph(escape(str(start_row)), style_name) - date = Paragraph(escape(format_date(self.env, line["date"])), style_name) - move = Paragraph(escape(line["move_name"]), style_name) - account = Paragraph(escape(account_name), style_name) - name = Paragraph(escape(line["name"]), style_name) + row = Paragraph(str(start_row), style_name) + date = Paragraph(format_date(self.env, line["date"]), style_name) + move = Paragraph(line["move_name"], style_name) + account = Paragraph(account_name, style_name) + name = Paragraph(self._compute_aml_grouped_name(line), style_name) + ref = Paragraph(line["ref"], style_name) # dato che nel SQL ho la somma dei crediti e debiti potrei avere # che un conto ha sia debito che credito lines_data = [] @@ -359,14 +367,18 @@ def get_grupped_final_tables_report_giornale( ) credit = Paragraph(escape(formatLang(self.env, 0)), style_number) list_balance.append((line["debit"], 0)) - lines_data.append([[row, date, move, account, name, debit, credit]]) + lines_data.append( + [[row, date, ref, move, account, name, debit, credit]] + ) if line["credit"] > 0: debit = Paragraph(escape(formatLang(self.env, 0)), style_number) credit = Paragraph( escape(formatLang(self.env, line["credit"])), style_number ) list_balance.append((0, line["credit"])) - lines_data.append([[row, date, move, account, name, debit, credit]]) + lines_data.append( + [[row, date, ref, move, account, name, debit, credit]] + ) for line_data in lines_data: if previous_move_name != line["move_name"]: previous_move_name = line["move_name"]