Download as
Browse Code »

Commit 0927fb8ff055563a4f7d3f6c2aac66fc8f919310

Authored by joyfas.silva
2 parents 37100a4c 3f1abe9d
Exists in master

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

…cit-grp-patrimonio into adm-1.15.0
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
citgrp-patrimonio-web/src/main/webapp/html/entrada/dialog_entrada_item.html
  Diff comments   View file @0927fb8
... ... @@ -28,7 +28,7 @@
28 28 <div class="row">
29 29 <div class="col-sm-8">
30 30 <auto-complete ng-find="findMaterial(value)"
31   - ng-item="item.codigoEDescricao" ng-acao-borracha="limparMaterialCaracteristica()" ng-id="entradaItem.material"
  31 + ng-item="item.codigoDescricaoCodigoCC" ng-acao-borracha="limparMaterialCaracteristica()" ng-id="entradaItem.material"
32 32 ng-label="LABEL.MATERIAL" ng-disabled="!editaInfoEntrada" ng-model="entradaItem.material" form="formEntradaItem"
33 33 ng-obrigatorio="true">
34 34 </auto-complete>
... ...
citgrp-patrimonio-web/src/main/webapp/html/transferencia/transferenciaList.html
  Diff comments   View file @0927fb8
... ... @@ -23,7 +23,7 @@
23 23 <translate>LABEL.REMOVER</translate>
24 24 </button>
25 25  
26   - <button title="{{$translate.instant('LABEL.EMITIR_TERMO_TRANSFERENCIA')}}" alt="{{$translate.instant('LABEL.EMITIR_TERMO_TRANSFERENCIA')}}" class="btn btn-clear" type="button" ng-disabled="false"
  26 + <button title="{{$translate.instant('PATRIMONIO.LABEL.EMITIR_TEMO_RESPONSABILIDADE')}}" alt="{{$translate.instant('PATRIMONIO.LABEL.EMITIR_TEMO_RESPONSABILIDADE')}}" class="btn btn-clear" type="button" ng-disabled="false"
27 27 ng-click="gerarReportTermoResponsabilidade();">
28 28 <i class="fa fa-print"></i>
29 29 <translate>PATRIMONIO.LABEL.EMITIR_TEMO_RESPONSABILIDADE</translate>
... ...