Skip to content

Commit

Permalink
Merge pull request #1925 from prefeiturasp/hotfix/7.0.2
Browse files Browse the repository at this point in the history
Hotfix/7.0.2
  • Loading branch information
ollyvergithub authored Apr 12, 2023
2 parents 95ba077 + 9103ee5 commit 3305cc7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
3 changes: 3 additions & 0 deletions hotfixes.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion sme_ptrf_apps/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "7.0.1"
__version__ = "7.0.2"

__version_info__ = tuple(
[
Expand Down
11 changes: 7 additions & 4 deletions sme_ptrf_apps/despesas/models/despesa.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 3305cc7

Please sign in to comment.