diff --git a/dynamic_accounts_report/__manifest__.py b/dynamic_accounts_report/__manifest__.py index ce101148e..f4ec7e7dc 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.1.1', + 'version': '14.0.1.2.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 64e8f7e55..ab3ad9589 100644 --- a/dynamic_accounts_report/doc/RELEASE_NOTES.md +++ b/dynamic_accounts_report/doc/RELEASE_NOTES.md @@ -10,5 +10,10 @@ #### UPDT - Updated Style and Currency Format +#### 27.05.2021 +#### Version 14.0.1.2.1 +#### UPDT +- Ageing Report. + diff --git a/dynamic_accounts_report/report/ageing.xml b/dynamic_accounts_report/report/ageing.xml index 9eee843df..ae7084692 100644 --- a/dynamic_accounts_report/report/ageing.xml +++ b/dynamic_accounts_report/report/ageing.xml @@ -53,11 +53,11 @@ JRNL Account Not Due - 0 - 20 - 20 - 40 - 40 - 60 - 60 - 80 - 80 + + 0 - 30 + 30 - 60 + 60 - 90 + 90 - 120 + 120 + Total Currency diff --git a/dynamic_accounts_report/static/src/js/ageing.js b/dynamic_accounts_report/static/src/js/ageing.js index 34c8fa9fe..0c27d64b2 100644 --- a/dynamic_accounts_report/static/src/js/ageing.js +++ b/dynamic_accounts_report/static/src/js/ageing.js @@ -72,6 +72,12 @@ odoo.define('dynamic_accounts_report.ageing', function (require) { self.$el.find('.category').select2({ placeholder: ' Partner Category...', }); + self.$el.find('.target_move').select2({ + placeholder: ' Target Move...', + }); + self.$el.find('.result_selection').select2({ + placeholder: ' Account Type...', + }); } var child=[]; @@ -337,10 +343,12 @@ odoo.define('dynamic_accounts_report.ageing', function (require) { if ($(".target_move").length) { var post_res = document.getElementById("post_res") - filter_data_selected.target_move = $(".target_move")[0].value - post_res.value = $(".target_move")[0].value + filter_data_selected.target_move = $(".target_move")[1].value + console.log($(".target_move")) + + post_res.value = $(".target_move")[1].value post_res.innerHTML=post_res.value; - if ($(".target_move")[0].value == "") { + if ($(".target_move")[1].value == "") { post_res.innerHTML="posted"; } @@ -348,10 +356,10 @@ odoo.define('dynamic_accounts_report.ageing', function (require) { if ($(".result_selection").length) { var account_res = document.getElementById("account_res") - filter_data_selected.result_selection = $(".result_selection")[0].value - account_res.value = $(".result_selection")[0].value + filter_data_selected.result_selection = $(".result_selection")[1].value + account_res.value = $(".result_selection")[1].value account_res.innerHTML=account_res.value; - if ($(".result_selection")[0].value == "") { + if ($(".result_selection")[1].value == "") { account_res.innerHTML="customer"; } diff --git a/dynamic_accounts_report/static/src/xml/ageing.xml b/dynamic_accounts_report/static/src/xml/ageing.xml index 08af1d4cc..d226c479f 100644 --- a/dynamic_accounts_report/static/src/xml/ageing.xml +++ b/dynamic_accounts_report/static/src/xml/ageing.xml @@ -1,9 +1,8 @@ -
-

+

Partner Ageing

@@ -12,119 +11,191 @@
-

-
+

+
-
- - -
+
+ + +
- - - - - - - - + + + + + + + + - - - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
PartnerNot Due0-2020-4040-6060-8080+TotalNot Due0-3030-6060-9090-120120+Total
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
    - -
-
+ + + + + + + + + + - + + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + +
+
    + +
+
@@ -132,52 +203,56 @@ - - -
-
-
- - -
-
-

-
-
- -

-
-
- - -
-
- - -Account Type: - - - -
-
+
+
+
+ + +
+
+

+
+
+ +

+
+
+ + +
+
+ + + Account Type: + + + +
+
Partners: @@ -191,285 +266,288 @@ Account Type:
-
- - - Partner tag: - - - - -
- - -
- - -Target Move: - - - -
-
- -
-
- - -
-
-
- - - -
- + + + Partner tag: + + + + + + + +
+ + + Target Move: + + + +
+ + + +
+ + +
+ + + + + +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Entry LabelDueDateJRNLAccountNot Due0-2021-4041-6061-8080+
- -
- - - - - - - -
- - 		- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- + + + Entry Label + DueDate + JRNL + Account + Not Due + 0-30 + 30-60 + 60-90 + 90-120 + 120+ + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + - + + + + + + + + - + + + + + + + + + - + + + + + + - + + + + + + + + + - + + + + + + - + + + + + + + + + + - + + + + + + - + + + + + + + + + + - + + + + + + - + + + + + + + + + - + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/dynamic_accounts_report/wizard/ageing.py b/dynamic_accounts_report/wizard/ageing.py index 9a3385ac5..16b04f01c 100644 --- a/dynamic_accounts_report/wizard/ageing.py +++ b/dynamic_accounts_report/wizard/ageing.py @@ -19,7 +19,7 @@ class AgeingView(models.TransientModel): _name = 'account.partner.ageing' period_length = fields.Integer(string='Period Length (days)', - required=True, default=20) + required=True, default=30) date_from = fields.Date(default=lambda *a: time.strftime('%Y-%m-%d')) result_selection = fields.Selection([('customer', 'Receivable Accounts'), ('supplier', 'Payable Accounts'), @@ -599,11 +599,11 @@ class AgeingView(models.TransientModel): sheet.merge_range('A7:C7', 'Partner', heading) sheet.write('D7', 'Total', heading) sheet.write('E7', 'Not Due', heading) - sheet.write('F7', '0-20', heading) - sheet.write('G7', '20-40', heading) - sheet.write('H7', '40-60', heading) - sheet.write('I7', '60-80', heading) - sheet.write('J7', '80+', heading) + sheet.write('F7', '0-30', heading) + sheet.write('G7', '30-60', heading) + sheet.write('H7', '60-90', heading) + sheet.write('I7', '90-120', heading) + sheet.write('J7', '120+', heading) lst = [] for rec in report_data_main[0]: @@ -637,11 +637,11 @@ class AgeingView(models.TransientModel): sheet.write(row, col + 2, 'Journal', sub_heading) sheet.write(row, col + 3, 'Account', sub_heading) sheet.write(row, col + 4, 'Not Due', sub_heading) - sheet.write(row, col + 5, '0 - 20', sub_heading) - sheet.write(row, col + 6, '21 - 40', sub_heading) - sheet.write(row, col + 7, '41 - 60', sub_heading) - sheet.write(row, col + 8, '61 - 80', sub_heading) - sheet.write(row, col + 9, '81 - 100', sub_heading) + sheet.write(row, col + 5, '0 - 30', sub_heading) + sheet.write(row, col + 6, '30 - 60', sub_heading) + sheet.write(row, col + 7, '60 - 90', sub_heading) + sheet.write(row, col + 8, '90 - 120', sub_heading) + sheet.write(row, col + 9, '120 +', sub_heading) for line_data in rec_data['child_lines']: row += 1