From 6ea27388eaba8904f30b0137810cd228ebf67af3 Mon Sep 17 00:00:00 2001 From: ollyvergithub Date: Wed, 12 Apr 2023 09:56:30 -0300 Subject: [PATCH 1/2] =?UTF-8?q?fix(89801):=20Corrige=20imposs=C3=ADvel=20d?= =?UTF-8?q?eletar=20despesa=20rascunho?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sme_ptrf_apps/despesas/models/despesa.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sme_ptrf_apps/despesas/models/despesa.py b/sme_ptrf_apps/despesas/models/despesa.py index c4dbba54a..0aabb0da9 100644 --- a/sme_ptrf_apps/despesas/models/despesa.py +++ b/sme_ptrf_apps/despesas/models/despesa.py @@ -149,10 +149,13 @@ def periodo_da_despesa(self): @property def inativar_em_vez_de_excluir(self): from sme_ptrf_apps.core.models import PrestacaoConta - return PrestacaoConta.objects.filter( - associacao=self.associacao, - periodo=self.periodo_da_despesa - ).exists() + if self.status == STATUS_INCOMPLETO: + return False + else: + return PrestacaoConta.objects.filter( + associacao=self.associacao, + periodo=self.periodo_da_despesa + ).exists() @property def mensagem_inativacao(self): From 9103ee5ca43667c712367ac724e405c7342534ec Mon Sep 17 00:00:00 2001 From: ollyvergithub Date: Wed, 12 Apr 2023 15:01:34 -0300 Subject: [PATCH 2/2] HotFix 7.0.2 --- hotfixes.md | 3 +++ sme_ptrf_apps/__init__.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hotfixes.md b/hotfixes.md index ed06e028a..0be3e9133 100644 --- a/hotfixes.md +++ b/hotfixes.md @@ -1,3 +1,6 @@ +### 7.0.2 - 10/04/2023 - Hotfix - Soluções de bugs urgentes durante a sprint 63 +* (89801) Corrige Impossível deletar despesa rascunho + ### 7.0.1 - 10/04/2023 - Hotfix - Soluções de bugs urgentes durante a sprint 63 * (90604) Corrige Registros de análise de lançamento duplicados diff --git a/sme_ptrf_apps/__init__.py b/sme_ptrf_apps/__init__.py index 3b5bca8b1..b960bcc1a 100644 --- a/sme_ptrf_apps/__init__.py +++ b/sme_ptrf_apps/__init__.py @@ -1,4 +1,4 @@ -__version__ = "7.0.1" +__version__ = "7.0.2" __version_info__ = tuple( [