Download as
Browse Code »

Commit 5037ac23be5f76902bc8613bad6d64f4b2b0e703

Authored by erick.sato
2 parents 3339cd54 37153882
Exists in master

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

…cit-grp-almoxarifado into adm-1.16.0
Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/AtendimentoRequisicaoConsumoController.js
  Diff comments   View file @5037ac2
... ... @@ -518,13 +518,6 @@ citApp.controller( 'AtendimentoRequisicaoConsumoController',
518 518 });
519 519 }
520 520  
521   - $scope.teste = function(item){
522   - if(item){
523   - $scope.aplicarValidacaoDecimal(item);
524   - $scope.validarQuantidadesAtendidas();
525   - }
526   - }
527   -
528 521 $scope.saveEdit = function(isFinalizado){
529 522 $scope.atendimentoRequisicaoConsumoForm.$submitted = true;
530 523 $scope.atendimentoRequisicaoConsumo.atendimentos = [];
... ...
cit-almoxarifado-web/src/main/webapp/html/atendimentoRequisicaoConsumo/atendimentoRequisicaoConsumoList.html
  Diff comments   View file @5037ac2
... ... @@ -28,6 +28,14 @@
28 28 <translate>ALMOXARIFADO.LABEL.INTERROMPER_ATENDIMENTO_INICIADO</translate>
29 29 </button>
30 30  
  31 + <button title="{{$translate.instant('ALMOXARIFADO.LABEL.RELATORIO_GUIA_REMESSA')}}"
  32 + alt="{{$translate.instant('ALMOXARIFADO.LABEL.RELATORIO_GUIA_REMESSA')}}"
  33 + class="btn btn-clear" type="button" ng-disabled="false"
  34 + ng-click="gerar();">
  35 + <i class="fa fa-print"></i>
  36 + <translate>ALMOXARIFADO.LABEL.RELATORIO_GUIA_REMESSA</translate>
  37 + </button>
  38 +
31 39 <span class="divider-vertical"></span>
32 40  
33 41 <filtros ng-filter="filterCriteria" ng-workspace="workspace"></filtros>
... ...