Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[IMP] account_financial_report: open_items 

* added option "show_partner_details"
pull/939/head
Joan Sisquella 2020-04-29 17:11:32 +02:00 committed by David Ramia
parent 8f1c150c39
commit 0f523bf92a
6 changed files with 228 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
account_financial_report/report/open_items.py
View File

@ -324,6 +324,20 @@ class OpenItemsReport(models.AbstractModel):
total_amount[account_id]["residual"] += move_line["amount_residual"] total_amount[account_id]["residual"] += move_line["amount_residual"]
return total_amount return total_amount
@api.model
def _get_open_items_no_partners(self, open_items_move_lines_data):
new_open_items = {}
for acc_id in open_items_move_lines_data.keys():
new_open_items[acc_id] = {}
move_lines = []
for prt_id in open_items_move_lines_data[acc_id]:
for move_line in open_items_move_lines_data[acc_id][prt_id]:
move_lines += [move_line]
move_lines = sorted(move_lines, key=lambda k: (k["date"]))
new_open_items[acc_id] = move_lines
return new_open_items
@api.multi
def _get_report_values(self, docids, data): def _get_report_values(self, docids, data):
wizard_id = data["wizard_id"] wizard_id = data["wizard_id"]
company = self.env["res.company"].browse(data["company_id"]) company = self.env["res.company"].browse(data["company_id"])
@ -334,6 +348,7 @@ class OpenItemsReport(models.AbstractModel):
date_at_object = datetime.strptime(date_at, "%Y-%m-%d").date() date_at_object = datetime.strptime(date_at, "%Y-%m-%d").date()
date_from = data["date_from"] date_from = data["date_from"]
target_move = data["target_move"] target_move = data["target_move"]
show_partner_details = data["show_partner_details"]
( (
move_lines_data, move_lines_data,
@ -346,11 +361,16 @@ class OpenItemsReport(models.AbstractModel):
) )
total_amount = self._calculate_amounts(open_items_move_lines_data) total_amount = self._calculate_amounts(open_items_move_lines_data)
if not show_partner_details:
open_items_move_lines_data = self._get_open_items_no_partners(
open_items_move_lines_data
)
return { return {
"doc_ids": [wizard_id], "doc_ids": [wizard_id],
"doc_model": "open.items.report.wizard", "doc_model": "open.items.report.wizard",
"docs": self.env["open.items.report.wizard"].browse(wizard_id), "docs": self.env["open.items.report.wizard"].browse(wizard_id),
"foreign_currency": data["foreign_currency"], "foreign_currency": data["foreign_currency"],
"show_partner_details": data["show_partner_details"],
"company_name": company.display_name, "company_name": company.display_name,
"currency_name": company.currency_id.name, "currency_name": company.currency_id.name,
"date_at": date_at_object.strftime("%d/%m/%Y"), "date_at": date_at_object.strftime("%d/%m/%Y"),

43
account_financial_report/report/open_items_xlsx.py
View File

@ -109,6 +109,7 @@ class OpenItemsXslx(models.AbstractModel):
accounts_data = res_data["accounts_data"] accounts_data = res_data["accounts_data"]
partners_data = res_data["partners_data"] partners_data = res_data["partners_data"]
total_amount = res_data["total_amount"] total_amount = res_data["total_amount"]
show_partner_details = res_data["show_partner_details"]
for account_id in Open_items.keys(): for account_id in Open_items.keys():
# Write account title # Write account title
self.write_array_title( self.write_array_title(
@ -119,30 +120,38 @@ class OpenItemsXslx(models.AbstractModel):
# For each partner # For each partner
if Open_items[account_id]: if Open_items[account_id]:
for partner_id in Open_items[account_id]: if show_partner_details:
type_object = "partner" for partner_id in Open_items[account_id]:
# Write partner title type_object = "partner"
self.write_array_title(partners_data[partner_id]["name"]) # Write partner title
self.write_array_title(partners_data[partner_id]["name"])
# Display array header for move lines
self.write_array_header()
# Display account move lines
for line in Open_items[account_id][partner_id]:
self.write_line_from_dict(line)
# Display ending balance line for partner
self.write_ending_balance_from_dict(
partners_data[partner_id],
type_object,
total_amount,
account_id,
partner_id,
)
# Line break
self.row_pos += 1
else:
# Display array header for move lines # Display array header for move lines
self.write_array_header() self.write_array_header()
# Display account move lines # Display account move lines
for line in Open_items[account_id][partner_id]: for line in Open_items[account_id]:
self.write_line_from_dict(line) self.write_line_from_dict(line)
# Display ending balance line for partner
self.write_ending_balance_from_dict(
partners_data[partner_id],
type_object,
total_amount,
account_id,
partner_id,
)
# Line break
self.row_pos += 1
# Display ending balance line for account # Display ending balance line for account
type_object = "account" type_object = "account"
self.write_ending_balance_from_dict( self.write_ending_balance_from_dict(

24
account_financial_report/report/templates/general_ledger.xml
View File

@ -85,20 +85,20 @@
/> />
<t t-set="type" t-value='"partner_type"' /> <t t-set="type" t-value='"partner_type"' />
</t> </t>
<!-- Display account footer -->
<t t-if="not filter_partner_ids">
<t
t-call="account_financial_report.report_general_ledger_ending_cumul"
>
<t
t-set="account_or_partner_object"
t-value="account"
/>
<t t-set="type" t-value='"account_type"' />
</t>
</t>
</div> </div>
</t> </t>
<!-- Display account footer -->
<t t-if="not filter_partner_ids">
<t
t-call="account_financial_report.report_general_ledger_ending_cumul"
>
<t
t-set="account_or_partner_object"
t-value="account"
/>
<t t-set="type" t-value='"account_type"' />
</t>
</t>
</t> </t>
</div> </div>
</t> </t>

317
account_financial_report/report/templates/open_items.xml
View File

@ -28,26 +28,48 @@
<!-- Display filters --> <!-- Display filters -->
<t t-call="account_financial_report.report_open_items_filters" /> <t t-call="account_financial_report.report_open_items_filters" />
<t t-foreach="Open_Items.keys()" t-as="account_id"> <t t-foreach="Open_Items.keys()" t-as="account_id">
<div class="page_break"> <!-- Display account header -->
<!-- Display account header --> <div class="act_as_table list_table" style="margin-top: 10px;" />
<div class="act_as_table list_table" style="margin-top: 10px;" /> <div class="account_title" style="width: 100%;">
<div class="account_title" style="width: 100%;">
<span t-esc="accounts_data[account_id]['code']" /> <span t-esc="accounts_data[account_id]['code']" />
- -
<span t-esc="accounts_data[account_id]['name']" /> <span t-esc="accounts_data[account_id]['name']" />
</div> </div>
<!-- Display account partners --> <t t-if="not show_partner_details">
<t t-foreach="Open_Items[account_id]" t-as="partner_id"> <div class="act_as_table data_table" style="width: 100%;">
<div class="page_break"> <t
<!-- Display partner header --> t-call="account_financial_report.report_open_items_lines_header"
<div class="act_as_caption account_title"> />
<span t-esc="partners_data[partner_id]['name']" /> <!-- Display account move lines -->
</div> <t t-foreach="Open_Items[account_id]" t-as="line">
<!-- Display partner move lines -->
<t <t
t-call="account_financial_report.report_open_items_lines" t-call="account_financial_report.report_open_items_lines"
/> />
<!-- Display partner footer --> </t>
</div>
</t>
<t t-if="show_partner_details">
<div class="page_break">
<!-- Display account partners -->
<t t-foreach="Open_Items[account_id]" t-as="partner_id">
<div class="act_as_caption account_title">
<span t-esc="partners_data[partner_id]['name']" />
</div>
<div class="act_as_table data_table" style="width: 100%;">
<!-- Display partner header -->
<t
t-call="account_financial_report.report_open_items_lines_header"
/>
<!-- Display partner move lines -->
<t
t-foreach="Open_Items[account_id][partner_id]"
t-as="line"
>
<t
t-call="account_financial_report.report_open_items_lines"
/>
</t>
</div>
<t <t
t-call="account_financial_report.report_open_items_ending_cumul" t-call="account_financial_report.report_open_items_ending_cumul"
> >
@ -61,21 +83,21 @@
/> />
<t t-set="type" t-value='"partner_type"' /> <t t-set="type" t-value='"partner_type"' />
</t> </t>
</div> </t>
</t> </div>
<!-- Display account footer --> </t>
<t t-call="account_financial_report.report_open_items_ending_cumul"> <!-- Display account footer -->
<t <t t-call="account_financial_report.report_open_items_ending_cumul">
t-set="account_or_partner_id" <t
t-value="accounts_data[account_id]" t-set="account_or_partner_id"
/> t-value="accounts_data[account_id]"
<t />
t-set="currency_id" <t
t-value="accounts_data[account_id]['currency_name']" t-set="currency_id"
/> t-value="accounts_data[account_id]['currency_name']"
<t t-set="type" t-value='"account_type"' /> />
</t> <t t-set="type" t-value='"account_type"' />
</div> </t>
</t> </t>
</div> </div>
</template> </template>
@ -101,133 +123,130 @@
</div> </div>
</div> </div>
</template> </template>
<template id="account_financial_report.report_open_items_lines"> <template id="account_financial_report.report_open_items_lines_header">
<div class="act_as_table data_table" style="width: 100%;"> <!-- Display table headers for lines -->
<!-- Display table headers for lines --> <div class="act_as_thead">
<div class="act_as_thead"> <div class="act_as_row labels">
<div class="act_as_row labels"> <!--## date-->
<!--## date--> <div class="act_as_cell first_column" style="width: 5.51%;">
<div class="act_as_cell first_column" style="width: 5.51%;"> Date</div>
Date</div> <!--## move-->
<!--## move--> <div class="act_as_cell" style="width: 9.76%;">Entry</div>
<div class="act_as_cell" style="width: 9.76%;">Entry</div> <!--## journal-->
<!--## journal--> <div class="act_as_cell" style="width: 4.78%;">Journal</div>
<div class="act_as_cell" style="width: 4.78%;">Journal</div> <!--## account code-->
<!--## account code--> <div class="act_as_cell" style="width: 5.38%;">Account</div>
<div class="act_as_cell" style="width: 5.38%;">Account</div> <!--## partner-->
<!--## partner--> <div class="act_as_cell" style="width: 15.07%;">Partner
<div class="act_as_cell" style="width: 15.07%;">Partner
</div>
<!--## ref - label-->
<div class="act_as_cell" style="width: 24.5%;">Ref -
Label</div>
<!--## date_due-->
<div class="act_as_cell" style="width: 6.47%;">Due
date</div>
<!--## amount_total_due-->
<div class="act_as_cell" style="width: 6.57%;">Original
</div>
<!--## amount_residual-->
<div class="act_as_cell" style="width: 6.57%;">Residual</div>
<t t-if="foreign_currency">
<!--## currency_name-->
<div class="act_as_cell" style="width: 2.25%;">Cur.</div>
<!--## amount_total_due_currency-->
<div
class="act_as_cell amount"
style="width: 6.57%;"
>Cur. Original</div>
<!--## amount_residual_currency-->
<div
class="act_as_cell amount"
style="width: 6.57%;"
>Cur. Residual</div>
</t>
</div> </div>
<!--## ref - label-->
<div class="act_as_cell" style="width: 24.5%;">Ref -
Label</div>
<!--## date_due-->
<div class="act_as_cell" style="width: 6.47%;">Due
date</div>
<!--## amount_total_due-->
<div class="act_as_cell" style="width: 6.57%;">Original
</div>
<!--## amount_residual-->
<div class="act_as_cell" style="width: 6.57%;">Residual</div>
<t t-if="foreign_currency">
<!--## currency_name-->
<div class="act_as_cell" style="width: 2.25%;">Cur.</div>
<!--## amount_total_due_currency-->
<div
class="act_as_cell amount"
style="width: 6.57%;"
>Cur. Original</div>
<!--## amount_residual_currency-->
<div
class="act_as_cell amount"
style="width: 6.57%;"
>Cur. Residual</div>
</t>
</div> </div>
<!-- Display each lines --> </div>
<t t-foreach="Open_Items[account_id][partner_id]" t-as="line"> </template>
<!-- # lines or centralized lines --> <template id="account_financial_report.report_open_items_lines">
<div class="act_as_row lines"> <!-- # lines or centralized lines -->
<!--## date--> <div class="act_as_row lines">
<div class="act_as_cell left"> <!--## date-->
<span t-raw="line['date']" /> <div class="act_as_cell left">
</div> <span t-raw="line['date']" />
<!--## move--> </div>
<div class="act_as_cell left"> <!--## move-->
<t t-set="res_model" t-value="'account.move'" /> <div class="act_as_cell left">
<span> <t t-set="res_model" t-value="'account.move'" />
<a <span>
t-att-data-active-id="line['move_id']" <a
t-att-data-res-model="res_model" t-att-data-active-id="line['move_id']"
class="o_account_financial_reports_web_action" t-att-data-res-model="res_model"
style="color: black;" class="o_account_financial_reports_web_action"
> style="color: black;"
<t t-esc="line['move_name']" /> >
</a> <t t-esc="line['move_name']" />
</span> </a>
</div> </span>
<!--## journal--> </div>
<div class="act_as_cell left"> <!--## journal-->
<span t-esc="line['journal']" /> <div class="act_as_cell left">
</div> <span t-esc="line['journal']" />
<!--## account code--> </div>
<div class="act_as_cell left"> <!--## account code-->
<span t-esc="line['account']" /> <div class="act_as_cell left">
</div> <span t-esc="line['account']" />
<!--## partner--> </div>
<div class="act_as_cell left"> <!--## partner-->
<!-- <span t-if="line.get('partner_id', False)" t-esc="line['partner_id']"/>--> <div class="act_as_cell left">
<span t-esc="line['partner_name']" /> <!-- <span t-if="line.get('partner_id', False)" t-esc="line['partner_id']"/>-->
</div> <span t-esc="line['partner_name']" />
<!--## ref - label--> </div>
<div class="act_as_cell left"> <!--## ref - label-->
<span t-esc="line['ref']" /> <div class="act_as_cell left">
</div> <span t-esc="line['ref']" />
<!--## date_due--> </div>
<div class="act_as_cell left"> <!--## date_due-->
<span t-esc="line['date_maturity']" /> <div class="act_as_cell left">
</div> <span t-esc="line['date_maturity']" />
<!--## amount_total_due--> </div>
<!--## amount_total_due-->
<div class="act_as_cell amount">
<span
t-if="line.get('original', False)"
t-esc="line['original']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</div>
<!--## amount_residual-->
<div class="act_as_cell amount">
<span
t-esc="line['amount_residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</div>
<t t-if="foreign_currency">
<t t-if="line['currency_id']">
<!--## currency_name-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span t-esc="line['currency_name']" />
t-if="line.get('original', False)"
t-esc="line['original']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</div> </div>
<!--## amount_residual--> <!--## amount_total_due_currency-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span t-esc="line['amount_currency']" />
t-esc="line['amount_residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</div> </div>
<t t-if="foreign_currency"> <!--## amount_residual_currency-->
<t t-if="line['currency_id']"> <div class="act_as_cell amount">
<!--## currency_name--> <span t-esc="line['amount_residual_currency']" />
<div class="act_as_cell amount"> </div>
<span t-esc="line['currency_name']" /> </t>
</div> <t t-if="not line['currency_id']">
<!--## amount_total_due_currency--> <!--## currency_name-->
<div class="act_as_cell amount"> <div class="act_as_cell" />
<span t-esc="line['amount_currency']" /> <!--## amount_total_due_currency-->
</div> <div class="act_as_cell" />
<!--## amount_residual_currency--> <!--## amount_residual_currency-->
<div class="act_as_cell amount"> <div class="act_as_cell" />
<span t-esc="line['amount_residual_currency']" /> </t>
</div>
</t>
<t t-if="not line['currency_id']">
<!--## currency_name-->
<div class="act_as_cell" />
<!--## amount_total_due_currency-->
<div class="act_as_cell" />
<!--## amount_residual_currency-->
<div class="act_as_cell" />
</t>
</t>
</div>
</t> </t>
</div> </div>
</template> </template>

1
account_financial_report/wizard/open_items_wizard.py
View File

@ -178,6 +178,7 @@ class OpenItemsReportWizard(models.TransientModel):
"only_posted_moves": self.target_move == "posted", "only_posted_moves": self.target_move == "posted",
"hide_account_at_0": self.hide_account_at_0, "hide_account_at_0": self.hide_account_at_0,
"foreign_currency": self.foreign_currency, "foreign_currency": self.foreign_currency,
"show_partner_details": self.show_partner_details,
"company_id": self.company_id.id, "company_id": self.company_id.id,
"target_move": self.target_move, "target_move": self.target_move,
"account_ids": self.account_ids.ids, "account_ids": self.account_ids.ids,

1
account_financial_report/wizard/open_items_wizard_view.xml
View File

@ -20,6 +20,7 @@
</group> </group>
<group name="other_filters"> <group name="other_filters">
<field name="target_move" widget="radio" /> <field name="target_move" widget="radio" />
<field name="show_partner_details" />
<field name="hide_account_at_0" /> <field name="hide_account_at_0" />
<field name="foreign_currency" /> <field name="foreign_currency" />
</group> </group>