From 8f2aec0049dc6cfb422f5351a7839e29578957c7 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Tue, 15 Oct 2019 15:14:48 +0200 Subject: [PATCH] Patch level : 12.0 888 Files correlati : cg0.exe cg0800a.rep cg4.exe cg4b00a.rep Commento : Aggiornate stampe prpgressivi avanzate --- src/cg/cg0800a.rep | 80 ++++++++++++++++++++++++++++------------------ src/cg/cg4b00a.rep | 80 ++++++++++++++++++++++++++++------------------ src/cg/cglib05.cpp | 35 +++++++++++++++++--- src/cg/cglib05.h | 2 ++ 4 files changed, 131 insertions(+), 66 deletions(-) diff --git a/src/cg/cg0800a.rep b/src/cg/cg0800a.rep index 6f6fafbaa..f4f7c94cb 100644 --- a/src/cg/cg0800a.rep +++ b/src/cg/cg0800a.rep @@ -1,31 +1,31 @@ - + Riepilogo progressivi IVA
#SYSTEM.DATE - + #SYSTEM.RAGSOC - + #SYSTEM.RAGSOC - + #PAGE - + #PAGE - + - + #ANNO - + #DAMESE @@ -44,7 +44,7 @@
  • - + #AMESE @@ -63,25 +63,31 @@
  • - + + + + + + + - - + + - - + + - - + + - - + + - - + + - +
    • @@ -97,22 +103,22 @@ #THIS @ #F1.102 +! - + IVAVEN #THIS @ #F1.103 +! - + IMPCORR #THIS @ #F1.104 +! - + IVACORR #THIS @ #F1.105 +! - + IMPACQ #THIS @ #F1.106 +! @@ -122,19 +128,31 @@ #THIS @ #F1.107 +! + + IMPACQIND + #THIS @ +#F1.108 +! + + + IVAACQIND + #THIS @ +#F1.109 +! +
    - + DESC - - - - - + + + + + + +
    USE 25 KEY 1 SELECT BETWEEN(23.DATAREG;#FROMDATE;#TODATE) \nJOIN 23 INTO NUMREG==NUMREG"; \ No newline at end of file diff --git a/src/cg/cg4b00a.rep b/src/cg/cg4b00a.rep index 0ec843aed..a6a812fa6 100644 --- a/src/cg/cg4b00a.rep +++ b/src/cg/cg4b00a.rep @@ -1,31 +1,31 @@ - + Riepilogo progressivi IVA per competenza
    #SYSTEM.DATE - + #SYSTEM.RAGSOC - + #SYSTEM.RAGSOC - + #PAGE - + #PAGE - + - + #ANNO - + #DAMESE @@ -44,7 +44,7 @@
  • - + #AMESE @@ -63,39 +63,45 @@
  • - + - + #FROMDATE - + - + #TODATE - + + + + + + + - - + + - - + + - - + + - - + + - - + + - +
    • @@ -111,7 +117,7 @@ #THIS @ #F1.102 +! - + IVAVEN #THIS @ #F1.103 +! @@ -121,7 +127,7 @@ #THIS @ #F1.104 +! - + IVACORR #THIS @ #F1.105 +! @@ -131,24 +137,36 @@ #THIS @ #F1.106 +! - + IVAACQ #THIS @ #F1.107 +! + + IMPACQIND + #THIS @ +#F1.108 +! + + + IVAACQIND + #THIS @ +#F1.109 +! +
    - + DESC - + - + + +
    USE 25 KEY 1 SELECT BETWEEN(23.DATAREG;#FROMDATE;#TODATE) \nJOIN 23 INTO NUMREG==NUMREG"; \ No newline at end of file diff --git a/src/cg/cglib05.cpp b/src/cg/cglib05.cpp index 1f865064b..2d4b30c08 100644 --- a/src/cg/cglib05.cpp +++ b/src/cg/cglib05.cpp @@ -32,6 +32,8 @@ public: real & ivacorr() { return get_val(3); } real & impven() { return get_val(4); } real & ivaven() { return get_val(5); } + real & impacqind() { return get_val(6); } + real & ivaacqind() { return get_val(7); } TRiepilogoIVA_record& operator= (const TRiepilogoIVA_record & rec) { return copy(rec);} TRiepilogoIVA_record(const TRiepilogoIVA_record & rec) { copy(rec); } @@ -85,6 +87,7 @@ void TRiepilogoIVA_recordset::requery() long gruppo = recset.get(RMI_GRUPPO).as_int(); long conto = recset.get(RMI_CONTO).as_int(); long sottoconto = recset.get(RMI_SOTTOCONTO).as_int(); + int indetr = recset.get(RMI_TIPODET).as_int(); TRegistro reg(recset.get(reg_fieldname).as_string()); TipoIVA t = reg.iva(); @@ -119,10 +122,20 @@ void TRiepilogoIVA_recordset::requery() work_array.add(cod, rec = new TRiepilogoIVA_record(cod)); if (t == iva_acquisti) { - real & r = rec->impacq(); - r += recset.get(RMI_IMPONIBILE).as_real(); - real & r1 = rec->ivaacq(); - r1 += recset.get(RMI_IMPOSTA).as_real(); + if (indetr == 0) + { + real & r = rec->impacq(); + r += recset.get(RMI_IMPONIBILE).as_real(); + real & r1 = rec->ivaacq(); + r1 += recset.get(RMI_IMPOSTA).as_real(); + } + else + { + real & r = rec->impacqind(); + r += recset.get(RMI_IMPONIBILE).as_real(); + real & r1 = rec->ivaacqind(); + r1 += recset.get(RMI_IMPOSTA).as_real(); + } } else if (t == iva_vendite) @@ -237,6 +250,18 @@ const TVariant& TRiepilogoIVA_recordset::get_field(int num, const char* field) c val = row.ivaven(); return val; } + else + if (xvt_str_compare_ignoring_case(field, IMPACQIND) == 0) + { + val = row.impacqind(); + return val; + } + else + if (xvt_str_compare_ignoring_case(field, IVAACQIND) == 0) + { + val = row.ivaacqind(); + return val; + } } return NULL_VARIANT; } @@ -281,5 +306,7 @@ TRiepilogoIVA_recordset::TRiepilogoIVA_recordset() : TRecordset(), _pos(0), _fro add_field(_realfld, 106, 18, IVACORR); add_field(_realfld, 107, 18, IMPVEN); add_field(_realfld, 108, 18, IVAVEN); + add_field(_realfld, 109, 18, IMPACQIND); + add_field(_realfld, 110, 18, IVAACQIND); } diff --git a/src/cg/cglib05.h b/src/cg/cglib05.h index 11f76e221..1048323df 100644 --- a/src/cg/cglib05.h +++ b/src/cg/cglib05.h @@ -17,6 +17,8 @@ #define IVACORR "IVACORR" #define IMPVEN "IMPVEN" #define IVAVEN "IVAVEN" +#define IMPACQIND "IMPACQIND" +#define IVAACQIND "IVAACQIND" class TRiepilogoIVA_recordset : public TRecordset {