From c7737c0e3e396bd8d3cdd527520daf164ce3ed96 Mon Sep 17 00:00:00 2001 From: Marc Bellavista Date: Thu, 31 Aug 2023 10:55:28 +0200 Subject: [PATCH 1/3] feat: set validation solo si hay flux solar --- som_facturacio_switching/__init__.py | 2 +- .../giscedata_facturacio_validation.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 som_facturacio_switching/giscedata_facturacio_validation.py diff --git a/som_facturacio_switching/__init__.py b/som_facturacio_switching/__init__.py index 6a084a9a4..33a4926a6 100644 --- a/som_facturacio_switching/__init__.py +++ b/som_facturacio_switching/__init__.py @@ -5,4 +5,4 @@ import res_municipi import wizard import giscedata_facturacio_switching_error - +from giscedata_facturacio_validation import * diff --git a/som_facturacio_switching/giscedata_facturacio_validation.py b/som_facturacio_switching/giscedata_facturacio_validation.py new file mode 100644 index 000000000..edaa3d39c --- /dev/null +++ b/som_facturacio_switching/giscedata_facturacio_validation.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +from osv import osv + + +class GiscedataFacturacioValidationValidator(osv.osv): + _inherit = 'giscedata.facturacio.validation.validator' + _name = 'giscedata.facturacio.validation.validator' + + def check_factura_amb_expedient(self, cursor, uid, fact, parameters): + if fact.polissa_id.bateria_ids: + return super(GiscedataFacturacioValidationValidator).check_factura_amb_expedient(cursor, uid, fact, parameters) + + return None + + +GiscedataFacturacioValidationValidator() From f62dd59a7bff77acf0ea7a388a5dfc5c0228383d Mon Sep 17 00:00:00 2001 From: Marc Bellavista Date: Fri, 1 Sep 2023 11:48:50 +0200 Subject: [PATCH 2/3] fix check if bateria virtual with dates --- .../giscedata_facturacio_validation.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/som_facturacio_switching/giscedata_facturacio_validation.py b/som_facturacio_switching/giscedata_facturacio_validation.py index edaa3d39c..615053cc9 100644 --- a/som_facturacio_switching/giscedata_facturacio_validation.py +++ b/som_facturacio_switching/giscedata_facturacio_validation.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from datetime import datetime + from osv import osv @@ -7,8 +9,10 @@ class GiscedataFacturacioValidationValidator(osv.osv): _name = 'giscedata.facturacio.validation.validator' def check_factura_amb_expedient(self, cursor, uid, fact, parameters): - if fact.polissa_id.bateria_ids: - return super(GiscedataFacturacioValidationValidator).check_factura_amb_expedient(cursor, uid, fact, parameters) + for bat in fact.polissa_id.bateria_ids: + if (datetime.strptime(bat.data_inici, '%Y-%m-%d') < datetime.today() + and (not bat.data_final or datetime.strptime(bat.data_final, '%Y-%m-%d') > datetime.today())): + return super(GiscedataFacturacioValidationValidator).check_factura_amb_expedient(cursor, uid, fact, parameters) return None From f5c1d492247be606fc7a45b6077b3b531f146a51 Mon Sep 17 00:00:00 2001 From: Marc Bellavista Date: Fri, 1 Sep 2023 12:14:17 +0200 Subject: [PATCH 3/3] fix super call --- som_facturacio_switching/giscedata_facturacio_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/som_facturacio_switching/giscedata_facturacio_validation.py b/som_facturacio_switching/giscedata_facturacio_validation.py index 615053cc9..b4f0f9441 100644 --- a/som_facturacio_switching/giscedata_facturacio_validation.py +++ b/som_facturacio_switching/giscedata_facturacio_validation.py @@ -12,7 +12,7 @@ def check_factura_amb_expedient(self, cursor, uid, fact, parameters): for bat in fact.polissa_id.bateria_ids: if (datetime.strptime(bat.data_inici, '%Y-%m-%d') < datetime.today() and (not bat.data_final or datetime.strptime(bat.data_final, '%Y-%m-%d') > datetime.today())): - return super(GiscedataFacturacioValidationValidator).check_factura_amb_expedient(cursor, uid, fact, parameters) + return super(GiscedataFacturacioValidationValidator, self).check_factura_amb_expedient(cursor, uid, fact, parameters) return None