diff --git a/src/cg/cg7600.cpp b/src/cg/cg7600.cpp index 508b7dd29..ca2a39d36 100644 --- a/src/cg/cg7600.cpp +++ b/src/cg/cg7600.cpp @@ -106,9 +106,8 @@ void TQuadro_VE_recordset::load() const bool terremotati = int_tipo_iva11_ven == 25; tiporec tipo; - real imp = pimr.get_real("R0"); - real iva = pimr.get_real("R1"); - bool done = false; + real imp; + real iva; if (classify_pim(pimr, imp, iva, tipo, true)) { @@ -183,6 +182,11 @@ void TQuadro_VE_recordset::load() }; } + else + { + imp = pimr.get_real("R0"); + iva = pimr.get_real("R1"); + } if (non_imponibile) { if (int_tipo_iva11_ven == 21) diff --git a/src/cg/cg7600a.rep b/src/cg/cg7600a.rep index 2f743699c..9f6f9d4c0 100644 --- a/src/cg/cg7600a.rep +++ b/src/cg/cg7600a.rep @@ -12,6 +12,10 @@
+ + + #SYSTEM.RAGSOC + #SYSTEM.CFPI_SPACED diff --git a/src/cg/cg7600l.rep b/src/cg/cg7600l.rep index edd3d1184..142bc5b79 100644 --- a/src/cg/cg7600l.rep +++ b/src/cg/cg7600l.rep @@ -96,22 +96,22 @@
- - - - - - - - + + + + + + + + - + - + - + - +
diff --git a/src/cg/cg7700.cpp b/src/cg/cg7700.cpp index 01cc487c0..d2c0b7668 100644 --- a/src/cg/cg7700.cpp +++ b/src/cg/cg7700.cpp @@ -41,12 +41,10 @@ void TQuadro_VF_recordset::load() imponibile.add("2.00", TString8("VF01.1")); imposta.add("2.00", TString8("VF01.2")); - imponibile.add("4.00", TString8("VF02.2")); + imponibile.add("4.00", TString8("VF02.1")); imposta.add("4.00", TString8("VF02.2")); imponibile.add("5.00", TString8("VF03.1")); imposta.add("5.00", TString8("VF03.2")); - imponibile.add("7.00", TString8("VF03.1")); - imposta.add("7.00", TString8("VF03.2")); imponibile.add("7.30", TString8("VF04.1")); imposta.add("7.30", TString8("VF04.2")); imponibile.add("7.50", TString8("VF05.1")); @@ -171,9 +169,9 @@ void TQuadro_VF_recordset::load() const bool esente = (tipo_aliquota == "ES"); const bool non_soggetto = (tipo_aliquota == "NS"); const bool terremotati = int_tipo_iva11_acq == 16; - real imp = pimr.get_real("R0") - pimr.get_real("R9"); - real iva = pimr.get_real("R1") - pimr.get_real("R10"); - + real imp; + real iva; + if (classify_pim(pimr, imp, iva, tipo, true)) { good = true; @@ -262,6 +260,11 @@ void TQuadro_VF_recordset::load() }; } + else + { + imp = pimr.get_real("R0") - pimr.get_real("R9"); + iva = pimr.get_real("R1") - pimr.get_real("R10"); + } if (non_imponibile) { if (int_tipo_iva11_acq == 12) diff --git a/src/cg/cg7700a.rep b/src/cg/cg7700a.rep index c377b9364..fafd406fe 100644 --- a/src/cg/cg7700a.rep +++ b/src/cg/cg7700a.rep @@ -12,6 +12,10 @@
+ + + #SYSTEM.RAGSOC + #SYSTEM.CFPI_SPACED @@ -30,10 +34,10 @@ VF02.1 - VF01.2 + VF02.2 - V03.1 + VF03.1 VF03.2 diff --git a/src/cg/cg7700b.png b/src/cg/cg7700b.png index c09eb8773..acd2d9e3b 100644 Binary files a/src/cg/cg7700b.png and b/src/cg/cg7700b.png differ diff --git a/src/cg/cg7700b.rep b/src/cg/cg7700b.rep index 55769f670..bb4d2e419 100644 --- a/src/cg/cg7700b.rep +++ b/src/cg/cg7700b.rep @@ -12,7 +12,11 @@
- + + + #SYSTEM.RAGSOC + + #SYSTEM.CFPI_SPACED @@ -206,7 +210,7 @@ NUM((#3004=="X")(#3006=="X")(#3007=="X"))*VE26.2*0.5+NUM(#3005=="X")*VE26.2F;3+NUM(#3008=="X")*VE54.2 - NUM(#6001!="X"#6002!="X")*(#6202*0.5+#7002+#7003+#7004+#7005) + NUM(#6001!="X"#6002!="X")*(#6202F;2+#7002+#7003+#7004+#7005)
diff --git a/src/cg/cg7700c.rep b/src/cg/cg7700c.rep index ddd7347f3..54cb62489 100644 --- a/src/cg/cg7700c.rep +++ b/src/cg/cg7700c.rep @@ -31,7 +31,7 @@ "Data di Stampa: " +#SYSTEM.DATE - "ELENCO FATTURE ACQUISTO VF12 - VF16 - " +#ANNO + "ELENCO FATTURE ACQUISTO VF14 - VF18 - " +#ANNO