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

July 17: [FIX] Bug Fixed 'dynamic_accounts_report'

pull/395/head
Cybrosys Technologies 4 months ago
parent
7a6885caed
commit
33d385e31f
2 changed files with 33 additions and 17 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. 48
      dynamic_accounts_report/report/bank_book_templates.xml
  2. 2
      dynamic_accounts_report/static/src/js/bank_flow.js

48
dynamic_accounts_report/report/bank_book_templates.xml
View File

@ -117,9 +117,9 @@
<th style="width:10% border:0px solid transparent;"> <th style="width:10% border:0px solid transparent;">
<strong> <strong>
<span> <span>
<t t-if="total[move_line]['total_debit']" <t t-if="'total_debit' in total[move_line] and total[move_line]['total_debit']"
t-esc="total[move_line]['currency_id']"/> t-esc="total[move_line]['currency_id']"/>
<t t-if="total[move_line]['total_debit']" <t t-if="'total_debit' in total[move_line] and total[move_line]['total_debit'] and 'total_debit_display' in total[move_line]"
t-esc="total[move_line]['total_debit_display']"/> t-esc="total[move_line]['total_debit_display']"/>
</span> </span>
</strong> </strong>
@ -127,10 +127,17 @@
<th style="width:10% border:0px solid transparent;"> <th style="width:10% border:0px solid transparent;">
<strong> <strong>
<span> <span>
<t t-if="total[move_line]['total_credit']"
t-esc="total[move_line]['currency_id']"/> <t t-if="'total_credit' in total[move_line] and total[move_line]['total_credit']">
<t t-if="total[move_line]['total_credit']" <t t-esc="total[move_line]['currency_id']"/>
t-esc="total[move_line]['total_credit_display']"/> </t>
<t t-if="'total_credit' in total[move_line] and total[move_line]['total_credit'] ">
<t t-esc="total[move_line]['currency_id']"/>
</t>
<t t-if="'total_credit' in total[move_line] and total[move_line]['total_credit'] and 'total_credit_display' in total[move_line]">
<t t-esc="total[move_line]['total_credit_display']"/>
</t>
</span> </span>
</strong> </strong>
</th> </th>
@ -184,18 +191,23 @@
</th> </th>
<th> <th>
<span> <span>
<t t-if="valuelist['debit']" <t t-if="'debit' in valuelist and valuelist['debit']">
t-esc="total[move_line]['currency_id']"/> <t t-esc="total[move_line]['currency_id']"/>
<t t-if="valuelist['debit']" </t>
t-esc="valuelist['debit_display']"/> <t t-if="'debit' in valuelist and valuelist['debit'] and 'debit_display' in valuelist">
<t t-esc="valuelist['debit_display']"/>
</t>
</span> </span>
</th> </th>
<th style="width:10%"> <th style="width:10%">
<span> <span>
<t t-if="valuelist['credit']" <t t-if="'credit' in valuelist and valuelist['credit']">
t-esc="total[move_line]['currency_id']"/> <t t-esc="total[move_line]['currency_id']"/>
<t t-if="valuelist['credit']" </t>
t-esc="valuelist['credit_display']"/> <t t-if="'credit' in valuelist and valuelist['credit'] and 'credit_display' in valuelist">
<t t-esc="valuelist['credit_display']"/>
</t>
</span> </span>
</th> </th>
<th style="width:10%"/> <th style="width:10%"/>
@ -211,11 +223,15 @@
<th style="width:60%;">Total</th> <th style="width:60%;">Total</th>
<th style="width:10%"> <th style="width:10%">
<t t-out="grand_total['currency']"/> <t t-out="grand_total['currency']"/>
<t t-out="grand_total['total_debit_display']"/> <t t-if="'total_debit_display' in grand_total">
<t t-out="grand_total['total_debit_display']"/>
</t>
</th> </th>
<th style="width:10%"> <th style="width:10%">
<t t-out="grand_total['currency']"/> <t t-out="grand_total['currency']"/>
<t t-out="grand_total['total_credit_display']"/> <t t-if="'total_credit_display' in grand_total">
<t t-out="grand_total['total_credit_display']"/>
</t>
</th> </th>
<th style="width:10%"> <th style="width:10%">
<t t-out="grand_total['currency']"/> <t t-out="grand_total['currency']"/>

2
dynamic_accounts_report/static/src/js/bank_flow.js
View File

@ -140,7 +140,7 @@ class BankBook extends owl.Component {
var self = this; var self = this;
let totals = { let totals = {
'total_debit':this.state.total_debit, 'total_debit':this.state.total_debit,
'total_debit_display':this.state.total_debit_display, 'total_debit_display':this.state.total_debit_display ,
'total_credit':this.state.total_credit, 'total_credit':this.state.total_credit,
'total_credit_display':this.state.total_credit_display, 'total_credit_display':this.state.total_credit_display,
'currency':this.state.currency, 'currency':this.state.currency,

Write Preview
Loading…
Cancel
Save