diff --git a/ct/ct0100.cpp b/ct/ct0100.cpp index 768298489..0d2c394fa 100755 --- a/ct/ct0100.cpp +++ b/ct/ct0100.cpp @@ -131,23 +131,6 @@ void TPrint_CUP::print_or_preview(const bool stampa) rep.recordset()->set_var("#ANUMREG", to_nreg); } //if (tipo_archivio == "M")... - //solo per la ricerca in DOC - if (tipo_archivio == "D") - { - long da_anno = 0; - long a_anno = 0; - - const TDate dataini = _mask->get_date(F_DADATA); - if (dataini.ok()) - da_anno = dataini.year(); - const TDate datafine = _mask->get_date(F_ADATA); - if (datafine.ok()) - a_anno = datafine.year(); - - rep.recordset()->set_var("#DAANNO", da_anno); - rep.recordset()->set_var("#AANNO", a_anno); - } //if (tipo_archivio == "D")... - TReport_book book; book.add(rep); book.print_or_preview(); diff --git a/ct/ct0100D1.rep b/ct/ct0100D1.rep index 35a63d18a..4611ce761 100755 --- a/ct/ct0100D1.rep +++ b/ct/ct0100D1.rep @@ -109,13 +109,13 @@ - +
  • - + MESSAGE ADD,F1.106 @@ -151,7 +151,7 @@ USE DOC KEY 3 SELECT ((CUP!="")(BETWEEN(CUP,#CUP,#CUP)))((CIG!="")(BETWEEN(CIG,#CIG,#CIG)))(TIPOCF=#TIPOCF)(BETWEEN(CODCF,#CODCF,#CODCF)) BY CUP CIG CODCF DATADOC -FROM DATADOC=#DADATA PROVV=D ANNO=#DAANNO -TO DATADOC=#ADATA PROVV=D ANNO=#AANNO +FROM DATADOC=#DADATA +TO DATADOC=#ADATA \ No newline at end of file diff --git a/ct/ct0100D2.rep b/ct/ct0100D2.rep index 9e6954672..2451a7ab7 100755 --- a/ct/ct0100D2.rep +++ b/ct/ct0100D2.rep @@ -105,13 +105,13 @@ - +
  • - + MESSAGE ADD,F1.106 @@ -146,7 +146,7 @@ USE DOC KEY 3 SELECT ((CUP!="")(BETWEEN(CUP,#CUP,#CUP)))((CIG!="")(BETWEEN(CIG,#CIG,#CIG)))(TIPOCF=#TIPOCF)(BETWEEN(CODCF,#CODCF,#CODCF)) BY CODCF CUP CIG DATADOC -FROM DATADOC=#DADATA PROVV=D ANNO=#DAANNO -TO DATADOC=#ADATA PROVV=D ANNO=#AANNO +FROM DATADOC=#DADATA +TO DATADOC=#ADATA \ No newline at end of file diff --git a/ct/ct0100E1.rep b/ct/ct0100E1.rep new file mode 100755 index 000000000..475b9635c --- /dev/null +++ b/ct/ct0100E1.rep @@ -0,0 +1,176 @@ + + + Effetti per CUP - CIG + +
    + + + + + + + + + + + + + + + + + + + + + + + TIPOC + +
  • +
  • + + +
  • +
    + MESSAGE RESET,F1 + + + + + + + + + TIPOCF + MESSAGE COPY,F1.101 + +
  • +
  • + + +
  • +
    + CUP+CIG + + MESSAGE RESET,F2 + + + + + + + + + + CUP + MESSAGE COPY,F2.103 + + + + CIG + MESSAGE COPY,F2.104 + +
    +
    + TIPOCF+CODCF + + MESSAGE RESET,F3 + + CODCF + + + MESSAGE ISAMREAD,20,TIPOCF=#H1.101!CODCF=#102,RAGSOC + MESSAGE COPY,F3.103 + +
    +
    +
    + + NPROGTR + + + DATASCAD + + + TIPOPAG + + + NUMEMISS + + + DATAEMISS + + + NDIST + + + DATADIST + + + NRIGADIST + + + IMPORTO + MESSAGE ADD,F3.106 + +
    +
    + + + + #REPORT.PAGE + +
    +
    + + + + + + +
  • +
  • + + + + MESSAGE ADD,F1.106 + +
  • +
    + + + + + + + + + + + + + + + MESSAGE ADD,F1.106 + +
    +
    + + + + + + + + MESSAGE ADD,F2.106 + +
    + USE EFFETTI KEY 3 +SELECT ((CUP!="")(BETWEEN(CUP,#CUP,#CUP)))((CIG!="")(BETWEEN(CIG,#CIG,#CIG)))(TIPOCF=#TIPOCF)(BETWEEN(CODCF,#CODCF,#CODCF)) +BY CUP CIG CODCF DATASCAD +FROM DATASCAD=#DADATA +TO DATASCAD=#ADATA + + \ No newline at end of file diff --git a/ct/ct0100E2.rep b/ct/ct0100E2.rep new file mode 100755 index 000000000..0ec59e2fa --- /dev/null +++ b/ct/ct0100E2.rep @@ -0,0 +1,170 @@ + + + Effetti per Clienti - Fornitori + +
    + + + + + + + + + + + + + + + + + + + + + + + TIPOC + +
  • +
  • + + +
  • +
    + MESSAGE RESET,F1 + + + + + + + + + TIPOCF + MESSAGE COPY,F1.101 + +
  • +
  • + + +
  • +
    + TIPOCF+CODCF + + MESSAGE RESET,F2 + + + + CODCF + + + + MESSAGE ISAMREAD,20,TIPOCF=#H1.101!CODCF=#102,RAGSOC + MESSAGE COPY,F2.103 + +
    +
    + CUP+CIG + + MESSAGE RESET,F3 + + + + CUP + MESSAGE COPY,F3.103 + + + CIG + MESSAGE COPY,F3.104 + +
    +
    +
    + + NPROGTR + + + DATASCAD + + + TIPOPAG + + + NUMEMISS + + + DATAEMISS + + + NDIST + + + DATADIST + + + NRIGADIST + + + IMPORTO + MESSAGE ADD,F3.106 + +
    +
    + + + + #REPORT.PAGE + +
    +
    + + + + + + +
  • +
  • + + + + MESSAGE ADD,F1.106 + +
  • +
    + + + + + + + + + + + + MESSAGE ADD,F1.106 + +
    +
    + + + + + + + + + + + MESSAGE ADD,F2.106 + +
    + USE EFFETTI KEY 2 +SELECT ((CUP!="")(BETWEEN(CUP,#CUP,#CUP)))((CIG!="")(BETWEEN(CIG,#CIG,#CIG)))(BETWEEN(DATASCAD,#DADATA,#ADATA)) +BY CODCF CUP CIG DATASCAD +FROM TIPOCF=#TIPOCF CODCF=#CODCF +TO TIPOCF=#TIPOCF CODCF=#CODCF + \ No newline at end of file diff --git a/ct/ct0100a.uml b/ct/ct0100a.uml index 160680c40..89d113db8 100755 --- a/ct/ct0100a.uml +++ b/ct/ct0100a.uml @@ -139,6 +139,7 @@ DATE F_DADATA BEGIN PROMPT 1 17 "Dalla data " FIELD #DADATA + CHECKTYPE REQUIRED END DATE F_ADATA