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

Apr 29: [FIX] Bug Fixed 'dynamic_accounts_report'

pull/317/head
RisvanaCybro 1 year ago
parent
97e3ed8f3c
commit
0a1141b6f9
11 changed files with 177 additions and 173 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. 3
      dynamic_accounts_report/static/src/css/accounts_report.css
  2. 2
      dynamic_accounts_report/static/src/xml/aged_payable_report_views.xml
  3. 2
      dynamic_accounts_report/static/src/xml/aged_receivable_report_views.xml
  4. 2
      dynamic_accounts_report/static/src/xml/balance_sheet_template.xml
  5. 2
      dynamic_accounts_report/static/src/xml/bank_flow_templates.xml
  6. 2
      dynamic_accounts_report/static/src/xml/cash_flow_templates.xml
  7. 2
      dynamic_accounts_report/static/src/xml/general_ledger_view.xml
  8. 329
      dynamic_accounts_report/static/src/xml/partner_ledger_view.xml
  9. 2
      dynamic_accounts_report/static/src/xml/profit_and_loss_templates.xml
  10. 2
      dynamic_accounts_report/static/src/xml/tax_report_views.xml
  11. 2
      dynamic_accounts_report/static/src/xml/trial_balance_view.xml

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

@ -6,3 +6,6 @@
margin-left: 2px; margin-left: 2px;
margin-right: 2px; margin-right: 2px;
} }

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">

2
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">

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">

329
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>
@ -218,189 +218,190 @@
</thead> </thead>
<!-- Table Body --> <!-- Table Body -->
<tbody t-ref="tbody"> <tbody t-ref="tbody">
<!-- Iterate over partners --> <!-- Iterate over partners -->
<t t-if="state.partners"> <t t-if="state.partners">
<t t-set="i" t-value="0"/> <t t-set="i" t-value="0"/>
<t t-foreach="state.partners" <t t-foreach="state.partners"
t-as="partner" t-as="partner"
t-key="partner_index"> t-key="partner_index">
<t t-set="i" t-value="i + 1"/> <t t-set="i" t-value="i + 1"/>
<tr class="border-bottom border-dark border-gainsboro"> <tr class="border-bottom border-dark border-gainsboro">
<th> <th>
<div data-bs-toggle="collapse" <div data-bs-toggle="collapse"
t-attf-href="#partner-{{i}}" t-attf-href="#partner-{{i}}"
aria-expanded="false" aria-expanded="false"
t-attf-aria-controls="partner-{{i}}" t-attf-aria-controls="partner-{{i}}"
class="ms-3 collapsed"> class="ms-3 collapsed">
<a class="btn header o_heading"> <a class="btn header o_heading">
<span class="toggle-icon"> <span class="toggle-icon">
<i class="fa fa-caret-down"/> <i class="fa fa-caret-down"/>
</span>
<t t-if="partner != 'false'">
<t t-esc="partner"/>
</t>
<t t-else="">
<span>Unknown
Partner
</span> </span>
</t> <t t-if="partner != 'false'">
</a> <t t-esc="partner"/>
</div> </t>
</th> <t t-else="">
<th colspan="5"> <span>
<!-- Open Partner Button --> Unknown
<button t-att-data-id="state.total[partner]['partner_id']" Partner
class="o_journal" </span>
t-on-click="openPartner"> </t>
<i class="fa fa-arrow-right"/>
Open
</button>
<!-- Journal Items Button -->
<button t-att-data-id="state.total[partner]['partner_id']"
class="o_journal"
t-on-click="gotoJournalItem">
<i class="fa fa-arrow-right"/>
Journal Items
</button>
</th>
<th/>
<th/>
<th/>
<th/>
<th/>
<th>
<span>
<t t-if="state.total[partner]['total_debit']"
t-esc="state.total[partner]['currency_id']"/>
<t t-if="state.total[partner]['total_debit']"
t-esc="state.total[partner]['total_debit']"/>
</span>
</th>
<th>
<span>
<t t-if="state.total[partner]['total_credit']"
t-esc="state.total[partner]['currency_id']"/>
<t t-if="state.total[partner]['total_credit']"
t-esc="state.total[partner]['total_credit']"/>
</span>
</th>
<th/>
<th>
<span class="fw-bolder">
<t t-esc="state.total[partner]['currency_id']"/>
<t t-esc="(state.total[partner]['total_debit'] - state.total[partner]['total_credit']).toFixed(2)"/>
</span>
</th>
</tr>
<!-- Iterate over partner's value list -->
<t t-foreach="state.data[partner]"
t-as="valuelist"
t-key="valuelist_index">
<t t-log="valuelist"/>
<tr class="border-bottom border-gainsboro collapse"
t-attf-id="partner-{{i}}"
t-att-data-id="valuelist[0]['move_id'][0]">
<th colspan="6">
<span style="gap: 12px;display: flex;">
<t t-esc="valuelist[0]['date']"/>
<a type="button"
class="dropdown-toggle"
data-bs-toggle="dropdown">
</a> </a>
<div class="dropdown-menu journals"> </div>
<button t-att-data-id="valuelist[0]['move_id'][0]"
type="button"
t-on-click="gotoJournalEntry"
style="border: none;
background-color: inherit;
padding: 4px 8px;
font-size: 16px;
cursor: pointer;
display: inline-block;">
View
Journal
Entry
</button>
<div role="separator"
class="dropdown-divider"/>
</div>
</span>
</th>
<th>
<span>
<t t-esc="valuelist[0]['jrnl']"/>
</span>
</th> </th>
<th> <th colspan="5">
<span> <!-- Open Partner Button -->
<t t-esc="valuelist[0]['code']"/> <button t-att-data-id="state.total[partner]['partner_id']"
</span> class="o_journal"
</th> t-on-click="openPartner">
<th> <i class="fa fa-arrow-right"/>
<span> Open
<t t-if="valuelist[0]['move_name']" </button>
t-esc="valuelist[0]['move_name']"/> <!-- Journal Items Button -->
</span> <button t-att-data-id="state.total[partner]['partner_id']"
</th> class="o_journal"
<th> t-on-click="gotoJournalItem">
<span> <i class="fa fa-arrow-right"/>
<t t-if="valuelist[0]['date_maturity']" Journal Items
t-esc="valuelist[0]['date_maturity']"/> </button>
</span>
</th> </th>
<th/>
<th/>
<th/>
<th/>
<th/>
<th> <th>
<span> <span>
<t t-if="valuelist[0]['matching_number']" <t t-if="state.total[partner]['total_debit']"
t-esc="valuelist[0]['matching_number']"/>
</span>
</th>
<th>
<span>
<t t-if="valuelist[0]['debit']"
t-esc="state.total[partner]['currency_id']"/> t-esc="state.total[partner]['currency_id']"/>
<t t-if="valuelist[0]['debit']" <t t-if="state.total[partner]['total_debit']"
t-esc="valuelist[0]['debit']"/> t-esc="state.total[partner]['total_debit']"/>
</span> </span>
</th> </th>
<th> <th>
<span> <span>
<t t-if="valuelist[0]['credit']" <t t-if="state.total[partner]['total_credit']"
t-esc="state.total[partner]['currency_id']"/> t-esc="state.total[partner]['currency_id']"/>
<t t-if="valuelist[0]['credit']" <t t-if="state.total[partner]['total_credit']"
t-esc="valuelist[0]['credit']"/> t-esc="state.total[partner]['total_credit']"/>
</span> </span>
</th> </th>
<th/>
<th> <th>
<span> <span class="fw-bolder">
<t t-if="valuelist[0]['amount_currency']" <t t-esc="state.total[partner]['currency_id']"/>
t-esc="state.total[partner]['currency_id']"/> <t t-esc="(state.total[partner]['total_debit'] - state.total[partner]['total_credit']).toFixed(2)"/>
<t t-if="valuelist[0]['amount_currency']"
t-esc="valuelist[0]['amount_currency']"/>
</span> </span>
</th> </th>
</tr> </tr>
<!-- Iterate over partner's value list -->
<t t-foreach="state.data[partner]"
t-as="valuelist"
t-key="valuelist_index">
<t t-log="valuelist"/>
<tr class="border-bottom border-gainsboro collapse"
t-attf-id="partner-{{i}}"
t-att-data-id="valuelist[0]['move_id'][0]">
<th colspan="6">
<span style="gap: 12px;display: flex;">
<t t-esc="valuelist[0]['date']"/>
<a type="button"
class="dropdown-toggle"
data-bs-toggle="dropdown">
</a>
<div class="dropdown-menu journals">
<button t-att-data-id="valuelist[0]['move_id'][0]"
type="button"
t-on-click="gotoJournalEntry"
style="border: none;
background-color: inherit;
padding: 4px 8px;
font-size: 16px;
cursor: pointer;
display: inline-block;">
View
Journal
Entry
</button>
<div role="separator"
class="dropdown-divider"/>
</div>
</span>
</th>
<th>
<span>
<t t-esc="valuelist[0]['jrnl']"/>
</span>
</th>
<th>
<span>
<t t-esc="valuelist[0]['code']"/>
</span>
</th>
<th>
<span>
<t t-if="valuelist[0]['move_name']"
t-esc="valuelist[0]['move_name']"/>
</span>
</th>
<th>
<span>
<t t-if="valuelist[0]['date_maturity']"
t-esc="valuelist[0]['date_maturity']"/>
</span>
</th>
<th>
<span>
<t t-if="valuelist[0]['matching_number']"
t-esc="valuelist[0]['matching_number']"/>
</span>
</th>
<th>
<span>
<t t-if="valuelist[0]['debit']"
t-esc="state.total[partner]['currency_id']"/>
<t t-if="valuelist[0]['debit']"
t-esc="valuelist[0]['debit']"/>
</span>
</th>
<th>
<span>
<t t-if="valuelist[0]['credit']"
t-esc="state.total[partner]['currency_id']"/>
<t t-if="valuelist[0]['credit']"
t-esc="valuelist[0]['credit']"/>
</span>
</th>
<th>
<span>
<t t-if="valuelist[0]['amount_currency']"
t-esc="state.total[partner]['currency_id']"/>
<t t-if="valuelist[0]['amount_currency']"
t-esc="valuelist[0]['amount_currency']"/>
</span>
</th>
</tr>
</t>
</t> </t>
</t> </t>
</t> <tr>
<tr> <th/>
<th/> <th colspan="10" class="o_heading">
<th colspan="10" class="o_heading"> Total
Total </th>
</th> <th class="o_heading">
<th class="o_heading"> <t t-esc="state.currency"/>
<t t-esc="state.currency"/> <t t-out="state.total_debit"/>
<t t-out="state.total_debit"/> </th>
</th> <th class="o_heading">
<th class="o_heading"> <t t-esc="state.currency"/>
<t t-esc="state.currency"/> <t t-out="state.total_credit"/>
<t t-out="state.total_credit"/> </th>
</th> <th/>
<th/> <th class="o_heading">
<th class="o_heading"> <t t-esc="state.currency"/>
<t t-esc="state.currency"/> <t t-out="(state.total_debit - state.total_credit).toFixed(2)"/>
<t t-out="(state.total_debit - state.total_credit).toFixed(2)"/> </th>
</th> </tr>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>

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