X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fdeclaracao.h;h=8a27e9c8cbfeb245fd90a72c2144140c1d063746;hb=8c59ccf495b2aa94469fe25d4e1efe224f3a9aea;hp=ce318e60506eed0c17c46e6b0a857fa3884dbd1f;hpb=6c1c229c39002932d0f842f7b5662992c5466628;p=cascardo%2Fdeclara.git

diff --git a/lib/declaracao.h b/lib/declaracao.h
index ce318e6..8a27e9c 100644
--- a/lib/declaracao.h
+++ b/lib/declaracao.h
@@ -36,8 +36,10 @@ struct declaracao {
 	char *cpf;
 	char *nome;
 	struct list *rendimento;
+	struct list *carne;
 	struct list *isentos;
 	struct list *pagamentos;
+	struct list *pagamentos_cnpj;
 	struct list *bens;
 	struct list *dependentes;
 	struct contribuinte contribuinte;
@@ -48,6 +50,7 @@ struct declaracao {
 	long long devido;
 	long long pagar;
 	long long restituicao;
+	long long aliquota_efetiva;
 	int obrigatoria;
 	int tipo;
 	char *recibo;
@@ -60,9 +63,16 @@ struct declaracao {
 	struct pmhash *totais;
 	unsigned long hash;
 	unsigned long rhash;
+	int verbose;
+	char *error;
+	void *ctx;
 };
 
 struct declaracao * declaracao_new(int ano);
 void declaracao_free(struct declaracao *dec);
 
+void dec_set_error(struct declaracao *dec, char *fmt, ...);
+
+void dec_cmd_init(void);
+
 #endif