Download as
Browse Code »

Commit 84dee635c807165e519378d1cfaae7d09f4e3c56

Authored by erick.sato
2 parents f9304579 cabdfc11
Exists in master

Merge branch 'adm-1.13.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… 

…cit-grp-patrimonio into adm-1.13.0
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 @84dee63
... ... @@ -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;
... ...