From 6f6a8876668020bdb256fc9b73ab1cd46a001120 Mon Sep 17 00:00:00 2001 From: Ajmal Cybro Date: Fri, 13 Aug 2021 20:15:06 +0530 Subject: [PATCH] [UPDT] Kit state field issue in query --- base_accounting_kit/__manifest__.py | 2 +- base_accounting_kit/doc/changelog.md | 5 +- .../models/account_dashboard.py | 68 +++++++++---------- 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/base_accounting_kit/__manifest__.py b/base_accounting_kit/__manifest__.py index d4d35e58b..fefcb4a66 100644 --- a/base_accounting_kit/__manifest__.py +++ b/base_accounting_kit/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Odoo 14 Full Accounting Kit', - 'version': '14.0.3.13.11', + 'version': '14.0.3.13.12', 'category': 'Accounting', 'live_test_url': 'https://www.youtube.com/watch?v=peAp2Tx_XIs', 'summary': """ Asset and Budget Management, diff --git a/base_accounting_kit/doc/changelog.md b/base_accounting_kit/doc/changelog.md index d2b065ba4..8e0c0b1fa 100644 --- a/base_accounting_kit/doc/changelog.md +++ b/base_accounting_kit/doc/changelog.md @@ -91,4 +91,7 @@ #### UPDT - Account Parent Group added - +#### 13.08.2021 +#### Version 14.0.3.13.12 +#### UPDT +- Dashboard issue fixed, 'state' field is ambigous diff --git a/base_accounting_kit/models/account_dashboard.py b/base_accounting_kit/models/account_dashboard.py index c36740389..e2cab9f28 100644 --- a/base_accounting_kit/models/account_dashboard.py +++ b/base_accounting_kit/models/account_dashboard.py @@ -421,9 +421,9 @@ class DashBoard(models.Model): states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute((''' select res_partner.name as partner, res_partner.commercial_partner_id as res , account_move.commercial_partner_id as parent, sum(account_move.amount_total) as amount @@ -470,9 +470,9 @@ class DashBoard(models.Model): states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute((''' select res_partner.name as partner, res_partner.commercial_partner_id as res, account_move.commercial_partner_id as parent, sum(account_move.amount_total) as amount @@ -512,9 +512,9 @@ class DashBoard(models.Model): states_arg = "" if post[0] != 'posted': - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" company_id = self.get_current_company_value() if post[1] == 'this_month': @@ -572,9 +572,9 @@ class DashBoard(models.Model): states_arg = "" if post[0] != 'posted': - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" if post[1] == 'this_month': self._cr.execute((''' @@ -630,9 +630,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post[0] != 'posted': - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" if post[1] == 'this_month': self._cr.execute((''' select res_partner.name as customers, account_move.commercial_partner_id as parent, sum(account_move.amount_total) as amount from account_move, res_partner @@ -711,9 +711,9 @@ class DashBoard(models.Model): states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select sum(amount_total) as customer_invoice from account_move where move_type ='out_invoice' AND %s AND account_move.company_id in ''' + str(tuple(company_id)) + ''' @@ -749,9 +749,9 @@ class DashBoard(models.Model): states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select sum(amount_total_signed) as customer_invoice from account_move where move_type ='out_invoice' AND %s @@ -810,9 +810,9 @@ class DashBoard(models.Model): states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select sum(amount_total_signed) as customer_invoice from account_move where move_type ='out_invoice' AND %s @@ -875,9 +875,9 @@ class DashBoard(models.Model): states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select sum(amount_total) from account_move where move_type = 'out_invoice' AND %s @@ -1132,9 +1132,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select account_move.id from account_move where move_type ='in_invoice' AND %s AND Extract(YEAR FROM account_move.date) = Extract(YEAR FROM DATE(NOW())) @@ -1148,9 +1148,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select account_move.id from account_move where move_type ='in_invoice' AND %s @@ -1166,9 +1166,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select account_move.id from account_move where move_type ='out_invoice' AND %s AND payment_state = 'paid' @@ -1183,9 +1183,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select account_move.id from account_move where move_type ='out_invoice' AND %s AND Extract(YEAR FROM account_move.date) = Extract(YEAR FROM DATE(NOW())) @@ -1199,9 +1199,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select account_move.id from account_move where move_type ='in_invoice' AND %s AND Extract(month FROM account_move.date) = Extract(month FROM DATE(NOW())) @@ -1216,9 +1216,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select account_move.id from account_move where move_type ='in_invoice' AND %s AND Extract(month FROM account_move.date) = Extract(month FROM DATE(NOW())) @@ -1234,9 +1234,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select account_move.id from account_move where move_type ='out_invoice' AND %s AND Extract(month FROM account_move.date) = Extract(month FROM DATE(NOW())) @@ -1252,9 +1252,9 @@ class DashBoard(models.Model): company_id = self.get_current_company_value() states_arg = "" if post != ('posted',): - states_arg = """ state in ('posted', 'draft')""" + states_arg = """ account_move.state in ('posted', 'draft')""" else: - states_arg = """ state = 'posted'""" + states_arg = """ account_move.state = 'posted'""" self._cr.execute(('''select account_move.id from account_move where move_type ='out_invoice' AND %s AND Extract(month FROM account_move.date) = Extract(month FROM DATE(NOW()))