Download as
Browse Code »

Commit cabdfc1159ffe67e6abfa4fd939dd3f00374b71c

Authored by THIAGO VIEIRA DI COIMBRA ROCHA
1 parent dc5382a2
Exists in master

redmine #4592 Adicionada correcao para validacao de entrada concluida para entra… 

…das que nao foram contabilizadas ainda.
Showing 1 changed file with 3 additions and 1 deletions   Show diff stats
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js
  Diff comments   View file @cabdfc1
... ... @@ -1134,7 +1134,7 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
1134 1134  
1135 1135 function verificaAlteracaoAtributosEntrada() {
1136 1136 var deferred = $q.defer();
1137   - if($scope.entrada.id && ($scope.entrada.dataContabil !== undefined)){
  1137 + if($scope.entrada.id && ($scope.entrada.dataContabil !== undefined && $scope.entrada.dataContabil !== null)){
1138 1138 EntradaRepository.verificaExistenciaBemPatrimonialTemporarioEntrada($scope.entrada.id).then(function(result){
1139 1139 if(!equal($scope.entrada, $scope.entradaOriginal) || result) {
1140 1140 $scope.entrada.isEntradaConcluida = false;
... ... @@ -1144,6 +1144,8 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
1144 1144 });
1145 1145  
1146 1146 } else {
  1147 + $scope.entrada.isEntradaConcluida = true;
  1148 + $scope.entradaOriginal.isEntradaConcluida = true;
1147 1149 deferred.resolve();
1148 1150 }
1149 1151 return deferred.promise;
... ...