diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py index 3953a0d1..45c980f2 100644 --- a/account_financial_report/report/general_ledger.py +++ b/account_financial_report/report/general_ledger.py @@ -1,5 +1,6 @@ # © 2016 Julien Coux (Camptocamp) # Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com) +# Copyright 2022 Tecnativa - Víctor Martínez # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import calendar @@ -145,6 +146,69 @@ class GeneralLedgerReport(models.AbstractModel): pl_initial_balance["bal_curr"] += initial_balance["amount_currency"] return pl_initial_balance + def _get_gl_initial_acc( + self, account_ids, company_id, date_from, fy_start_date, base_domain + ): + initial_domain_bs = self._get_initial_balances_bs_ml_domain( + account_ids, company_id, date_from, base_domain + ) + initial_domain_pl = self._get_initial_balances_pl_ml_domain( + account_ids, company_id, date_from, fy_start_date, base_domain + ) + return self._get_accounts_initial_balance(initial_domain_bs, initial_domain_pl) + + def _prepare_gen_ld_data_item(self, gl): + res = {} + for key_bal in ["init_bal", "fin_bal"]: + res[key_bal] = {} + for key_field in ["credit", "debit", "balance", "bal_curr"]: + field_name = key_field if key_field != "bal_curr" else "amount_currency" + res[key_bal][key_field] = gl[field_name] + return res + + def _prepare_gen_ld_data(self, gl_initial_acc, domain, grouped_by): + data = {} + for gl in gl_initial_acc: + acc_id = gl["account_id"][0] + data[acc_id] = self._prepare_gen_ld_data_item(gl) + data[acc_id]["id"] = acc_id + if grouped_by: + data[acc_id][grouped_by] = False + method = "_prepare_gen_ld_data_group_%s" % grouped_by + if not hasattr(self, method): + return data + return getattr(self, method)(data, domain, grouped_by) + + def _prepare_gen_ld_data_group_partners(self, data, domain, grouped_by): + gl_initial_acc_prt = self.env["account.move.line"].read_group( + domain=domain, + fields=[ + "account_id", + "partner_id", + "debit", + "credit", + "balance", + "amount_currency", + ], + groupby=["account_id", "partner_id"], + lazy=False, + ) + if gl_initial_acc_prt: + for gl in gl_initial_acc_prt: + if not gl["partner_id"]: + prt_id = 0 + prt_name = "Missing Partner" + else: + prt_id = gl["partner_id"][0] + prt_name = gl["partner_id"][1] + prt_name = prt_name._value + acc_id = gl["account_id"][0] + data[acc_id][prt_id] = self._prepare_gen_ld_data_item(gl) + data[acc_id][prt_id]["id"] = prt_id + data[acc_id][prt_id]["name"] = prt_name + data[acc_id][grouped_by] = True + return data + def _get_initial_balance_data( self, account_ids, @@ -158,6 +222,7 @@ class GeneralLedgerReport(models.AbstractModel): analytic_tag_ids, cost_center_ids, extra_domain, + grouped_by, ): # If explicit list of accounts is provided, # don't include unaffected earnings account @@ -178,114 +243,34 @@ class GeneralLedgerReport(models.AbstractModel): base_domain += [("analytic_account_id", "in", cost_center_ids)] if extra_domain: base_domain += extra_domain - initial_domain_bs = self._get_initial_balances_bs_ml_domain( - account_ids, company_id, date_from, base_domain - ) - initial_domain_pl = self._get_initial_balances_pl_ml_domain( + gl_initial_acc = self._get_gl_initial_acc( account_ids, company_id, date_from, fy_start_date, base_domain ) - gl_initial_acc = self._get_accounts_initial_balance( - initial_domain_bs, initial_domain_pl - ) - initial_domain_acc_prt = self._get_initial_balances_bs_ml_domain( + domain = self._get_initial_balances_bs_ml_domain( account_ids, company_id, date_from, base_domain, acc_prt=True ) - gl_initial_acc_prt = self.env["account.move.line"].read_group( - domain=initial_domain_acc_prt, - fields=[ - "account_id", - "partner_id", - "debit", - "credit", - "balance", - "amount_currency", - ], - groupby=["account_id", "partner_id"], - lazy=False, - ) - gen_ld_data = {} - for gl in gl_initial_acc: - acc_id = gl["account_id"][0] - gen_ld_data[acc_id] = {} - gen_ld_data[acc_id]["id"] = acc_id - gen_ld_data[acc_id]["partners"] = False - gen_ld_data[acc_id]["init_bal"] = {} - gen_ld_data[acc_id]["init_bal"]["credit"] = gl["credit"] - gen_ld_data[acc_id]["init_bal"]["debit"] = gl["debit"] - gen_ld_data[acc_id]["init_bal"]["balance"] = gl["balance"] - gen_ld_data[acc_id]["fin_bal"] = {} - gen_ld_data[acc_id]["fin_bal"]["credit"] = gl["credit"] - gen_ld_data[acc_id]["fin_bal"]["debit"] = gl["debit"] - gen_ld_data[acc_id]["fin_bal"]["balance"] = gl["balance"] - gen_ld_data[acc_id]["init_bal"]["bal_curr"] = gl["amount_currency"] - gen_ld_data[acc_id]["fin_bal"]["bal_curr"] = gl["amount_currency"] - partners_data = {} - partners_ids = set() - if gl_initial_acc_prt: - for gl in gl_initial_acc_prt: - if not gl["partner_id"]: - prt_id = 0 - prt_name = "Missing Partner" - else: - prt_id = gl["partner_id"][0] - prt_name = gl["partner_id"][1] - prt_name = prt_name._value - if prt_id not in partners_ids: - partners_ids.add(prt_id) - partners_data.update({prt_id: {"id": prt_id, "name": prt_name}}) - acc_id = gl["account_id"][0] - gen_ld_data[acc_id][prt_id] = {} - gen_ld_data[acc_id][prt_id]["id"] = prt_id - gen_ld_data[acc_id]["partners"] = True - gen_ld_data[acc_id][prt_id]["init_bal"] = {} - gen_ld_data[acc_id][prt_id]["init_bal"]["credit"] = gl["credit"] - gen_ld_data[acc_id][prt_id]["init_bal"]["debit"] = gl["debit"] - gen_ld_data[acc_id][prt_id]["init_bal"]["balance"] = gl["balance"] - gen_ld_data[acc_id][prt_id]["fin_bal"] = {} - gen_ld_data[acc_id][prt_id]["fin_bal"]["credit"] = gl["credit"] - gen_ld_data[acc_id][prt_id]["fin_bal"]["debit"] = gl["debit"] - gen_ld_data[acc_id][prt_id]["fin_bal"]["balance"] = gl["balance"] - gen_ld_data[acc_id][prt_id]["init_bal"]["bal_curr"] = gl[ - "amount_currency" - ] - gen_ld_data[acc_id][prt_id]["fin_bal"]["bal_curr"] = gl[ - "amount_currency" - ] - accounts_ids = list(gen_ld_data.keys()) + data = self._prepare_gen_ld_data(gl_initial_acc, domain, grouped_by) + accounts_ids = list(data.keys()) unaffected_id = unaffected_earnings_account if unaffected_id: if unaffected_id not in accounts_ids: accounts_ids.append(unaffected_id) - self._initialize_account(gen_ld_data, unaffected_id, foreign_currency) + data[unaffected_id] = self._initialize_data(foreign_currency) + data[unaffected_id]["id"] = unaffected_id + data[unaffected_id]["mame"] = "" + data[unaffected_id][grouped_by] = False pl_initial_balance = self._get_pl_initial_balance( account_ids, company_id, fy_start_date, foreign_currency, base_domain ) - gen_ld_data[unaffected_id]["init_bal"]["debit"] += pl_initial_balance[ - "debit" - ] - gen_ld_data[unaffected_id]["init_bal"]["credit"] += pl_initial_balance[ - "credit" - ] - gen_ld_data[unaffected_id]["init_bal"]["balance"] += pl_initial_balance[ - "balance" - ] - gen_ld_data[unaffected_id]["fin_bal"]["debit"] += pl_initial_balance[ - "debit" - ] - gen_ld_data[unaffected_id]["fin_bal"]["credit"] += pl_initial_balance[ - "credit" - ] - gen_ld_data[unaffected_id]["fin_bal"]["balance"] += pl_initial_balance[ - "balance" - ] - if foreign_currency: - gen_ld_data[unaffected_id]["init_bal"][ - "bal_curr" - ] += pl_initial_balance["bal_curr"] - gen_ld_data[unaffected_id]["fin_bal"]["bal_curr"] += pl_initial_balance[ - "bal_curr" - ] - return gen_ld_data, partners_data, partner_ids + for key_bal in ["init_bal", "fin_bal"]: + fields_balance = ["credit", "debit", "balance"] + if foreign_currency: + fields_balance.append("bal_curr") + for field_name in fields_balance: + data[unaffected_id][key_bal][field_name] += pl_initial_balance[ + field_name + ] + return data @api.model def _get_move_line_data(self, move_line): @@ -370,40 +355,15 @@ class GeneralLedgerReport(models.AbstractModel): domain += [("analytic_account_id", "in", cost_center_ids)] return domain - @api.model - def _initialize_partner(self, gen_ld_data, acc_id, prt_id, foreign_currency): - gen_ld_data[acc_id]["partners"] = True - gen_ld_data[acc_id][prt_id] = {} - gen_ld_data[acc_id][prt_id]["id"] = prt_id - gen_ld_data[acc_id][prt_id]["init_bal"] = {} - gen_ld_data[acc_id][prt_id]["init_bal"]["balance"] = 0.0 - gen_ld_data[acc_id][prt_id]["init_bal"]["credit"] = 0.0 - gen_ld_data[acc_id][prt_id]["init_bal"]["debit"] = 0.0 - gen_ld_data[acc_id][prt_id]["fin_bal"] = {} - gen_ld_data[acc_id][prt_id]["fin_bal"]["credit"] = 0.0 - gen_ld_data[acc_id][prt_id]["fin_bal"]["debit"] = 0.0 - gen_ld_data[acc_id][prt_id]["fin_bal"]["balance"] = 0.0 - if foreign_currency: - gen_ld_data[acc_id][prt_id]["init_bal"]["bal_curr"] = 0.0 - gen_ld_data[acc_id][prt_id]["fin_bal"]["bal_curr"] = 0.0 - return gen_ld_data - - def _initialize_account(self, gen_ld_data, acc_id, foreign_currency): - gen_ld_data[acc_id] = {} - gen_ld_data[acc_id]["id"] = acc_id - gen_ld_data[acc_id]["partners"] = False - gen_ld_data[acc_id]["init_bal"] = {} - gen_ld_data[acc_id]["init_bal"]["balance"] = 0.0 - gen_ld_data[acc_id]["init_bal"]["credit"] = 0.0 - gen_ld_data[acc_id]["init_bal"]["debit"] = 0.0 - gen_ld_data[acc_id]["fin_bal"] = {} - gen_ld_data[acc_id]["fin_bal"]["credit"] = 0.0 - gen_ld_data[acc_id]["fin_bal"]["debit"] = 0.0 - gen_ld_data[acc_id]["fin_bal"]["balance"] = 0.0 - if foreign_currency: - gen_ld_data[acc_id]["init_bal"]["bal_curr"] = 0.0 - gen_ld_data[acc_id]["fin_bal"]["bal_curr"] = 0.0 - return gen_ld_data + def _initialize_data(self, foreign_currency): + res = {} + for key_bal in ["init_bal", "fin_bal"]: + res[key_bal] = {} + for key_field in ["balance", "credit", "debit"]: + res[key_bal][key_field] = 0.0 + if foreign_currency: + res[key_bal]["bal_curr"] = 0.0 + return res def _get_reconciled_after_date_to_ids(self, full_reconcile_ids, date_to): full_reconcile_ids = list(full_reconcile_ids) @@ -421,6 +381,18 @@ class GeneralLedgerReport(models.AbstractModel): rec_after_date_to_ids = [i[0] for i in rec_after_date_to_ids] return rec_after_date_to_ids + def _prepare_ml_items(self, move_line, grouped_by): + res = [] + if grouped_by == "partners": + item_id = move_line["partner_id"][0] if move_line["partner_id"] else 0 + item_name = ( + move_line["partner_id"][1] + if move_line["partner_id"] + else "Missing Partner" + ) + res.append({"id": item_id, "name": item_name}) + return res + def _get_period_ml_data( self, account_ids, @@ -430,12 +402,11 @@ class GeneralLedgerReport(models.AbstractModel): only_posted_moves, date_from, date_to, - partners_data, gen_ld_data, - partners_ids, analytic_tag_ids, cost_center_ids, extra_domain, + grouped_by, ): domain = self._get_period_domain( account_ids, @@ -499,33 +470,38 @@ class GeneralLedgerReport(models.AbstractModel): full_reconcile_ids.add(rec_id) acc_id = move_line["account_id"][0] ml_id = move_line["id"] - if move_line["partner_id"]: - prt_id = move_line["partner_id"][0] - partner_name = move_line["partner_id"][1] if acc_id not in gen_ld_data.keys(): - gen_ld_data = self._initialize_account( - gen_ld_data, acc_id, foreign_currency - ) + gen_ld_data[acc_id] = self._initialize_data(foreign_currency) + gen_ld_data[acc_id]["id"] = acc_id + gen_ld_data[acc_id]["mame"] = move_line["account_id"][1] + gen_ld_data[acc_id][grouped_by] = False if acc_id in acc_prt_account_ids: - if not move_line["partner_id"]: - prt_id = 0 - partner_name = "Missing Partner" - partners_ids.append(prt_id) - partners_data.update({prt_id: {"id": prt_id, "name": partner_name}}) - if prt_id not in gen_ld_data[acc_id]: - gen_ld_data = self._initialize_partner( - gen_ld_data, acc_id, prt_id, foreign_currency + item_ids = self._prepare_ml_items(move_line, grouped_by) + for item in item_ids: + item_id = item["id"] + if item_id not in gen_ld_data[acc_id]: + gen_ld_data[acc_id][grouped_by] = True + gen_ld_data[acc_id][item_id] = self._initialize_data( + foreign_currency + ) + gen_ld_data[acc_id][item_id]["id"] = item_id + gen_ld_data[acc_id][item_id]["name"] = item["name"] + gen_ld_data[acc_id][item_id][ml_id] = self._get_move_line_data( + move_line ) - gen_ld_data[acc_id][prt_id][ml_id] = self._get_move_line_data(move_line) - gen_ld_data[acc_id][prt_id]["fin_bal"]["credit"] += move_line["credit"] - gen_ld_data[acc_id][prt_id]["fin_bal"]["debit"] += move_line["debit"] - gen_ld_data[acc_id][prt_id]["fin_bal"]["balance"] += move_line[ - "balance" - ] - if foreign_currency: - gen_ld_data[acc_id][prt_id]["fin_bal"]["bal_curr"] += move_line[ - "amount_currency" + gen_ld_data[acc_id][item_id]["fin_bal"]["credit"] += move_line[ + "credit" ] + gen_ld_data[acc_id][item_id]["fin_bal"]["debit"] += move_line[ + "debit" + ] + gen_ld_data[acc_id][item_id]["fin_bal"]["balance"] += move_line[ + "balance" + ] + if foreign_currency: + gen_ld_data[acc_id][item_id]["fin_bal"][ + "bal_curr" + ] += move_line["amount_currency"] else: gen_ld_data[acc_id][ml_id] = self._get_move_line_data(move_line) gen_ld_data[acc_id]["fin_bal"]["credit"] += move_line["credit"] @@ -545,7 +521,6 @@ class GeneralLedgerReport(models.AbstractModel): return ( gen_ld_data, accounts_data, - partners_data, journals_data, full_reconcile_data, taxes_data, @@ -580,14 +555,14 @@ class GeneralLedgerReport(models.AbstractModel): account.update({"move_lines": move_lines}) return account - def _create_account_not_show_partner( - self, account, acc_id, gen_led_data, rec_after_date_to_ids + def _create_account_not_show_item( + self, account, acc_id, gen_led_data, rec_after_date_to_ids, grouped_by ): move_lines = [] for prt_id in gen_led_data[acc_id].keys(): if not isinstance(prt_id, int): account.update({prt_id: gen_led_data[acc_id][prt_id]}) - else: + elif isinstance(gen_led_data[acc_id][prt_id], dict): for ml_id in gen_led_data[acc_id][prt_id].keys(): if isinstance(ml_id, int): move_lines += [gen_led_data[acc_id][prt_id][ml_id]] @@ -597,14 +572,48 @@ class GeneralLedgerReport(models.AbstractModel): gen_led_data[acc_id]["init_bal"]["balance"], rec_after_date_to_ids, ) - account.update({"move_lines": move_lines, "partners": False}) + account.update({"move_lines": move_lines, grouped_by: False}) return account + def _get_list_grouped_item( + self, data, account, rec_after_date_to_ids, hide_account_at_0, rounding + ): + list_grouped = [] + for data_id in data.keys(): + group_item = {} + move_lines = [] + if not isinstance(data_id, int): + account.update({data_id: data[data_id]}) + else: + for ml_id in data[data_id].keys(): + if not isinstance(ml_id, int): + group_item.update({ml_id: data[data_id][ml_id]}) + else: + move_lines += [data[data_id][ml_id]] + move_lines = sorted(move_lines, key=lambda k: (k["date"])) + move_lines = self._recalculate_cumul_balance( + move_lines, + data[data_id]["init_bal"]["balance"], + rec_after_date_to_ids, + ) + group_item.update({"move_lines": move_lines}) + if ( + hide_account_at_0 + and float_is_zero( + data[data_id]["init_bal"]["balance"], + precision_rounding=rounding, + ) + and group_item["move_lines"] == [] + ): + continue + list_grouped += [group_item] + return account, list_grouped + def _create_general_ledger( self, gen_led_data, accounts_data, - show_partner_details, + grouped_by, rec_after_date_to_ids, hide_account_at_0, ): @@ -619,9 +628,10 @@ class GeneralLedgerReport(models.AbstractModel): "type": "account", "currency_id": accounts_data[acc_id]["currency_id"], "centralized": accounts_data[acc_id]["centralized"], + "grouped_by": grouped_by, } ) - if not gen_led_data[acc_id]["partners"]: + if grouped_by and not gen_led_data[acc_id][grouped_by]: account = self._create_account( account, acc_id, gen_led_data, rec_after_date_to_ids ) @@ -635,51 +645,27 @@ class GeneralLedgerReport(models.AbstractModel): ): continue else: - if show_partner_details: - list_partner = [] - for prt_id in gen_led_data[acc_id].keys(): - partner = {} - move_lines = [] - if not isinstance(prt_id, int): - account.update({prt_id: gen_led_data[acc_id][prt_id]}) - else: - for ml_id in gen_led_data[acc_id][prt_id].keys(): - if not isinstance(ml_id, int): - partner.update( - {ml_id: gen_led_data[acc_id][prt_id][ml_id]} - ) - else: - move_lines += [gen_led_data[acc_id][prt_id][ml_id]] - move_lines = sorted(move_lines, key=lambda k: (k["date"])) - move_lines = self._recalculate_cumul_balance( - move_lines, - gen_led_data[acc_id][prt_id]["init_bal"]["balance"], - rec_after_date_to_ids, - ) - partner.update({"move_lines": move_lines}) - if ( - hide_account_at_0 - and float_is_zero( - gen_led_data[acc_id][prt_id]["init_bal"]["balance"], - precision_rounding=rounding, - ) - and partner["move_lines"] == [] - ): - continue - list_partner += [partner] - account.update({"list_partner": list_partner}) + if grouped_by: + account, list_grouped = self._get_list_grouped_item( + gen_led_data[acc_id], + account, + rec_after_date_to_ids, + hide_account_at_0, + rounding, + ) + account.update({"list_grouped": list_grouped}) if ( hide_account_at_0 and float_is_zero( gen_led_data[acc_id]["init_bal"]["balance"], precision_rounding=rounding, ) - and account["list_partner"] == [] + and account["list_grouped"] == [] ): continue else: - account = self._create_account_not_show_partner( - account, acc_id, gen_led_data, rec_after_date_to_ids + account = self._create_account_not_show_item( + account, acc_id, gen_led_data, rec_after_date_to_ids, grouped_by ) if ( hide_account_at_0 @@ -735,13 +721,13 @@ class GeneralLedgerReport(models.AbstractModel): return centralized_ml @api.model - def _get_centralized_ml(self, account, date_to): + def _get_centralized_ml(self, account, date_to, grouped_by): centralized_ml = {} if isinstance(date_to, str): date_to = datetime.datetime.strptime(date_to, "%Y-%m-%d").date() - if account["partners"]: - for partner in account["list_partner"]: - for move_line in partner["move_lines"]: + if grouped_by and account[grouped_by]: + for item in account["list_grouped"]: + for move_line in item["move_lines"]: centralized_ml = self._calculate_centralization( centralized_ml, move_line, @@ -766,21 +752,17 @@ class GeneralLedgerReport(models.AbstractModel): date_to = data["date_to"] date_from = data["date_from"] partner_ids = data["partner_ids"] - if not partner_ids: - filter_partner_ids = False - else: - filter_partner_ids = True account_ids = data["account_ids"] analytic_tag_ids = data["analytic_tag_ids"] cost_center_ids = data["cost_center_ids"] - show_partner_details = data["show_partner_details"] + grouped_by = data["grouped_by"] hide_account_at_0 = data["hide_account_at_0"] foreign_currency = data["foreign_currency"] only_posted_moves = data["only_posted_moves"] unaffected_earnings_account = data["unaffected_earnings_account"] fy_start_date = data["fy_start_date"] extra_domain = data["domain"] - gen_ld_data, partners_data, partners_ids = self._get_initial_balance_data( + gen_ld_data = self._get_initial_balance_data( account_ids, partner_ids, company_id, @@ -792,12 +774,12 @@ class GeneralLedgerReport(models.AbstractModel): analytic_tag_ids, cost_center_ids, extra_domain, + grouped_by, ) centralize = data["centralize"] ( gen_ld_data, accounts_data, - partners_data, journals_data, full_reconcile_data, taxes_data, @@ -811,33 +793,34 @@ class GeneralLedgerReport(models.AbstractModel): only_posted_moves, date_from, date_to, - partners_data, gen_ld_data, - partners_ids, analytic_tag_ids, cost_center_ids, extra_domain, + grouped_by, ) general_ledger = self._create_general_ledger( gen_ld_data, accounts_data, - show_partner_details, + grouped_by, rec_after_date_to_ids, hide_account_at_0, ) if centralize: for account in general_ledger: if account["centralized"]: - centralized_ml = self._get_centralized_ml(account, date_to) + centralized_ml = self._get_centralized_ml( + account, date_to, grouped_by + ) account["move_lines"] = centralized_ml account["move_lines"] = self._recalculate_cumul_balance( account["move_lines"], gen_ld_data[account["id"]]["init_bal"]["balance"], rec_after_date_to_ids, ) - if account["partners"]: - account["partners"] = False - del account["list_partner"] + if grouped_by and account[grouped_by]: + account[grouped_by] = False + del account["list_grouped"] general_ledger = sorted(general_ledger, key=lambda k: k["code"]) return { "doc_ids": [wizard_id], @@ -855,12 +838,11 @@ class GeneralLedgerReport(models.AbstractModel): "show_cost_center": data["show_cost_center"], "general_ledger": general_ledger, "accounts_data": accounts_data, - "partners_data": partners_data, "journals_data": journals_data, "full_reconcile_data": full_reconcile_data, "taxes_data": taxes_data, "centralize": centralize, "tags_data": tags_data, - "filter_partner_ids": filter_partner_ids, + "filter_partner_ids": True if partner_ids else False, "currency_model": self.env["res.currency"], } diff --git a/account_financial_report/report/general_ledger_xlsx.py b/account_financial_report/report/general_ledger_xlsx.py index 6b5f3656..8f81e45a 100644 --- a/account_financial_report/report/general_ledger_xlsx.py +++ b/account_financial_report/report/general_ledger_xlsx.py @@ -142,7 +142,6 @@ class GeneralLedgerXslx(models.AbstractModel): ]._get_report_values(report, data) general_ledger = res_data["general_ledger"] accounts_data = res_data["accounts_data"] - partners_data = res_data["partners_data"] journals_data = res_data["journals_data"] taxes_data = res_data["taxes_data"] tags_data = res_data["tags_data"] @@ -157,7 +156,7 @@ class GeneralLedgerXslx(models.AbstractModel): report_data, ) - if not account["partners"]: + if "list_grouped" not in account: # Display array header for move lines self.write_array_header(report_data) @@ -233,23 +232,23 @@ class GeneralLedgerXslx(models.AbstractModel): else: # For each partner - for partner in account["list_partner"]: + for group_item in account["list_grouped"]: # Write partner title - self.write_array_title( - partners_data[partner["id"]]["name"], report_data - ) + self.write_array_title(group_item["name"], report_data) # Display array header for move lines self.write_array_header(report_data) # Display initial balance line for partner - partner.update( + group_item.update( { - "initial_debit": partner["init_bal"]["debit"], - "initial_credit": partner["init_bal"]["credit"], - "initial_balance": partner["init_bal"]["balance"], - "name": partners_data[partner["id"]]["name"], + "initial_debit": group_item["init_bal"]["debit"], + "initial_credit": group_item["init_bal"]["credit"], + "initial_balance": group_item["init_bal"]["balance"], "type": "partner", + "grouped_by": account["grouped_by"] + if "grouped_by" in account + else "", "currency_id": accounts_data[account["id"]]["currency_id"], } ) @@ -259,11 +258,11 @@ class GeneralLedgerXslx(models.AbstractModel): "initial_bal_curr": partner["init_bal"]["bal_curr"], } ) - self.write_initial_balance_from_dict(partner, report_data) + self.write_initial_balance_from_dict(group_item, report_data) # Display account move lines total_bal_curr = 0 - for line in partner["move_lines"]: + for line in group_item["move_lines"]: line.update( { "account": account["code"], @@ -303,22 +302,22 @@ class GeneralLedgerXslx(models.AbstractModel): self.write_line_from_dict(line, report_data) # Display ending balance line for partner - partner.update( + group_item.update( { - "final_debit": partner["fin_bal"]["debit"], - "final_credit": partner["fin_bal"]["credit"], - "final_balance": partner["fin_bal"]["balance"], + "final_debit": group_item["fin_bal"]["debit"], + "final_credit": group_item["fin_bal"]["credit"], + "final_balance": group_item["fin_bal"]["balance"], } ) - if foreign_currency and partner["currency_id"]: - partner.update( + if foreign_currency and group_item["currency_id"]: + group_item.update( { - "final_bal_curr": partner["fin_bal"]["bal_curr"], - "currency_name": partner["currency_id"].name, - "currency_id": partner["currency_id"].id, + "final_bal_curr": group_item["fin_bal"]["bal_curr"], + "currency_name": group_item["currency_id"].name, + "currency_id": group_item["currency_id"].id, } ) - self.write_ending_balance_from_dict(partner, report_data) + self.write_ending_balance_from_dict(group_item, report_data) # Line break report_data["row_pos"] += 1 @@ -346,22 +345,21 @@ class GeneralLedgerXslx(models.AbstractModel): def write_initial_balance_from_dict(self, my_object, report_data): """Specific function to write initial balance for General Ledger""" - if "partner" in my_object["type"]: - label = _("Partner Initial balance") - elif "account" in my_object["type"]: - label = _("Initial balance") - super(GeneralLedgerXslx, self).write_initial_balance_from_dict( - my_object, label, report_data - ) + label = False + if "account" not in my_object["type"] and "grouped_by" in my_object: + if my_object["grouped_by"] == "partners": + label = _("Partner Initial balance") + label = label if label else _("Initial balance") + super().write_initial_balance_from_dict(my_object, label, report_data) def write_ending_balance_from_dict(self, my_object, report_data): """Specific function to write ending balance for General Ledger""" - if "partner" in my_object["type"]: - name = my_object["name"] - label = _("Partner ending balance") - elif "account" in my_object["type"]: + label = name = False + if "account" in my_object["type"]: name = my_object["code"] + " - " + my_object["name"] - label = _("Ending balance") - super(GeneralLedgerXslx, self).write_ending_balance_from_dict( - my_object, name, label, report_data - ) + elif "grouped_by" in my_object: + name = my_object["name"] + if my_object["grouped_by"] == "partners": + label = _("Partner ending balance") + label = label if label else _("Ending balance") + super().write_ending_balance_from_dict(my_object, name, label, report_data) diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index 00e24616..b79d48a2 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -35,48 +35,42 @@
- - - - -
- + - + - + - + - +
@@ -84,8 +78,8 @@ t-call="account_financial_report.report_general_ledger_ending_cumul" > @@ -97,7 +91,7 @@ t-call="account_financial_report.report_general_ledger_ending_cumul" > @@ -238,8 +232,8 @@ /> @@ -247,14 +241,14 @@ @@ -270,8 +264,8 @@ /> @@ -279,14 +273,14 @@ @@ -301,8 +295,8 @@ /> @@ -310,21 +304,19 @@
- +
@@ -346,7 +338,7 @@
- +
@@ -372,7 +362,7 @@
- +
@@ -431,9 +421,7 @@ res-model="account.account" view-type="form" > - +
@@ -637,17 +625,14 @@
- - - - -
-
- Ending balance -
+
Ending balance
@@ -668,29 +653,27 @@
- +
@@ -716,7 +699,7 @@ @@ -727,8 +710,8 @@ style="color: black;" > @@ -736,9 +719,7 @@
- +
diff --git a/account_financial_report/tests/test_general_ledger.py b/account_financial_report/tests/test_general_ledger.py index c5ec7c8e..1b17ad8b 100644 --- a/account_financial_report/tests/test_general_ledger.py +++ b/account_financial_report/tests/test_general_ledger.py @@ -128,7 +128,7 @@ class TestGeneralLedgerReport(AccountTestInvoicingCommon): partner_in_report = False for account in general_ledger: if account["id"] == account_id and account["partners"]: - for partner in account["list_partner"]: + for partner in account["list_grouped"]: if partner["id"] == partner_id: partner_in_report = True return partner_in_report @@ -146,7 +146,7 @@ class TestGeneralLedgerReport(AccountTestInvoicingCommon): initial_balance = False for account in general_ledger: if account["id"] == account_id and account["partners"]: - for partner in account["list_partner"]: + for partner in account["list_grouped"]: if partner["id"] == partner_id: initial_balance = partner["init_bal"] return initial_balance @@ -164,7 +164,7 @@ class TestGeneralLedgerReport(AccountTestInvoicingCommon): final_balance = False for account in general_ledger: if account["id"] == account_id and account["partners"]: - for partner in account["list_partner"]: + for partner in account["list_grouped"]: if partner["id"] == partner_id: final_balance = partner["fin_bal"] return final_balance diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py index 94fa0fcd..bcec5987 100644 --- a/account_financial_report/wizard/general_ledger_wizard.py +++ b/account_financial_report/wizard/general_ledger_wizard.py @@ -83,9 +83,10 @@ class GeneralLedgerReportWizard(models.TransientModel): string="Account Code To", help="Ending account in a range", ) - show_partner_details = fields.Boolean( - string="Show Partner Details", - default=True, + grouped_by = fields.Selection( + selection=[("none", "None"), ("partners", "Partners")], + default="partners", + string="Grouped by", ) show_cost_center = fields.Boolean( string="Show Analytic Account", @@ -305,7 +306,7 @@ class GeneralLedgerReportWizard(models.TransientModel): "company_id": self.company_id.id, "account_ids": self.account_ids.ids, "partner_ids": self.partner_ids.ids, - "show_partner_details": self.show_partner_details, + "grouped_by": self.grouped_by, "cost_center_ids": self.cost_center_ids.ids, "show_cost_center": self.show_cost_center, "analytic_tag_ids": self.analytic_tag_ids.ids, diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml index 0662428d..08b26769 100644 --- a/account_financial_report/wizard/general_ledger_wizard_view.xml +++ b/account_financial_report/wizard/general_ledger_wizard_view.xml @@ -22,11 +22,11 @@ + - + -