From c0028d0ff5408e89e5c5ed3bd08b06d3b587e325 Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 14 Jan 2011 14:16:02 +0000 Subject: [PATCH] Patch level :10.0 Files correlati : Ricompilazione Demo : [ ] Commento : prima implementazione stampe cup-cig sui documenti git-svn-id: svn://10.65.10.50/branches/R_10_00@21432 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ct/ct0100.cpp | 18 +++++- ct/ct0100D1.rep | 157 ++++++++++++++++++++++++++++++++++++++++++++++++ ct/ct0100D2.rep | 152 ++++++++++++++++++++++++++++++++++++++++++++++ ct/ct0100M1.rep | 24 +++++--- ct/ct0100M2.rep | 14 +++-- ct/ct0100a.uml | 2 + 6 files changed, 355 insertions(+), 12 deletions(-) create mode 100755 ct/ct0100D1.rep create mode 100755 ct/ct0100D2.rep diff --git a/ct/ct0100.cpp b/ct/ct0100.cpp index 04ac6c9b2..768298489 100755 --- a/ct/ct0100.cpp +++ b/ct/ct0100.cpp @@ -129,8 +129,24 @@ void TPrint_CUP::print_or_preview(const bool stampa) } rep.recordset()->set_var("#DANUMREG", from_nreg); 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); diff --git a/ct/ct0100D1.rep b/ct/ct0100D1.rep new file mode 100755 index 000000000..35a63d18a --- /dev/null +++ b/ct/ct0100D1.rep @@ -0,0 +1,157 @@ + + + Documenti 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 + +
    +
    +
    + + CODNUM + + + ANNO + + + NDOC + + + TIPODOC + + + DATADOC + + + G1:TOTDOC + MESSAGE ADD,F3.106 + +
    +
    + + + + #REPORT.PAGE + +
    +
    + + + + + +
  • +
  • + + + + MESSAGE ADD,F1.106 + +
    • +
    + + + + + + + + + + + + + + + MESSAGE ADD,F1.106 + +
    +
    + + + + + + + + MESSAGE ADD,F2.106 + +
    + 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 + + \ No newline at end of file diff --git a/ct/ct0100D2.rep b/ct/ct0100D2.rep new file mode 100755 index 000000000..9e6954672 --- /dev/null +++ b/ct/ct0100D2.rep @@ -0,0 +1,152 @@ + + + Documenti 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 + +
    +
    +
    + + CODNUM + + + ANNO + + + NDOC + + + TIPODOC + + + DATADOC + + + G1:TOTDOC + MESSAGE ADD,F3.106 + +
    +
    + + + + #REPORT.PAGE + +
    +
    + + + + + +
  • +
  • + + + + MESSAGE ADD,F1.106 + +
    • +
    + + + + + + + + + + + MESSAGE ADD,F1.106 + +
    +
    + + + + + + + + + + + MESSAGE ADD,F2.106 + +
    + 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 + + \ No newline at end of file diff --git a/ct/ct0100M1.rep b/ct/ct0100M1.rep index d2e918aa3..5424962e0 100755 --- a/ct/ct0100M1.rep +++ b/ct/ct0100M1.rep @@ -1,12 +1,12 @@ - Movimenti per CUP-CIG + Movimenti per CUP - CIG
    - + @@ -45,15 +45,21 @@ CUP+CIG MESSAGE RESET,F2 - + + + - + + + + CUP MESSAGE COPY,F2.103 + CIG MESSAGE COPY,F2.104 @@ -124,17 +130,21 @@
    - + + + - + - + + MESSAGE ADD,F1.105 + MESSAGE ADD,F1.106
    diff --git a/ct/ct0100M2.rep b/ct/ct0100M2.rep index 91fdbe305..d26aae426 100755 --- a/ct/ct0100M2.rep +++ b/ct/ct0100M2.rep @@ -15,7 +15,7 @@ - + TIPOC
  • @@ -47,9 +47,11 @@ MESSAGE RESET,F2 + SOTTOCONTO + MESSAGE ISAMREAD,20,TIPOCF=#H1.101!CODCF=#102,RAGSOC MESSAGE COPY,F2.103 @@ -123,14 +125,18 @@
    - + + + - + + MESSAGE ADD,F1.105 + MESSAGE ADD,F1.106
    @@ -142,7 +148,7 @@     - + MESSAGE ADD,F2.105 diff --git a/ct/ct0100a.uml b/ct/ct0100a.uml index 16dc250c2..160680c40 100755 --- a/ct/ct0100a.uml +++ b/ct/ct0100a.uml @@ -145,6 +145,8 @@ DATE F_ADATA BEGIN PROMPT 25 17 "Alla data " FIELD #ADATA + VALIDATE DATE_CMP_FUNC >= F_DADATA + WARNING "La data finale deve essere succeviva a quella iniziale" END ENDPAGE