X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fdeclara.git;a=blobdiff_plain;f=lib%2Fgera.c;h=2495992dcdaa79e8d135a7d13af22bfe4168fd1e;hp=214037c95883a87463efcc43626e865afe23d957;hb=ae234b115f2ad04493e1aef36dbd6b697ef0b68b;hpb=58291e53443f45fa03f600617eeb3bf93a234272

diff --git a/lib/gera.c b/lib/gera.c
index 214037c..2495992 100644
--- a/lib/gera.c
+++ b/lib/gera.c
@@ -963,13 +963,13 @@ static void gera_bem(struct declaracao *dec, FILE *f)
 	attr_out(f, b->attr, "bairro", 40);
 	attr_out(f, b->attr, "cep", 9);
 	attr_out(f, b->attr, "uf", 2);
-	attr_out(f, b->attr, "cd_municipio", 4);
+	attr_out_int(f, b->attr, "cd_municipio", 4);
 	attr_out(f, b->attr, "municipio", 40);
 	/* FIXME: Registro de imóveis, Nao (0), Sim (1), Vazio (2) */
 	fprintf(f, "%d", attr_get(b->attr, "registro") ? 1 : 2);
 	attr_out(f, b->attr, "matricula", 40);
 	attr_out(f, b->attr, "registro", 40);
-	attr_out(f, b->attr, "area", 11);
+	attr_out_int(f, b->attr, "area", 11);
 	/* FIXME: Area, M2 (0), Ha (1), Vazio (2) */
 	fprintf(f, "%d", attr_get(b->attr, "area") ? 0 : 2);
 	attr_out(f, b->attr, "cartorio", 60);
@@ -987,12 +987,23 @@ static void gera_bem(struct declaracao *dec, FILE *f)
 		fprintf(f, "%-30.30s", ""); /* TODO: Registro Capitania dos Portos */
 		fprintf(f, "%04d", 0); /* TODO: Agência bancária */
 		fprintf(f, "%-15.15s", ""); /* TODO: Conta bancária e dígito verificador */
-		fprintf(f, "%-14.14s", ""); /* TODO: CPF ou CNPJ */
+		attr_out(f, b->attr, "cnpj", 14);
 	}
 
 	if (dec->ano >= 2019) {
 		attr_out(f, b->attr, "iptu", 30);
 	}
+	if (dec->ano >= 2020) {
+		attr_out_int(f, b->attr, "banco", 3);
+		fprintf(f, "%c", b->dependente ? 'D' : 'T');
+		if (b->dependente) {
+			struct dependente *d;
+			d = list_get(dec->dependentes, b->dependente - 1);
+			fprintf(f, "%-11.11s", d ? d->cpf : "");
+		} else {
+			fprintf(f, "%-11.11s", dec->cpf);
+		}
+	}
 }
 
 static void gera_carne(struct declaracao *dec, FILE *f)