From 01575c7cde21d887544e124f9481053e6a1a81a0 Mon Sep 17 00:00:00 2001
From: thiago.coimbra <thiago.coimbra@centralit.com.br>
Date: Thu, 19 May 2016 10:52:38 -0300
Subject: [PATCH] redmine #4219 Adicionado o campo 'Unidade de medida entrada' na aba 'Almoxarifado'.

---
 cit-portal-web/src/main/webapp/html/configuracao/configuracao.html | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/cit-portal-web/src/main/webapp/html/configuracao/configuracao.html b/cit-portal-web/src/main/webapp/html/configuracao/configuracao.html
index 4c2d9d8..d105ec5 100644
--- a/cit-portal-web/src/main/webapp/html/configuracao/configuracao.html
+++ b/cit-portal-web/src/main/webapp/html/configuracao/configuracao.html
@@ -378,15 +378,25 @@
 						form="configuracaoAlmoxarifadoForm" ng-list="dominiosTipoAvaliacaoMonetariaEstoque" ng-custom-options="dominioTipoAvaliacao.codigo as dominioTipoAvaliacao.descricao for dominioTipoAvaliacao"></label-select>
 				</div>
 				<!-- .col -->
+				<div class="col-sm-3">
+					<label-input-number ng-id="parametro.MARGEM_ERRO_PRECO_MEDIO" ng-label="PORTAL.LABEL.VERIFICAR_PRECO_MEDIO_ENTRADA" form="configuracaoAlmoxarifadoForm" ng-disabled="false" ng-obrigatorio="true"
+						ng-model="parametro.MARGEM_ERRO_PRECO_MEDIO" ng-custom-maxlength="3" ng-min-number="0" ng-max-number="100" />
+				</div>
+				<!-- .col -->
 			</div>
 			<!-- .row -->
-
+			
+			<hr>
+				<div ng-repeat="template in templates">
+					<div class="slide-frame" ng-include="template.url" ng-show="template.show"></div>
+				</div>
+			</hr>
+			
 			<div class="row">
-				<div class="col-sm-2">
-					<label-input-number ng-id="parametro.MARGEM_ERRO_PRECO_MEDIO" ng-label="PORTAL.LABEL.MARGEM_PRECO_MEDIO" form="configuracaoAlmoxarifadoForm" ng-disabled="false" ng-obrigatorio="true"
-						ng-model="parametro.MARGEM_ERRO_PRECO_MEDIO" ng-custom-maxlength="3" ng-min-number="0" ng-max-number="100" />
+				<div class="col-sm-3">
+					<label-select ng-id="parametro.TIPO_CONFIGURACAO_UNIDADE_MEDIDA_ENTRADA" ng-model="parametro.TIPO_CONFIGURACAO_UNIDADE_MEDIDA_ENTRADA" ng-label="PORTAL.LABEL.UNIDADE_MEDIA_ENTRADA" 
+						form="configuracaoAlmoxarifadoForm" ng-list="tipoConfiguracaoUnidadeMediaList" ng-custom-options="tipoConfiguracaoUnidadeMedia.codigo as tipoConfiguracaoUnidadeMedia.descricao for tipoConfiguracaoUnidadeMedia"></label-select>
 				</div>
-				<!-- .col -->
 			</div>
 			<!-- .row -->
 
--
libgit2 0.21.2