From cabdfc1159ffe67e6abfa4fd939dd3f00374b71c Mon Sep 17 00:00:00 2001 From: THIAGO VIEIRA DI COIMBRA ROCHA Date: Wed, 20 Apr 2016 11:43:54 -0300 Subject: [PATCH] redmine #4592 Adicionada correcao para validacao de entrada concluida para entradas que nao foram contabilizadas ainda. --- citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js index 9c054a6..4915563 100644 --- a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js +++ b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js @@ -1134,7 +1134,7 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E function verificaAlteracaoAtributosEntrada() { var deferred = $q.defer(); - if($scope.entrada.id && ($scope.entrada.dataContabil !== undefined)){ + if($scope.entrada.id && ($scope.entrada.dataContabil !== undefined && $scope.entrada.dataContabil !== null)){ EntradaRepository.verificaExistenciaBemPatrimonialTemporarioEntrada($scope.entrada.id).then(function(result){ if(!equal($scope.entrada, $scope.entradaOriginal) || result) { $scope.entrada.isEntradaConcluida = false; @@ -1144,6 +1144,8 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E }); } else { + $scope.entrada.isEntradaConcluida = true; + $scope.entradaOriginal.isEntradaConcluida = true; deferred.resolve(); } return deferred.promise; -- libgit2 0.21.2