Browse Source

Jun 8 [UPDT] : Bug Fixed 'dynamic_accounts_report'

pull/257/head
AjmalCybro 2 years ago
parent
commit
bf9ec4b3dd
  1. 10
      dynamic_accounts_report/static/description/index.html
  2. 2
      dynamic_accounts_report/static/src/js/financial_reports.js
  3. 10
      dynamic_accounts_report/static/src/xml/financial_reports_view.xml
  4. 1
      dynamic_accounts_report/wizard/balance_sheet.py

10
dynamic_accounts_report/static/description/index.html

@ -10,16 +10,6 @@
class="mr-2"> class="mr-2">
<i class="fa fa-check mr-1"></i>Community <i class="fa fa-check mr-1"></i>Community
</div> </div>
<div
style="color: #875A7B; font-size: 14px; font-family: 'Montserrat', sans-serif; font-weight: bold; background-color: white; display: inline-block; padding: 3px 10px; border-radius: 50px;"
class="mr-2">
<i class="fa fa-check mr-1"></i>Enterprise
</div>
<div
style="color: #017E84; font-size: 14px; font-family: 'Montserrat', sans-serif; font-weight: bold; background-color: white; display: inline-block; padding: 3px 10px; border-radius: 50px;"
class="mr-2">
<i class="fa fa-check mr-1"></i>Odoo.sh
</div>
</div> </div>
</div> </div>
<!-- END OF TITLE BAR --> <!-- END OF TITLE BAR -->

2
dynamic_accounts_report/static/src/js/financial_reports.js

@ -112,6 +112,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
} }
var child=[]; var child=[];
console.log(datas, "datas")
self.$('.table_view_dfr').html(QWeb.render('dfr_table', { self.$('.table_view_dfr').html(QWeb.render('dfr_table', {
report_lines : datas['report_lines'], report_lines : datas['report_lines'],
@ -121,6 +122,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
debit_total : datas['debit_total'], debit_total : datas['debit_total'],
debit_balance : datas['debit_balance'], debit_balance : datas['debit_balance'],
bs_lines : datas['bs_lines'], bs_lines : datas['bs_lines'],
lang: datas['lang'],
})); }));
}); });
} }

10
dynamic_accounts_report/static/src/xml/financial_reports_view.xml

@ -49,7 +49,15 @@
<span> <span>
<t t-esc="account['code']"/> <t t-esc="account['code']"/>
- -
<t t-if="account['name'][lang] and lang != 'en_US'">
<t t-esc="account['name'][lang]"/>
</t>
<t t-elif="account['name']['en_US']">
<t t-esc="account['name']['en_US']"/>
</t>
<t t-else="">
<t t-esc="account['name']"/> <t t-esc="account['name']"/>
</t>
</span> </span>
<div class="" <div class=""
style="display: inline-block;"> style="display: inline-block;">
@ -58,7 +66,7 @@
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false"> aria-expanded="false">
</a> </a>
<div class="dropdown-menu " <div class="dropdown-menu"
role="menu"> role="menu">
<div class="o_foldable_menu o_closed_menu "> <div class="o_foldable_menu o_closed_menu ">
<div class="form-group "> <div class="form-group ">

1
dynamic_accounts_report/wizard/balance_sheet.py

@ -237,6 +237,7 @@ class BalanceSheetView(models.TransientModel):
'debit_balance': records['debit_balance'], 'debit_balance': records['debit_balance'],
'currency': currency, 'currency': currency,
'bs_lines': final_report_lines, 'bs_lines': final_report_lines,
'lang': self.env.context.get('lang') or 'en_US'
} }
def get_filter(self, option): def get_filter(self, option):

Loading…
Cancel
Save