Merge pull request 'AL-4672' (!720) from AL-4672 into master

Reviewed-on: adm/VentaBoletosAdm#720
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>

pom.xml

@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.141.0</version>
+	<version>1.142.0</version>
 	<packaging>war</packaging> 
     
 	<properties>
-		<modelWeb.version>1.107.0</modelWeb.version>
-		<flyway.version>1.92.6</flyway.version>
+		<modelWeb.version>1.108.0</modelWeb.version>
+		<flyway.version>1.93.0</flyway.version>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java

@@ -661,7 +661,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 	@Autowired
 	private EmpresaConfigLayoutService empresaConfigLayoutService;
 	
-	
+	private Checkbox chkIndImprimeTaxaEmbarqueNoCupom;
 
 	private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
 			+ "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
@@ -974,6 +974,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 		chkindImpressaoAposConfAberto.setChecked(BooleanUtils.toBoolean(empresa.getIndImpressaoAposConfAberto()));
 		txtUrlBaseSeguro.setText(empresa.getUrlBaseEmpresaSeguro());
 		chkIndCupomEmbarqueSimplificado.setChecked(BooleanUtils.toBoolean(empresa.getIndCupomEmbarqueSimplificado()));
+		chkIndImprimeTaxaEmbarqueNoCupom.setChecked(BooleanUtils.toBoolean(empresa.getIndImprimeTaxaEmbarqueNoCupom()));
 		
 		lsEmpresaContaBancaria = new ArrayList<EmpresaContaBancaria>();
 		empresaContaBancariaList.setItemRenderer(new RenderEmpresaContaBancaria());
@@ -1414,6 +1415,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 			empresa.setIndIntegracaoAGR(chkIndntegracaoAGR.isChecked());
 			empresa.setIndImpressaoAposConfAberto(chkindImpressaoAposConfAberto.isChecked());
 			empresa.setIndCupomEmbarqueSimplificado(chkIndCupomEmbarqueSimplificado.isChecked());
+			empresa.setIndImprimeTaxaEmbarqueNoCupom(chkIndImprimeTaxaEmbarqueNoCupom.isChecked());
 			
 			//Se tiver marcado coloca a hora no embarque na empresa, se não, seta os valores como null
 			if(chkIndHabilitaHoraEmbarque.isChecked()) {

web/gui/catalogos/editarEmpresa.zul

@@ -1168,6 +1168,25 @@
 									</hlayout>
 								</groupbox>
 							</row>
+							
+							<row>
+								<groupbox>
+									<caption label="${c:l('editarEmpresaController.indImprimeTaxaEmbarqueNoCupom')}" />
+								
+									<hlayout>
+										<checkbox
+											id="chkIndImprimeTaxaEmbarqueNoCupom"
+											value="@{winEditarEmpresa$composer.empresa.indImprimeTaxaEmbarqueNoCupom}" />
+										<image
+											src="/gui/img/Question_mark_1.png"
+											tooltiptext="${c:l('editarEmpresaController.indImprimeTaxaEmbarqueNoCupom.help')}"
+											style="cursor: help" />
+									</hlayout>
+								</groupbox>
+								
+	
+							</row>
+							
 						</rows>
 					</grid>
 				</tabpanel>