diff --git a/tp/conaica.png b/tp/conaica.png deleted file mode 100755 index a13c141e6..000000000 Binary files a/tp/conaica.png and /dev/null differ diff --git a/tp/tp0900.cpp b/tp/tp0900.cpp index 06508a0e4..d62fcba67 100755 --- a/tp/tp0900.cpp +++ b/tp/tp0900.cpp @@ -165,35 +165,40 @@ void TDichiarazione_CONAI::scrivi_csv(const TRectype& riga_generata, TDichiarazi csv.set(3, TVariant(datadoc)); csv.set(4, TVariant(clifo_cod)); csv.set(5, TVariant(clifo_cofi)); - csv.set(6, TVariant(rdoc.get(RDOC_NRIGA))); + csv.set(6, TVariant(rdoc.get(RDOC_CODART))); + csv.set(7, TVariant(rdoc.get(RDOC_NRIGA))); //codici conai - csv.set(7, TVariant(codagg1)); //codice materiale conai (es. carta, legno...) - csv.set(8, TVariant(codagg2)); //sottocodice materiale (es. carta imballo, busta...) + csv.set(8, TVariant(codagg1)); //codice materiale conai (es. carta, legno...) + csv.set(9, TVariant(codagg2)); //sottocodice materiale (es. carta imballo, busta...) //prezzo const real prezzo = riga_generata.get_real(RDOC_PREZZO); //va preso dalla riga generata - csv.set(9, TVariant(prezzo)); + csv.set(10, TVariant(prezzo)); //um conai const TString4 umqta = cache().get("SPP", conai_codart, "S7"); //unita' di misura dalla tabella SPP - csv.set(10, TVariant(umqta)); + csv.set(11, TVariant(umqta)); //quantita' totale conai (A + B) sul report (le NAC hanno segno rovesciato) real qta_tot_conai = (real&)qta_AB_conai[i]; if (is_nac) qta_tot_conai = -qta_tot_conai; - csv.set(11, TVariant(qta_tot_conai)); + csv.set(12, TVariant(qta_tot_conai)); //quantita' assoggettata (B) sul report (le NAC hanno segno rovesciato) real qta_assoggettata_conai = agip.get(); if (is_nac) qta_assoggettata_conai = -qta_assoggettata_conai; - csv.set(12, TVariant(qta_assoggettata_conai)); + csv.set(13, TVariant(qta_assoggettata_conai)); //quantita' esente conai (A) sul report const real qta_esente_conai = qta_tot_conai - qta_assoggettata_conai; - csv.set(13, TVariant(qta_esente_conai)); + csv.set(14, TVariant(qta_esente_conai)); + + //valore totale contributo (BxC) sul report + const real totale_contrib_conai = qta_assoggettata_conai * prezzo; + csv.set(15, TVariant(totale_contrib_conai)); } } } diff --git a/tp/tp0900ca.png b/tp/tp0900ca.png new file mode 100755 index 000000000..0050e0fe6 Binary files /dev/null and b/tp/tp0900ca.png differ diff --git a/tp/tp0900ca.rep b/tp/tp0900ca.rep index d5f238788..7aaff4883 100755 --- a/tp/tp0900ca.rep +++ b/tp/tp0900ca.rep @@ -34,22 +34,60 @@
- "conaica.png" + "tp0900ca.png"
-
@@ -58,162 +96,222 @@ MESSAGE ADD,F0.210 #SYSTEM.DATE - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ + + #THIS @ 1000 F; 2 ROUND #THIS ! - - #THIS @ -1000 F; -2 ROUND -#THIS ! - - - + #THIS @ 1000 F; 2 ROUND #THIS ! - - - - - - #204 @ -30 * + + #THIS @ +1000 F; +2 ROUND #THIS ! - - - - - - - - #210 @ -30 * + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + + + + + + + + + + + #310 @ +#210 @ +F; #THIS ! - #310 @ + #3000 @ +#THIS ! + + + #320 @ +#220 @ +F; +#THIS ! + + + #330 @ +#230 @ +F; +#THIS ! + + + #340 @ +#240 @ +F; +#THIS ! + + + #350 @ +#250 @ +F; +#THIS ! + + + #360 @ +#260 @ +F; +#THIS ! + + + #370 @ +#270 @ +F; +#THIS ! + + + #380 @ +#280 @ +F; +#THIS ! + + + #390 @ +#290 @ +F; +#THIS ! + + + #399 @ +#299 @ +F; +#THIS ! + + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + + #THIS @ +1000 F; +2 ROUND +#THIS ! + + + + + + + #340 @ +#240 @ +F; #THIS !
diff --git a/tp/tp0900es.png b/tp/tp0900es.png new file mode 100755 index 000000000..6e837bcf3 Binary files /dev/null and b/tp/tp0900es.png differ diff --git a/tp/tp0900es.rep b/tp/tp0900es.rep new file mode 100755 index 000000000..c6a1f6f54 --- /dev/null +++ b/tp/tp0900es.rep @@ -0,0 +1,49 @@ + + + Scheda Esenzione CONAI 6.3 + +
+ + #ANNO + + + #SOCIO + + + #RAGSOC + + + #INDRES + + + #PAIV + + + #COFI + + + #RESP + + + #TEL + + + #EMAIL + +
+
+
+ + "tp0900es.png" + +
+
+
+ + + + #SYSTEM.DATE + +
+
+ \ No newline at end of file