From 86101218e98632fd668d552dd68e510df87705e6 Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 28 Apr 2026 10:47:43 +0200 Subject: [PATCH] pos_cashdro_allow_manual: move config from paymet.method to res.config --- pos_cashdro_allow_manual/__manifest__.py | 2 +- pos_cashdro_allow_manual/models/__init__.py | 4 +-- .../{pos_payment_method.py => pos_config.py} | 6 ++-- .../models/pos_session.py | 12 -------- .../models/res_config_settings.py | 12 ++++++++ .../src/xml/PaymentScreenPaymentLines.xml | 4 +-- .../views/pos_config_views.xml | 28 +++++++++++++++++++ .../views/pos_payment_method_views.xml | 18 ------------ 8 files changed, 48 insertions(+), 38 deletions(-) rename pos_cashdro_allow_manual/models/{pos_payment_method.py => pos_config.py} (82%) delete mode 100644 pos_cashdro_allow_manual/models/pos_session.py create mode 100644 pos_cashdro_allow_manual/models/res_config_settings.py create mode 100644 pos_cashdro_allow_manual/views/pos_config_views.xml delete mode 100644 pos_cashdro_allow_manual/views/pos_payment_method_views.xml diff --git a/pos_cashdro_allow_manual/__manifest__.py b/pos_cashdro_allow_manual/__manifest__.py index c866887..29215f4 100644 --- a/pos_cashdro_allow_manual/__manifest__.py +++ b/pos_cashdro_allow_manual/__manifest__.py @@ -11,7 +11,7 @@ "pos_payment_method_cashdro", ], "data": [ - "views/pos_payment_method_views.xml", + "views/pos_config_views.xml", ], "assets": { "point_of_sale.assets": [ diff --git a/pos_cashdro_allow_manual/models/__init__.py b/pos_cashdro_allow_manual/models/__init__.py index 5d0027b..f65aa41 100644 --- a/pos_cashdro_allow_manual/models/__init__.py +++ b/pos_cashdro_allow_manual/models/__init__.py @@ -1,4 +1,4 @@ # Copyright 2026 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from . import pos_payment_method -from . import pos_session +from . import pos_config +from . import res_config_settings diff --git a/pos_cashdro_allow_manual/models/pos_payment_method.py b/pos_cashdro_allow_manual/models/pos_config.py similarity index 82% rename from pos_cashdro_allow_manual/models/pos_payment_method.py rename to pos_cashdro_allow_manual/models/pos_config.py index ead4aa4..5ecfaf2 100644 --- a/pos_cashdro_allow_manual/models/pos_payment_method.py +++ b/pos_cashdro_allow_manual/models/pos_config.py @@ -3,11 +3,11 @@ from odoo import fields, models -class PosPaymentMethod(models.Model): - _inherit = "pos.payment.method" +class PosConfig(models.Model): + _inherit = "pos.config" cashdro_allow_manual_amount = fields.Boolean( - string="Permitir importe manual", + string="Permitir importe manual CashDro", help=( "Cuando está activado, aparece un botón 'Manual' en la pantalla de " "pago del TPV que permite confirmar el importe de la línea sin pasar " diff --git a/pos_cashdro_allow_manual/models/pos_session.py b/pos_cashdro_allow_manual/models/pos_session.py deleted file mode 100644 index 1a0bf31..0000000 --- a/pos_cashdro_allow_manual/models/pos_session.py +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2026 Criptomart -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import models - - -class PosSession(models.Model): - _inherit = "pos.session" - - def _loader_params_pos_payment_method(self): - result = super()._loader_params_pos_payment_method() - result["search_params"]["fields"].append("cashdro_allow_manual_amount") - return result diff --git a/pos_cashdro_allow_manual/models/res_config_settings.py b/pos_cashdro_allow_manual/models/res_config_settings.py new file mode 100644 index 0000000..be379b9 --- /dev/null +++ b/pos_cashdro_allow_manual/models/res_config_settings.py @@ -0,0 +1,12 @@ +# Copyright 2026 Criptomart +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = "res.config.settings" + + pos_cashdro_allow_manual_amount = fields.Boolean( + related="pos_config_id.cashdro_allow_manual_amount", + readonly=False, + ) diff --git a/pos_cashdro_allow_manual/static/src/xml/PaymentScreenPaymentLines.xml b/pos_cashdro_allow_manual/static/src/xml/PaymentScreenPaymentLines.xml index 105b80e..40489d7 100644 --- a/pos_cashdro_allow_manual/static/src/xml/PaymentScreenPaymentLines.xml +++ b/pos_cashdro_allow_manual/static/src/xml/PaymentScreenPaymentLines.xml @@ -7,7 +7,7 @@ The button is shown when: - the payment method is of type "cashdro" - - cashdro_allow_manual_amount is True on that payment method + - cashdro_allow_manual_amount is True on the pos.config - the line is in "pending" or "retry" state (the two states where the numpad is already active and the cashier can edit the amount) @@ -32,7 +32,7 @@
+ + + + res.config.settings.cashdro.allow.manual.form + res.config.settings + + + +
+
+ +
+
+
+
+
+
+
+
diff --git a/pos_cashdro_allow_manual/views/pos_payment_method_views.xml b/pos_cashdro_allow_manual/views/pos_payment_method_views.xml deleted file mode 100644 index b1cc651..0000000 --- a/pos_cashdro_allow_manual/views/pos_payment_method_views.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - pos.payment.method.cashdro.allow.manual.form - pos.payment.method - - - - - - - -