From 2b875c587005370aeebcc95b4088394ca677efe0 Mon Sep 17 00:00:00 2001 From: "Theo VINCENT (thvi)" Date: Mon, 4 Sep 2023 13:21:46 +0200 Subject: [PATCH] [FIX] point_of_sale: opening difference account - Since dd21c708cc08d484530bc7c8433ebbb79f59323a, the opening cash difference is not posted in the suspense account. This commit fixes that. - Removes the error preventing the deletion of cash difference journal entries. task-id: 3460173 closes odoo/odoo#139975 X-original-commit: 52681b588c8353721f0b3d40f1b013bf0fc23904 Signed-off-by: Joseph Caburnay (jcb) --- addons/point_of_sale/models/account_bank_statement.py | 6 ------ addons/point_of_sale/models/pos_session.py | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/addons/point_of_sale/models/account_bank_statement.py b/addons/point_of_sale/models/account_bank_statement.py index 1801fddc77a..4f1c5f59d07 100644 --- a/addons/point_of_sale/models/account_bank_statement.py +++ b/addons/point_of_sale/models/account_bank_statement.py @@ -9,9 +9,3 @@ class AccountBankStatementLine(models.Model): _inherit = 'account.bank.statement.line' pos_session_id = fields.Many2one('pos.session', string="Session", copy=False) - - @api.ondelete(at_uninstall=False) - def _unlink_except_linked_to_pos_session(self): - for bsl in self: - if bsl.pos_session_id: - raise UserError(_("You cannot delete a bank statement line linked to Point of Sale session.")) diff --git a/addons/point_of_sale/models/pos_session.py b/addons/point_of_sale/models/pos_session.py index ef7545efae8..97ae72583e1 100644 --- a/addons/point_of_sale/models/pos_session.py +++ b/addons/point_of_sale/models/pos_session.py @@ -381,7 +381,8 @@ class PosSession(models.Model): self.cash_journal_id.name)) st_line_vals['payment_ref'] = _("Cash difference observed during the counting (Loss)") + (_(' - opening') if is_opening else _(' - closing')) - st_line_vals['counterpart_account_id'] = self.cash_journal_id.loss_account_id.id + if not is_opening: + st_line_vals['counterpart_account_id'] = self.cash_journal_id.loss_account_id.id else: # self.cash_register_difference > 0.0 if not self.cash_journal_id.profit_account_id: @@ -390,7 +391,8 @@ class PosSession(models.Model): self.cash_journal_id.name)) st_line_vals['payment_ref'] = _("Cash difference observed during the counting (Profit)") + (_(' - opening') if is_opening else _(' - closing')) - st_line_vals['counterpart_account_id'] = self.cash_journal_id.profit_account_id.id + if not is_opening: + st_line_vals['counterpart_account_id'] = self.cash_journal_id.profit_account_id.id self.env['account.bank.statement.line'].create(st_line_vals)