From f7e5dce5bd32256e9c91cbddd2e5861b2ca5c721 Mon Sep 17 00:00:00 2001 From: Ajmal Cybro Date: Mon, 24 May 2021 15:21:11 +0530 Subject: [PATCH] [UPDT] Style and Currency symbol fix --- dynamic_accounts_report/__manifest__.py | 2 +- dynamic_accounts_report/doc/RELEASE_NOTES.md | 5 +- dynamic_accounts_report/report/ageing.py | 1 + dynamic_accounts_report/report/ageing.xml | 2 +- .../report/cash_flow_report.py | 2 +- .../report/cash_flow_report.xml | 26 +- dynamic_accounts_report/report/daybook.py | 1 + dynamic_accounts_report/report/daybook.xml | 2 +- .../report/financial_report_template.xml | 15 +- .../report/financial_reports.py | 1 + .../report/general_ledger.py | 1 + .../report/general_ledger.xml | 39 +- .../report/partner_ledger.py | 1 + .../report/partner_ledger.xml | 2 +- .../report/trial_balance.py | 1 + .../report/trial_balance.xml | 2 +- .../security/ir.model.access.csv | 14 +- .../description/assets/arrow-circle-black.png | Bin 0 -> 63073 bytes .../assets/arrow-circle-magenta.png | Bin 0 -> 48768 bytes .../static/description/assets/feature-1.png | Bin 0 -> 142399 bytes .../static/description/assets/feature-2.png | Bin 0 -> 254736 bytes .../static/description/assets/hero.png | Bin 0 -> 137016 bytes .../static/description/assets/icons/ecom.png | Bin 0 -> 2364 bytes .../description/assets/icons/education.png | Bin 0 -> 2985 bytes .../static/description/assets/icons/hotel.png | Bin 0 -> 2373 bytes .../assets/icons/manufacturing.png | Bin 0 -> 2722 bytes .../static/description/assets/icons/pos.png | Bin 0 -> 2468 bytes .../description/assets/icons/restaurant.png | Bin 0 -> 2487 bytes .../description/assets/icons/service.png | Bin 0 -> 5348 bytes .../description/assets/icons/trading.png | Bin 0 -> 1425 bytes .../assets/modules/advanced_ecom.png | Bin 0 -> 101730 bytes .../assets/modules/export_excel.png | Bin 0 -> 84053 bytes .../assets/modules/functional_tutorial.png | Bin 0 -> 121069 bytes .../description/assets/modules/gantt_view.png | Bin 0 -> 62188 bytes .../modules/mobile_service.png} | Bin .../assets/modules/shopify_connector.png | Bin 0 -> 95574 bytes .../description/assets/respnsive-img.png | Bin 0 -> 277659 bytes .../static/description/assets/responsive.jpg | Bin 0 -> 92635 bytes .../01_dynamic_financial_reports.png} | Bin .../screenshots/02_dynamic_gl.png} | Bin .../screenshots/03_access_je.png} | Bin .../screenshots/04_gl_pdf.png} | Bin .../screenshots/05_gl_xlsx.png} | Bin .../screenshots/06_dynamic_tb.png} | Bin .../screenshots/07_access_gl_from_tb.png} | Bin .../screenshots/08_tb_pdf.png} | Bin .../screenshots/09_tb_xlsx.png} | Bin .../screenshots/10_pl_m.png} | Bin .../screenshots/11_pl_pdf.png} | Bin .../screenshots/12_pl_xls.png} | Bin .../screenshots/13_bs_m.png} | Bin .../screenshots/14_bs_pdf.png} | Bin .../screenshots/15_bs_pdf.png} | Bin .../screenshots/16_pl_m1.png} | Bin .../screenshots/17_pal_pdf.png} | Bin .../screenshots/18_pal_xls.png} | Bin .../description/images/Accounting kit -2.png | Bin 482011 -> 0 bytes .../static/description/images/BB_m.png | Bin 68160 -> 0 bytes .../images/account_dynamic_report_banner.gif | Bin 336061 -> 0 bytes .../images/accounting_kit_window.gif | Bin 729616 -> 0 bytes .../images/auto_payroll_banner.png | Bin 95645 -> 0 bytes .../static/description/images/bb_pdf.png | Bin 55852 -> 0 bytes .../static/description/images/bb_xls.png | Bin 42603 -> 0 bytes .../static/description/images/bud_banner.png | Bin 92482 -> 0 bytes .../static/description/images/cb_m.png | Bin 40381 -> 0 bytes .../static/description/images/cb_pdf.png | Bin 38889 -> 0 bytes .../static/description/images/cb_xls.png | Bin 33789 -> 0 bytes .../static/description/images/cf.png | Bin 53123 -> 0 bytes .../static/description/images/cf_pdf.png | Bin 52063 -> 0 bytes .../static/description/images/cf_xls.png | Bin 59125 -> 0 bytes .../static/description/images/checked.png | Bin 15093 -> 0 bytes .../images/crm_dashboard_banner.gif | Bin 113811 -> 0 bytes .../static/description/images/cybrosys.png | Bin 52522 -> 0 bytes .../static/description/images/db_m.png | Bin 45983 -> 0 bytes .../static/description/images/db_pdf.png | Bin 81452 -> 0 bytes .../static/description/images/db_xls.png | Bin 82197 -> 0 bytes .../description/images/dynamic_banner.gif | Bin 218133 -> 0 bytes .../description/images/hr_acc_cc_banner.png | Bin 98052 -> 0 bytes .../description/images/o_hrms_banner.gif | Bin 90859 -> 0 bytes .../images/odoo11_magento_banner.jpg | Bin 114592 -> 0 bytes .../static/description/images/pa_m.png | Bin 38916 -> 0 bytes .../static/description/images/pa_pdf.png | Bin 47841 -> 0 bytes .../static/description/images/pa_xls.png | Bin 43650 -> 0 bytes .../description/images/payroll_banner.gif | Bin 41508 -> 0 bytes .../images/project_custome_gantt_banner.gif | Bin 349660 -> 0 bytes .../images/report_maker_banner.gif | Bin 114520 -> 0 bytes .../static/description/index.html | 1795 +++++++++-------- .../static/src/js/ageing.js | 2 +- .../static/src/js/cash_flow.js | 4 +- .../static/src/js/daybook.js | 4 +- .../static/src/js/financial_reports.js | 4 +- .../static/src/js/general_ledger.js | 5 +- .../static/src/js/partner_ledger.js | 3 +- .../static/src/js/trial_balance.js | 2 +- .../static/src/xml/ageing.xml | 16 +- .../static/src/xml/cash_flow_view.xml | 14 +- .../static/src/xml/daybook.xml | 451 +++-- .../static/src/xml/financial_reports_view.xml | 7 +- .../static/src/xml/general_ledger_view.xml | 27 +- .../static/src/xml/partner_ledger_view.xml | 29 +- .../static/src/xml/trial_balance_view.xml | 16 +- dynamic_accounts_report/views/views.xml | 10 +- dynamic_accounts_report/wizard/ageing.py | 14 +- .../wizard/balance_sheet.py | 67 +- .../wizard/balance_sheet_config.py | 4 - dynamic_accounts_report/wizard/cash_flow.py | 14 +- dynamic_accounts_report/wizard/daybook.py | 19 +- .../wizard/general_ledger.py | 46 +- .../wizard/partner_leadger.py | 26 +- .../wizard/trial_balance.py | 18 +- 110 files changed, 1499 insertions(+), 1215 deletions(-) create mode 100644 dynamic_accounts_report/static/description/assets/arrow-circle-black.png create mode 100644 dynamic_accounts_report/static/description/assets/arrow-circle-magenta.png create mode 100644 dynamic_accounts_report/static/description/assets/feature-1.png create mode 100644 dynamic_accounts_report/static/description/assets/feature-2.png create mode 100644 dynamic_accounts_report/static/description/assets/hero.png create mode 100644 dynamic_accounts_report/static/description/assets/icons/ecom.png create mode 100644 dynamic_accounts_report/static/description/assets/icons/education.png create mode 100644 dynamic_accounts_report/static/description/assets/icons/hotel.png create mode 100644 dynamic_accounts_report/static/description/assets/icons/manufacturing.png create mode 100644 dynamic_accounts_report/static/description/assets/icons/pos.png create mode 100644 dynamic_accounts_report/static/description/assets/icons/restaurant.png create mode 100644 dynamic_accounts_report/static/description/assets/icons/service.png create mode 100644 dynamic_accounts_report/static/description/assets/icons/trading.png create mode 100644 dynamic_accounts_report/static/description/assets/modules/advanced_ecom.png create mode 100644 dynamic_accounts_report/static/description/assets/modules/export_excel.png create mode 100644 dynamic_accounts_report/static/description/assets/modules/functional_tutorial.png create mode 100644 dynamic_accounts_report/static/description/assets/modules/gantt_view.png rename dynamic_accounts_report/static/description/{images/mobile_service_shop_pro_banner.png => assets/modules/mobile_service.png} (100%) create mode 100644 dynamic_accounts_report/static/description/assets/modules/shopify_connector.png create mode 100644 dynamic_accounts_report/static/description/assets/respnsive-img.png create mode 100644 dynamic_accounts_report/static/description/assets/responsive.jpg rename dynamic_accounts_report/static/description/{images/dynamic_financial_reports.png => assets/screenshots/01_dynamic_financial_reports.png} (100%) rename dynamic_accounts_report/static/description/{images/dynamic_gl.png => assets/screenshots/02_dynamic_gl.png} (100%) rename dynamic_accounts_report/static/description/{images/gl_journal.png => assets/screenshots/03_access_je.png} (100%) rename dynamic_accounts_report/static/description/{images/gl_pdf.png => assets/screenshots/04_gl_pdf.png} (100%) rename dynamic_accounts_report/static/description/{images/gl_xlsx.png => assets/screenshots/05_gl_xlsx.png} (100%) rename dynamic_accounts_report/static/description/{images/dynamic_tb.png => assets/screenshots/06_dynamic_tb.png} (100%) rename dynamic_accounts_report/static/description/{images/tb_gl.png => assets/screenshots/07_access_gl_from_tb.png} (100%) rename dynamic_accounts_report/static/description/{images/tb_pdf.png => assets/screenshots/08_tb_pdf.png} (100%) rename dynamic_accounts_report/static/description/{images/tb_xlsx.png => assets/screenshots/09_tb_xlsx.png} (100%) rename dynamic_accounts_report/static/description/{images/pl_m.png => assets/screenshots/10_pl_m.png} (100%) rename dynamic_accounts_report/static/description/{images/pl_pdf.png => assets/screenshots/11_pl_pdf.png} (100%) rename dynamic_accounts_report/static/description/{images/pl_xls.png => assets/screenshots/12_pl_xls.png} (100%) rename dynamic_accounts_report/static/description/{images/bs_m.png => assets/screenshots/13_bs_m.png} (100%) rename dynamic_accounts_report/static/description/{images/bs_pdf.png => assets/screenshots/14_bs_pdf.png} (100%) rename dynamic_accounts_report/static/description/{images/bs_xls.png => assets/screenshots/15_bs_pdf.png} (100%) rename dynamic_accounts_report/static/description/{images/pl_m1.png => assets/screenshots/16_pl_m1.png} (100%) rename dynamic_accounts_report/static/description/{images/pal_pdf.png => assets/screenshots/17_pal_pdf.png} (100%) rename dynamic_accounts_report/static/description/{images/pal_xls.png => assets/screenshots/18_pal_xls.png} (100%) delete mode 100644 dynamic_accounts_report/static/description/images/Accounting kit -2.png delete mode 100644 dynamic_accounts_report/static/description/images/BB_m.png delete mode 100644 dynamic_accounts_report/static/description/images/account_dynamic_report_banner.gif delete mode 100644 dynamic_accounts_report/static/description/images/accounting_kit_window.gif delete mode 100644 dynamic_accounts_report/static/description/images/auto_payroll_banner.png delete mode 100644 dynamic_accounts_report/static/description/images/bb_pdf.png delete mode 100644 dynamic_accounts_report/static/description/images/bb_xls.png delete mode 100644 dynamic_accounts_report/static/description/images/bud_banner.png delete mode 100644 dynamic_accounts_report/static/description/images/cb_m.png delete mode 100644 dynamic_accounts_report/static/description/images/cb_pdf.png delete mode 100644 dynamic_accounts_report/static/description/images/cb_xls.png delete mode 100644 dynamic_accounts_report/static/description/images/cf.png delete mode 100644 dynamic_accounts_report/static/description/images/cf_pdf.png delete mode 100644 dynamic_accounts_report/static/description/images/cf_xls.png delete mode 100644 dynamic_accounts_report/static/description/images/checked.png delete mode 100644 dynamic_accounts_report/static/description/images/crm_dashboard_banner.gif delete mode 100644 dynamic_accounts_report/static/description/images/cybrosys.png delete mode 100644 dynamic_accounts_report/static/description/images/db_m.png delete mode 100644 dynamic_accounts_report/static/description/images/db_pdf.png delete mode 100644 dynamic_accounts_report/static/description/images/db_xls.png delete mode 100644 dynamic_accounts_report/static/description/images/dynamic_banner.gif delete mode 100644 dynamic_accounts_report/static/description/images/hr_acc_cc_banner.png delete mode 100644 dynamic_accounts_report/static/description/images/o_hrms_banner.gif delete mode 100644 dynamic_accounts_report/static/description/images/odoo11_magento_banner.jpg delete mode 100644 dynamic_accounts_report/static/description/images/pa_m.png delete mode 100644 dynamic_accounts_report/static/description/images/pa_pdf.png delete mode 100644 dynamic_accounts_report/static/description/images/pa_xls.png delete mode 100644 dynamic_accounts_report/static/description/images/payroll_banner.gif delete mode 100644 dynamic_accounts_report/static/description/images/project_custome_gantt_banner.gif delete mode 100644 dynamic_accounts_report/static/description/images/report_maker_banner.gif 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 @@ - -