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

May 21: [FIX] Bug Fixed 'dynamic_accounts_report'

pull/317/head
RisvanaCybro 1 year ago
parent
5013dbeff6
commit
d516c19eb6
16 changed files with 281 additions and 299 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified 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. 155
      dynamic_accounts_report/report/balance_sheet_report_templates.xml
  4. 6
      dynamic_accounts_report/static/src/css/accounts_report.css
  5. 8
      dynamic_accounts_report/static/src/js/tax_report.js
  6. 8
      dynamic_accounts_report/static/src/js/trial_balance.js
  7. 2
      dynamic_accounts_report/static/src/xml/aged_payable_report_views.xml
  8. 2
      dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
  9. 5
      dynamic_accounts_report/static/src/xml/balance_sheet_template.xml
  10. 2
      dynamic_accounts_report/static/src/xml/bank_flow_templates.xml
  11. 2
      dynamic_accounts_report/static/src/xml/cash_flow_templates.xml
  12. 2
      dynamic_accounts_report/static/src/xml/general_ledger_view.xml
  13. 5
      dynamic_accounts_report/static/src/xml/partner_ledger_view.xml
  14. 2
      dynamic_accounts_report/static/src/xml/profit_and_loss_templates.xml
  15. 2
      dynamic_accounts_report/static/src/xml/tax_report_views.xml
  16. 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', 'name': 'Odoo17 Dynamic Accounting Reports',
'version': '17.0.1.0.0', 'version': '17.0.1.0.1',
'category': 'Accounting', '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", '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" '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 #### Version 17.0.1.0.0
#### ADD #### ADD
- Initial commit for Dynamic Accounts Reports - Initial commit for Dynamic Accounts Reports
#### 19.04.2024
#### Version 17.0.1.0.1
##### BUG FIX
- Updated the scrolling issue of General Ledger

155
dynamic_accounts_report/report/balance_sheet_report_templates.xml
View File

@ -74,28 +74,9 @@
</th> </th>
</t> </t>
</tr> </tr>
<t t-foreach="data['datas']" t-as="value" <t t-foreach="data['datas'][0]['asset_cash'][0]"
t-key="value_index">
<t t-if="value_index == 0">
<t t-foreach="value['asset_cash'][0]"
t-as="datas" t-key="datas_index"> 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-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;"> <tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6" <th colspan="6"
style="font-weight: normal;"> style="font-weight: normal;">
@ -103,17 +84,17 @@
<t t-esc="datas['name']"/> <t t-esc="datas['name']"/>
</span> </span>
</th> </th>
<!-- Assuming you want to iterate over all values to display -->
<t t-foreach="data['datas']" <t t-foreach="data['datas']"
t-as="values" t-as="values" t-key="values_index">
t-key="values_index">
<t t-foreach="values['asset_cash'][0]" <t t-foreach="values['asset_cash'][0]"
t-as="datas" t-as="account"
t-key="datas_index"> t-key="account_index">
<t t-if="account_name == datas['name']"> <t t-if="account['name'] == datas['name']">
<th class="text-end" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
<t t-esc="datas['amount']"/> <t t-esc="account['amount']"/>
</span> </span>
</th> </th>
</t> </t>
@ -122,8 +103,6 @@
</tr> </tr>
</t> </t>
</t> </t>
</t>
</t>
<tr style="border-bottom: 1px solid gainsboro;"> <tr style="border-bottom: 1px solid gainsboro;">
<th colspan="6" style="font-weight: normal;"> <th colspan="6" style="font-weight: normal;">
<span style="margin-left: 6%;">Receivables <span style="margin-left: 6%;">Receivables
@ -162,12 +141,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -175,6 +148,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -228,12 +207,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -241,6 +214,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -293,12 +272,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -306,6 +279,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -374,12 +353,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -387,6 +360,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -440,12 +419,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -453,6 +426,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -537,12 +516,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -550,6 +523,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -602,12 +581,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -615,6 +588,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -683,12 +662,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -696,6 +669,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -796,12 +775,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -809,6 +782,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>
@ -877,12 +856,6 @@
</t> </t>
<t t-if="account_value == 1"> <t t-if="account_value == 1">
<tr style="border-bottom: 1px solid gainsboro;"> <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 t-foreach="data['datas']"
t-as="values" t-as="values"
t-key="values_index"> t-key="values_index">
@ -890,6 +863,12 @@
t-as="datas" t-as="datas"
t-key="datas_index"> t-key="datas_index">
<t t-if="account_name == datas['name']"> <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" <th class="text-end"
style="font-weight: normal;"> style="font-weight: normal;">
<span> <span>

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

@ -6,6 +6,6 @@
margin-left: 2px; margin-left: 2px;
margin-right: 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; const lastIndex = this.state.date_viewed.length - 1;
this.state.date_viewed.splice(0, lastIndex); 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 = {
...this.state.date_range, ...this.state.date_range,
start_date: val.target.value 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 = {
...this.state.date_range, ...this.state.date_range,
end_date: val.target.value 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 { 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 = {
...this.state.date_range, ...this.state.date_range,
start_date: val.target.value 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 = {
...this.state.date_range, ...this.state.date_range,
end_date: val.target.value end_date: val.target.value

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

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

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

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

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

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

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

@ -173,7 +173,7 @@
</div> </div>
</div> </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%" <div class="table_view_gl" style="right:20px;width:100%"
t-ref="table_view_gl"> t-ref="table_view_gl">
<div> <div>

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

@ -175,7 +175,7 @@
</div> </div>
</div> </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%;" <div class="table_view_gl" style="right:20px;width:100%;"
t-ref="table_view_gl"> t-ref="table_view_gl">
<div> <div>

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

@ -249,7 +249,7 @@
</div> </div>
<br/> <br/>
<div> <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"> t-ref="table_view_gl">
<div> <div>
<div class="table_main_view"> <div class="table_main_view">

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

@ -194,7 +194,7 @@
</div> </div>
</div> </div>
<br/> <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%;" <div class="table_view_pl" style="right:20px;width:100%;"
t-ref="table_view_pl"> t-ref="table_view_pl">
<div> <div>
@ -240,7 +240,8 @@
<t t-esc="partner"/> <t t-esc="partner"/>
</t> </t>
<t t-else=""> <t t-else="">
<span>Unknown <span>
Unknown
Partner Partner
</span> </span>
</t> </t>

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

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

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

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

Write Preview
Loading…
Cancel
Save