diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py index 07f1bbc0e..ce101148e 100644 --- a/dynamic_accounts_report/__manifest__.py +++ b/dynamic_accounts_report/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Dynamic Financial Reports', - 'version': '14.0.1.0.0', + 'version': '14.0.1.1.1', 'category': 'Accounting', 'summary': """Dynamic Financial Reports with drill down and filters– Community Edition""", diff --git a/dynamic_accounts_report/doc/RELEASE_NOTES.md b/dynamic_accounts_report/doc/RELEASE_NOTES.md index ffaa70544..64e8f7e55 100644 --- a/dynamic_accounts_report/doc/RELEASE_NOTES.md +++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md @@ -5,7 +5,10 @@ #### ADD - Initial commit for Odoo 14 dynamic financial reports - +#### 21.05.2021 +#### Version 14.0.1.1.1 +#### UPDT +- Updated Style and Currency Format diff --git a/dynamic_accounts_report/report/ageing.py b/dynamic_accounts_report/report/ageing.py index ca64433fb..3764f7f73 100644 --- a/dynamic_accounts_report/report/ageing.py +++ b/dynamic_accounts_report/report/ageing.py @@ -12,6 +12,7 @@ class PartnerAgeing(models.AbstractModel): data.update( {'account_data': data.get('report_data')['report_lines'][0], 'Filters': data.get('report_data')['filters'], + 'company': self.env.company, }) diff --git a/dynamic_accounts_report/report/ageing.xml b/dynamic_accounts_report/report/ageing.xml index 8949af8b2..9eee843df 100644 --- a/dynamic_accounts_report/report/ageing.xml +++ b/dynamic_accounts_report/report/ageing.xml @@ -7,7 +7,7 @@
-

: Partner Ageing +

: Partner Ageing

As On Date: diff --git a/dynamic_accounts_report/report/cash_flow_report.py b/dynamic_accounts_report/report/cash_flow_report.py index 5add945d0..b8077ecd8 100644 --- a/dynamic_accounts_report/report/cash_flow_report.py +++ b/dynamic_accounts_report/report/cash_flow_report.py @@ -8,9 +8,9 @@ class GeneralLedger(models.AbstractModel): def _get_report_values(self, docids, data=None): if self.env.context.get('trial_pdf_report'): - if data.get('report_data'): data.update({'account_data': data.get('report_data')['report_lines'], 'Filters': data.get('report_data')['filters'], + 'company': self.env.company, }) return data diff --git a/dynamic_accounts_report/report/cash_flow_report.xml b/dynamic_accounts_report/report/cash_flow_report.xml index f1c7099e4..b9c6d36fe 100644 --- a/dynamic_accounts_report/report/cash_flow_report.xml +++ b/dynamic_accounts_report/report/cash_flow_report.xml @@ -18,21 +18,23 @@

Cash Flow statements

-
- -

- Target Moves: - -
- +

+ Target move: +
  • + +
  • +
    + +
    + Level : - - +
  • + +
  • + -

    - -
    +
    diff --git a/dynamic_accounts_report/report/daybook.py b/dynamic_accounts_report/report/daybook.py index f832a51b7..4af37cec4 100644 --- a/dynamic_accounts_report/report/daybook.py +++ b/dynamic_accounts_report/report/daybook.py @@ -12,5 +12,6 @@ class DayBook(models.AbstractModel): if data.get('report_data'): data.update({'account_data': data.get('report_data')['report_lines'], 'Filters': data.get('report_data')['filters'], + 'company': self.env.company, }) return data \ No newline at end of file diff --git a/dynamic_accounts_report/report/daybook.xml b/dynamic_accounts_report/report/daybook.xml index 979fd622f..c3593def8 100644 --- a/dynamic_accounts_report/report/daybook.xml +++ b/dynamic_accounts_report/report/daybook.xml @@ -7,7 +7,7 @@
    -

    : Day Book +

    : Day Book

    diff --git a/dynamic_accounts_report/report/financial_report_template.xml b/dynamic_accounts_report/report/financial_report_template.xml index 310e6ce0f..6bd2608ee 100644 --- a/dynamic_accounts_report/report/financial_report_template.xml +++ b/dynamic_accounts_report/report/financial_report_template.xml @@ -7,7 +7,7 @@
    -

    : +

    :

    @@ -71,12 +71,7 @@
    Target move:
  • - - All - - - Posted - +
  • @@ -113,15 +108,15 @@ + t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/> + t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/> + t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/> diff --git a/dynamic_accounts_report/report/financial_reports.py b/dynamic_accounts_report/report/financial_reports.py index 5036579af..76c6bdd37 100644 --- a/dynamic_accounts_report/report/financial_reports.py +++ b/dynamic_accounts_report/report/financial_reports.py @@ -15,5 +15,6 @@ class InsReportBalanceSheet(models.AbstractModel): 'report_lines': data.get('report_data')['bs_lines'], 'report_name': data.get('report_name'), 'title': data.get('report_data')['name'], + 'company': self.env.company, }) return data diff --git a/dynamic_accounts_report/report/general_ledger.py b/dynamic_accounts_report/report/general_ledger.py index 1b6098128..2572b6a5e 100644 --- a/dynamic_accounts_report/report/general_ledger.py +++ b/dynamic_accounts_report/report/general_ledger.py @@ -15,5 +15,6 @@ class GeneralLedger(models.AbstractModel): 'debit_total': data.get('report_data')['debit_total'], 'credit_total': data.get('report_data')['credit_total'], 'title': data.get('report_data')['name'], + 'company': self.env.company, }) return data diff --git a/dynamic_accounts_report/report/general_ledger.xml b/dynamic_accounts_report/report/general_ledger.xml index aab40a115..63f8b958c 100644 --- a/dynamic_accounts_report/report/general_ledger.xml +++ b/dynamic_accounts_report/report/general_ledger.xml @@ -1,7 +1,5 @@ - -