thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

May 18: [FIX] Bug Fixed 'dynamic_accounts_report'

pull/317/head
RisvanaCybro 12 months ago
parent
5d2b6150ee
commit
9ae3c735c3
17 changed files with 284 additions and 301 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dynamic_accounts_report/__manifest__.py
  2. 5
      dynamic_accounts_report/doc/RELEASE_NOTES.md
  3. 4
      dynamic_accounts_report/models/dynamic_balance_sheet_report.py
  4. 156
      dynamic_accounts_report/report/balance_sheet_report_templates.xml
  5. 6
      dynamic_accounts_report/static/src/css/accounts_report.css
  6. 8
      dynamic_accounts_report/static/src/js/tax_report.js
  7. 8
      dynamic_accounts_report/static/src/js/trial_balance.js
  8. 2
      dynamic_accounts_report/static/src/xml/aged_payable_report_views.xml
  9. 2
      dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
  10. 5
      dynamic_accounts_report/static/src/xml/balance_sheet_template.xml
  11. 2
      dynamic_accounts_report/static/src/xml/bank_flow_templates.xml
  12. 2
      dynamic_accounts_report/static/src/xml/cash_flow_templates.xml
  13. 2
      dynamic_accounts_report/static/src/xml/general_ledger_view.xml
  14. 5
      dynamic_accounts_report/static/src/xml/partner_ledger_view.xml
  15. 2
      dynamic_accounts_report/static/src/xml/profit_and_loss_templates.xml
  16. 2
      dynamic_accounts_report/static/src/xml/tax_report_views.xml
  17. 2
      dynamic_accounts_report/static/src/xml/trial_balance_view.xml

2
dynamic_accounts_report/__manifest__.py
View File

@ -21,7 +21,7 @@
################################################################################
{
'name': 'Odoo17 Dynamic Accounting Reports',
'version': '17.0.1.0.0',
'version': '17.0.1.0.1',
'category': 'Accounting',
'summary': "Odoo 17 Accounting Financial Reports,Dynamic Accounting Reports, Dynamic Financial Reports,Dynamic Report Odoo17, Odoo17,Financial Reports, Odoo17 Accounting,Accounting, Odoo Apps",
'description': "This module creates dynamic Accounting General Ledger, Trial"

5
dynamic_accounts_report/doc/RELEASE_NOTES.md
View File

@ -4,8 +4,3 @@
#### Version 17.0.1.0.0
#### ADD
- Initial commit for Dynamic Accounts Reports
#### 19.04.2024
#### Version 17.0.1.0.1
##### BUG FIX
- Updated the scrolling issue of General Ledger

4
dynamic_accounts_report/models/dynamic_balance_sheet_report.py
View File

@ -303,13 +303,13 @@ class ProfitLossReport(models.TransientModel):
amount = sum(filtered_lines.mapped('debit')) - sum(
filtered_lines.mapped('credit'))
entries.append({
'name': "{} - {}".format(account.root_id.id, account.name),
'name': "{} - {}".format(account.code, account.name),
'amount': "{:,.2f}".format(amount),
})
total += amount
else:
entries.append({
'name': "{} - {}".format(account.root_id.id, account.name),
'name': "{} - {}".format(account.code, account.name),
'amount': "{:,.2f}".format(0),
})
return entries, "{:,.2f}".format(total)

156
dynamic_accounts_report/report/balance_sheet_report_templates.xml
View File

@ -6,6 +6,7 @@
<template id="dynamic_accounts_report.balance_sheet">
<t t-call="web.html_container">
<t t-call="web.external_layout">
<t t-set="data_report_dpi" t-value="110"/>
<div class="page">
<h3>
@ -73,28 +74,9 @@
</th>
</t>
</tr>
<t t-foreach="data['datas']" t-as="value"
t-key="value_index">
<t t-if="value_index == 0">
<t t-foreach="value['asset_cash'][0]"
<t t-foreach="data['datas'][0]['asset_cash'][0]"
t-as="datas" t-key="datas_index">
<t t-set="account_name"
t-value="datas['name']"/>
<t t-set="account_value" t-value="0"/>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
<t t-foreach="values['asset_cash'][0]"
t-as="datas" t-key="datas_index">
<t t-if="account_name == datas['name']">
<t t-if="datas['amount'] != '0.00'">
<t t-set="account_value"
t-value="1"/>
</t>
</t>
</t>
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
@ -102,17 +84,17 @@
<t t-esc="datas['name']"/>
</span>
</th>
<!-- Assuming you want to iterate over all values to display -->
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
t-as="values" t-key="values_index">
<t t-foreach="values['asset_cash'][0]"
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
t-as="account"
t-key="account_index">
<t t-if="account['name'] == datas['name']">
<th class="text-end"
style="font-weight: normal;">
<span>
<t t-esc="datas['amount']"/>
<t t-esc="account['amount']"/>
</span>
</th>
</t>
@ -121,8 +103,6 @@
</tr>
</t>
</t>
</t>
</t>
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6" style="font-weight: normal;">
<span style="margin-left: 6%;">Receivables
@ -161,12 +141,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -174,6 +148,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -227,12 +207,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -240,6 +214,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -292,12 +272,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -305,6 +279,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -373,12 +353,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -386,6 +360,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -439,12 +419,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -452,6 +426,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -536,12 +516,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -549,6 +523,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -601,12 +581,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -614,6 +588,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -682,12 +662,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -695,6 +669,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -795,12 +775,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -808,6 +782,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>
@ -876,12 +856,6 @@
</t>
<t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<t t-foreach="data['datas']"
t-as="values"
t-key="values_index">
@ -889,6 +863,12 @@
t-as="datas"
t-key="datas_index">
<t t-if="account_name == datas['name']">
<th colspan="6"
style="font-weight: normal;">
<span style="margin-left: 8%;">
<t t-esc="datas['name']"/>
</span>
</th>
<th class="text-end"
style="font-weight: normal;">
<span>

6
dynamic_accounts_report/static/src/css/accounts_report.css
View File

@ -6,6 +6,6 @@
margin-left: 2px;
margin-right: 2px;
}
html .o_web_client > .o_action_manager {
overflow:scroll;
}

8
dynamic_accounts_report/static/src/js/tax_report.js
View File

@ -82,12 +82,16 @@ class TaxReport extends owl.Component {
const lastIndex = this.state.date_viewed.length - 1;
this.state.date_viewed.splice(0, lastIndex);
}
if (val.target.name === 'start_date') {
if (val && val.target.name === 'start_date') {
this.state.date_viewed = []
this.state.date_viewed.push('From' + ' ' + this.formatDate(this.start_date.el.value) + ' ' + 'To' + ' ' + this.formatDate(this.end_date.el.value))
this.state.date_range = {
...this.state.date_range,
start_date: val.target.value
};
} else if (val.target.name === 'end_date') {
} else if (val && val.target.name === 'end_date') {
this.state.date_viewed = []
this.state.date_viewed.push('From' + ' ' + this.formatDate(this.start_date.el.value) + 'To' + ' ' + this.formatDate(this.end_date.el.value))
this.state.date_range = {
...this.state.date_range,
end_date: val.target.value

8
dynamic_accounts_report/static/src/js/trial_balance.js
View File

@ -101,12 +101,16 @@ class TrialBalance extends owl.Component {
}
}
else {
if (val.target.name === 'start_date') {
if (val && val.target.name === 'start_date') {
this.state.date_viewed = []
this.state.date_viewed.push('From' + ' ' + this.formatDate(this.start_date.el.value) + ' ' + 'To' + ' ' + this.formatDate(this.end_date.el.value))
this.state.date_range = {
...this.state.date_range,
start_date: val.target.value
};
} else if (val.target.name === 'end_date') {
} else if (val && val.target.name === 'end_date') {
this.state.date_viewed = []
this.state.date_viewed.push('From' + ' ' + this.formatDate(this.start_date.el.value) + 'To' + ' ' + this.formatDate(this.end_date.el.value))
this.state.date_range = {
...this.state.date_range,
end_date: val.target.value

2
dynamic_accounts_report/static/src/xml/aged_payable_report_views.xml
View File

@ -117,7 +117,7 @@
</div>
<br/>
<div>
<div class="table_style">
<div class="table_style" style="height: 650px; overflow-y: scroll;">
<!-- Table View -->
<div class="table_view_gl" style="right:20px;width:100%;"
t-ref="table_view_gl">

2
dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
View File

@ -117,7 +117,7 @@
</div>
<br/>
<div>
<div class="table_style">
<div class="table_style" style="height: 650px; overflow-y: scroll;">
<!-- Table View -->
<div class="table_view_gl" style="right:20px;width:100%;"
t-ref="table_view_gl">

5
dynamic_accounts_report/static/src/xml/balance_sheet_template.xml
View File

@ -301,7 +301,7 @@
<br/>
<div>
<!-- Table View -->
<div class="table_view_dfr">
<div class="table_view_dfr" style="height: 650px; overflow-y: scroll;">
<div class="table_main_view">
<table cellspacing="0" width="100%">
<t t-if="state.data">
@ -1147,8 +1147,7 @@
<t t-else="">
<tr class="border-bottom border-gainsboro">
<th colspan="9">
<span class="ms-4">Plus
Non-current Assets
<span class="ms-4">Current Liabilities
</span>
</th>
</tr>

2
dynamic_accounts_report/static/src/xml/bank_flow_templates.xml
View File

@ -173,7 +173,7 @@
</div>
</div>
</div>
<div class="table_style">
<div class="table_style" style="height: 650px; overflow-y: scroll;">
<div class="table_view_gl" style="right:20px;width:100%"
t-ref="table_view_gl">
<div>

2
dynamic_accounts_report/static/src/xml/cash_flow_templates.xml
View File

@ -175,7 +175,7 @@
</div>
</div>
</div>
<div class="table_style">
<div class="table_style" style="height: 650px; overflow-y: scroll;">
<div class="table_view_gl" style="right:20px;width:100%;"
t-ref="table_view_gl">
<div>

2
dynamic_accounts_report/static/src/xml/general_ledger_view.xml
View File

@ -249,7 +249,7 @@
</div>
<br/>
<div>
<div class="table_view_gl" style="right:20px;"
<div class="table_view_gl" style="right:20px;height: 650px; overflow-y: scroll;"
t-ref="table_view_gl">
<div>
<div class="table_main_view">

5
dynamic_accounts_report/static/src/xml/partner_ledger_view.xml
View File

@ -194,7 +194,7 @@
</div>
</div>
<br/>
<div class="table_style">
<div class="table_style" style="height: 650px; overflow-y: scroll;">
<div class="table_view_pl" style="right:20px;width:100%;"
t-ref="table_view_pl">
<div>
@ -240,7 +240,8 @@
<t t-esc="partner"/>
</t>
<t t-else="">
<span>Unknown
<span>
Unknown
Partner
</span>
</t>

2
dynamic_accounts_report/static/src/xml/profit_and_loss_templates.xml
View File

@ -294,7 +294,7 @@
</div>
<br/>
<div>
<div class="table_view_dfr">
<div class="table_view_dfr" style="height: 650px; overflow-y: scroll;">
<div>
<div class="table_main_view">
<table cellspacing="0" width="100%">

2
dynamic_accounts_report/static/src/xml/tax_report_views.xml
View File

@ -248,7 +248,7 @@
</div>
<div>
<!-- Table View -->
<div class="table_view_gl" style="right:20px;"
<div class="table_view_gl" style="right:20px;height: 650px; overflow-y: scroll;"
t-ref="table_view_gl">
<div>
<div class="table_main_view">

2
dynamic_accounts_report/static/src/xml/trial_balance_view.xml
View File

@ -266,7 +266,7 @@
</div>
</div>
</div>
<div class="table_style">
<div class="table_style" style="height: 650px; overflow-y: scroll;">
<!-- Table View -->
<div class="table_view_gl" style="right:20px;width:100%;"
t-ref="table_view_gl">

Write Preview
Loading…
Cancel
Save