Merge pull request 'fixes bug#al-2723' (!80) from al-2723 into master

Reviewed-on: adm/ModelWeb#80
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.6.12</version>
+	<version>1.7.0</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>

src/com/rjconsultores/ventaboletos/constantes/Constantes.java

@@ -137,4 +137,6 @@ public class Constantes {
 	
 	public static final String TIPO_OCUPACAO_SEM_VALIDACAO = "TIPO_OCUPACAO_SEM_VALIDACAO";
 	
+	public static final String CNPJ_OBRIGATORIO_ORDEN_SERVICO = "CNPJ_OBRIGATORIO_ORDEN_SERVICO";
+	
 }

src/com/rjconsultores/ventaboletos/entidad/Secretaria.java

@@ -84,6 +84,9 @@ public class Secretaria implements Serializable {
 	@JoinColumn(name = "FORMAPAGO_ID")
 	private FormaPago formaPago;
 	
+	@Column(name = "CNPJ")
+	private String cnpj;
+	
 	public Secretaria() {
 		this.indVoucherRod = false;
 	}
@@ -285,4 +288,14 @@ public class Secretaria implements Serializable {
 	public void setFormaPago(FormaPago formaPago) {
 		this.formaPago = formaPago;
 	}
+
+	public String getCnpj() {
+		return cnpj;
+	}
+
+	public void setCnpj(String cnpj) {
+		this.cnpj = cnpj;
+	}
+	
+	
 }