Merge branch 'release-1.11.0'

gabriel.damasceno
2 parents b3460739 3be1919c
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js
@@ -1729,7 +1729,7 @@ citApp.controller(&#39;EntradaController&#39;, [&#39;$scope&#39;, &#39;$timeout&#39;, &#39;FileUploader&#39;, &#39;E
         	if ($scope.edit == true && $scope.entrada && $scope.entrada.id ){
         		EntradaRepository.existemBemSemDataContabil($scope.entrada.id).then(function(result){
         			if (result == true){
-        				$scope.showAlert('warning', $translate.instant('MSG.LEMBRETE_CONCLUIR_ENTRADA'));
+        				$scope.showAlert('warning', $translate.instant('PATRIMONIO.MSG.LEMBRETE_CONCLUIR_ENTRADA'));
         			}
         		});
...	...	@@ -1729,7 +1729,7 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
1729	1729	if ($scope.edit == true && $scope.entrada && $scope.entrada.id ){
1730	1730	EntradaRepository.existemBemSemDataContabil($scope.entrada.id).then(function(result){
1731	1731	if (result == true){
1732		- $scope.showAlert('warning', $translate.instant('MSG.LEMBRETE_CONCLUIR_ENTRADA'));
	1732	+ $scope.showAlert('warning', $translate.instant('PATRIMONIO.MSG.LEMBRETE_CONCLUIR_ENTRADA'));
1733	1733	}
1734	1734	});
1735	1735
...	...