X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fcalcula.c;h=a00327c9c48d76e277b090e78dff8c5b62cc7a3e;hb=4fbd7c5bf377c5e30840b448b43e4525266c2d9d;hp=8aa0cc19aae000336a9e394b1b7f8521c4dab7fb;hpb=1d63cf7d852bef19b1a4724d22162d176417481d;p=cascardo%2Fdeclara.git

diff --git a/lib/calcula.c b/lib/calcula.c
index 8aa0cc1..a00327c 100644
--- a/lib/calcula.c
+++ b/lib/calcula.c
@@ -32,12 +32,14 @@ static const long long dependente[ANO(MAX_ANOS)] = {
 	[ANO(2015)] = 215652,
 	[ANO(2016)] = 227508,
 	[ANO(2017)] = 227508,
+	[ANO(2018)] = 227508,
 };
 
 static const long long instrucao[ANO(MAX_ANOS)] = {
 	[ANO(2015)] = 337583,
 	[ANO(2016)] = 356150,
 	[ANO(2017)] = 356150,
+	[ANO(2018)] = 356150,
 };
 
 long long deducao_dependente(struct declaracao *dec)
@@ -117,7 +119,8 @@ static void total_pago(struct declaracao *dec)
 {
 	struct rendimento *rendimento;
 	int i;
-	dec->pago = dec->retido = 0;
+	dec->pago = dec->retido = totais_get(dec, "PAGO");
+	dec->retido -= totais_get(dec, "CARNE");
 	for (i = 0; rendimento = list_get(dec->rendimento, i); i++) {
 		dec->pago += rendimento->imposto;
 		dec->retido += rendimento->imposto;
@@ -165,18 +168,21 @@ static struct taxtable *table[ANO(MAX_ANOS)] = {
 	[ANO(2015)] = table2015,
 	[ANO(2016)] = table2016,
 	[ANO(2017)] = table2017,
+	[ANO(2018)] = table2017,
 };
 
 static const long long simples[ANO(MAX_ANOS)] = {
 	[ANO(2015)] = 1588089,
 	[ANO(2016)] = 1675434,
 	[ANO(2017)] = 1675434,
+	[ANO(2018)] = 1675434,
 };
 
 static const long long obrigatoriedade[ANO(MAX_ANOS)] = {
 	[ANO(2015)] = 2681655,
 	[ANO(2016)] = 2812391,
 	[ANO(2017)] = 2855970, /* De acordo com IN 1671/2016 */
+	[ANO(2018)] = 2855970,
 };
 
 static long long imposto(struct taxtable *tt, long long tr, int verbose)
@@ -268,6 +274,7 @@ int calcula(struct declaracao *dec)
 		dec->restituicao = dec->pago - dec->devido;
 	else
 		dec->pagar = dec->devido - dec->pago;
+	dec->aliquota_efetiva = dec->devido * 10000 / totais_get(dec, "RENDTRIB");
 	return 0;
 }