From 634fba01c29b0c93f11d4f3e20f4b3211e8b902d Mon Sep 17 00:00:00 2001 From: AjmalCybro Date: Sat, 30 Sep 2023 11:49:48 +0800 Subject: [PATCH] Sep 30 : [FIX] Bug Fixed 'pos_analytic_tag' --- pos_analytic_tag/models/pos_session.py | 56 ++------------------------ 1 file changed, 4 insertions(+), 52 deletions(-) diff --git a/pos_analytic_tag/models/pos_session.py b/pos_analytic_tag/models/pos_session.py index 6f7ce4b0f..c82303006 100644 --- a/pos_analytic_tag/models/pos_session.py +++ b/pos_analytic_tag/models/pos_session.py @@ -32,49 +32,6 @@ class PosSession(models.Model): " pos session", readonly=True) - def _pos_ui_models_to_load(self): - """To load new model to POS""" - result = super()._pos_ui_models_to_load() - result.append('res.config.settings') - return result - - def _loader_params_res_config_settings(self): - """To load fields in a config""" - return { - 'search_params': { - 'fields': ['pos_analytic_account_id'], - }, - } - - def _get_pos_ui_res_config_settings(self, params): - """To get values in res config settings to pos ui""" - res_obj = self.env['res.config.settings'].search_read( - **params['search_params']) - if res_obj: - val = res_obj[-1] if res_obj[-1] else res_obj - self.pos_analytic_account_id = False if not val[ - 'pos_analytic_account_id'] else \ - val['pos_analytic_account_id'][0] - return val - else: - return False - - def _prepare_analytic_lines(self): - """Call the parent class method and convert any string value - in account_id to integer""" - res = super()._prepare_analytic_lines() - self.ensure_one() - analytic_line_vals = [] - if self.analytic_distribution: - distribution_on_each_plan = {} - for account_id, distribution in self.analytic_distribution.items(): - line_values = self._prepare_analytic_distribution_line( - float(distribution), int(account_id), - distribution_on_each_plan) - if not self.currency_id.is_zero(line_values.get('amount')): - analytic_line_vals.append(line_values) - return res - def _create_account_move(self, balancing_account=False, amount_to_balance=0, bank_payment_method_diffs=None): @@ -83,16 +40,11 @@ class PosSession(models.Model): res = super()._create_account_move(balancing_account, amount_to_balance, bank_payment_method_diffs) - search_params = { - 'fields': ['pos_analytic_account_id'], - 'limit': 1, - } - analytic_account = self._get_pos_ui_res_config_settings(( - {'search_params': search_params})) - if analytic_account == 'False': - return True - else: + self.pos_analytic_account_id = self.config_id.analytic_account_id + if self.pos_analytic_account_id: self.env['account.analytic.distribution.model'].create([{ 'analytic_distribution': {self.pos_analytic_account_id.id: 100} }]) + else: + return False return res