From 3070c2a72c6371c40686c7bb9173aed1d7737005 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 6 May 2013 08:52:50 +0000 Subject: [PATCH] Corrette stampe CIG e CUP git-svn-id: svn://10.65.10.50/branches/R_10_00@22850 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ct/ct0100.cpp | 32 +++-- ct/ct0100M1.rep | 347 +++++++++++++++++++++++++----------------------- ct/ct0100M2.rep | 337 +++++++++++++++++++++++----------------------- ct/ct0100a.uml | 2 +- 4 files changed, 370 insertions(+), 348 deletions(-) diff --git a/ct/ct0100.cpp b/ct/ct0100.cpp index a6a40ea77..95e4daa92 100755 --- a/ct/ct0100.cpp +++ b/ct/ct0100.cpp @@ -108,23 +108,27 @@ void TPrint_CUP::print_or_preview(const bool stampa) { long from_nreg = 0L; long to_nreg = 0L; - TLocalisamfile mov(LF_MOV); - mov.setkey(2); - //se viene settata una data -> la usa per restringere il campo di ricerca dei numreg, visto che non esiste una.. - //..chiave per data su RMOV + const TDate dataini = _mask->get_date(F_DADATA); - if (dataini.ok()) - { - mov.put(MOV_DATAREG, dataini); - if (mov.read(_isgteq) == NOERR) - from_nreg = mov.get_long(MOV_NUMREG); - } const TDate datafine = _mask->get_date(F_ADATA); - if (datafine.ok()) + if (dataini.ok() || datafine.ok()) { - mov.put(MOV_DATAREG, datafine); - if (mov.read(_isgreat) == NOERR) - to_nreg = mov.get_long(MOV_NUMREG); + TLocalisamfile mov(LF_MOV); + mov.setkey(2); + mov.put(MOV_DATAREG, dataini); + for (int err = mov.read(_isgteq); err == NOERR; err = mov.read(_isnext)) + { + const TDate date = mov.get(MOV_DATAREG); + if (date < dataini) + continue; // Should never happen + if (datafine.ok() && date > datafine) + break; + const long nreg = mov.get_long(MOV_NUMREG); + if (nreg < from_nreg || from_nreg <= 0) + from_nreg = nreg; + if (nreg > to_nreg) + to_nreg = nreg; + } } rep.recordset()->set_var("#DANUMREG", from_nreg); rep.recordset()->set_var("#ANUMREG", to_nreg); diff --git a/ct/ct0100M1.rep b/ct/ct0100M1.rep index 5424962e0..00ad40bec 100755 --- a/ct/ct0100M1.rep +++ b/ct/ct0100M1.rep @@ -1,170 +1,179 @@ - - - Movimenti per CUP - CIG - -
- - - - - - - - - - - - - - TIPOC - -
  • -
  • - - -
    • -
    - MESSAGE RESET,F1 - - - - - - - - - TIPOC - MESSAGE COPY,F1.101 - -
  • -
  • - - -
    • -
    - CUP+CIG - - MESSAGE RESET,F2 - - - - - - - - - - - CUP - MESSAGE COPY,F2.103 - - - - CIG - MESSAGE COPY,F2.104 - -
    -
    - TIPOC+SOTTOCONTO - - MESSAGE RESET,F3 - - SOTTOCONTO - - - MESSAGE ISAMREAD,20,TIPOCF=#H1.101!CODCF=#102,RAGSOC - MESSAGE COPY,F3.103 - -
    -
    -
    - - NUMREG - - - NUMRIG - - - DATAREG - - - - IMPORTO - MESSAGE ADD,F3.105 - - - IMPORTO - MESSAGE ADD,F3.106 - -
    -
    - - - - #REPORT.PAGE - -
    -
    - - - - - -
  • -
  • - - - - MESSAGE ADD,F1.105 - - - MESSAGE ADD,F1.106 - -
    • -
    - - - - - - - - - - - - - - MESSAGE ADD,F1.105 - - - - MESSAGE ADD,F1.106 - -
    -
    - - - - - - - - MESSAGE ADD,F2.105 - - - MESSAGE ADD,F2.106 - -
    - USE RMOV -SELECT ((CUP!="")(BETWEEN(CUP,#CUP,#CUP)))((CIG!="")(BETWEEN(CIG,#CIG,#CIG)))(TIPOC=#TIPOCF)(BETWEEN(SOTTOCONTO,#CODCF,#CODCF))(BETWEEN(DATAREG,#DADATA,#ADATA)) -BY CUP CIG SOTTOCONTO -FROM NUMREG=#DANUMREG -TO NUMREG=#ANUMREG + + + Movimenti per CUP - CIG + +
    + + + + + + + + + + + + + + + + TIPOC + +
  • +
  • + + +
    • +
    + MESSAGE RESET,F1 + + + + + + + + + TIPOC + MESSAGE COPY,F1.101 + +
  • +
  • + + +
    • +
    + CUP+CIG + + MESSAGE RESET,F2 + + + + + + + + + + + CUP + MESSAGE COPY,F2.103 + + + + CIG + MESSAGE COPY,F2.104 + +
    +
    + TIPOC+SOTTOCONTO + + MESSAGE RESET,F3 + + SOTTOCONTO + + + MESSAGE ISAMREAD,20,TIPOCF=#H1.101!CODCF=#102,RAGSOC + MESSAGE COPY,F3.103 + +
    +
    +
    + + NUMREG + + + NUMRIG + + + DATAREG + + + + 23.NUMDOC + + + 23.DATADOC + + + IMPORTO + MESSAGE ADD,F3.105 + + + IMPORTO + MESSAGE ADD,F3.106 + +
    +
    + + + + #REPORT.PAGE + +
    +
    + + + + + +
  • +
  • + + + + MESSAGE ADD,F1.105 + + + MESSAGE ADD,F1.106 + +
    • +
    + + + + + + + + + + + + + + MESSAGE ADD,F1.105 + + + + MESSAGE ADD,F1.106 + +
    +
    + + + + + + + + MESSAGE ADD,F2.105 + + + MESSAGE ADD,F2.106 + +
    + USE RMOV +SELECT ((CUP!="")||(CIG!=""))  (BETWEEN(CUP,#CUP,#CUP))(BETWEEN(CIG,#CIG,#CIG))  (TIPOC=#TIPOCF)(BETWEEN(SOTTOCONTO,#CODCF,#CODCF))(BETWEEN(DATAREG,#DADATA,#ADATA)) +BY CUP CIG SOTTOCONTO DATAREG NUMREG +JOIN MOV INTO NUMREG==NUMREG +FROM NUMREG=#DANUMREG +TO NUMREG=#ANUMREG \ No newline at end of file diff --git a/ct/ct0100M2.rep b/ct/ct0100M2.rep index d26aae426..6e79f0aef 100755 --- a/ct/ct0100M2.rep +++ b/ct/ct0100M2.rep @@ -1,165 +1,174 @@ - - - Movimenti per Clienti - Fornitori - -
    - - - - - - - - - - - - - - TIPOC - -
  • -
  • - - -
    • -
    - MESSAGE RESET,F1 - - - - - - - - - TIPOC - MESSAGE COPY,F1.101 - -
  • -
  • - - -
    • -
    - TIPOC+SOTTOCONTO - - MESSAGE RESET,F2 - - - - SOTTOCONTO - - - - 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 - -
    -
    -
    - - NUMREG - - - NUMRIG - - - DATAREG - - - - IMPORTO - MESSAGE ADD,F3.105 - - - IMPORTO - MESSAGE ADD,F3.106 - -
    -
    - - - - #REPORT.PAGE - -
    -
    - - - - - -
  • -
  • - - - - MESSAGE ADD,F1.105 - - - MESSAGE ADD,F1.106 - -
    • -
    - - - - - - - - - - - MESSAGE ADD,F1.105 - - - - MESSAGE ADD,F1.106 - -
    -
    - - - - - - - - - - - MESSAGE ADD,F2.105 - - - MESSAGE ADD,F2.106 - -
    - USE RMOV -SELECT ((CUP!="")(BETWEEN(CUP,#CUP,#CUP)))((CIG!="")(BETWEEN(CIG,#CIG,#CIG)))(TIPOC=#TIPOCF)(BETWEEN(SOTTOCONTO,#CODCF,#CODCF))(BETWEEN(DATAREG,#DADATA,#ADATA)) -BY SOTTOCONTO CUP CIG -FROM NUMREG=#DANUMREG -TO NUMREG=#ANUMREG + + + Movimenti per Clienti - Fornitori + +
    + + + + + + + + + + + + + + TIPOC + +
  • +
  • + + + + +
    • +
    + MESSAGE RESET,F1 + + + + + + + + + TIPOC + MESSAGE COPY,F1.101 + +
  • +
  • + + +
    • +
    + TIPOC+SOTTOCONTO + + MESSAGE RESET,F2 + + + + SOTTOCONTO + + + + 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 + +
    +
    +
    + + NUMREG + + + NUMRIG + + + DATAREG + + + + IMPORTO + MESSAGE ADD,F3.105 + + + IMPORTO + MESSAGE ADD,F3.106 + + + 23.NUMDOC + + + 23.DATADOC + +
    +
    + + + + #REPORT.PAGE + +
    +
    + + + + + +
  • +
  • + + + + MESSAGE ADD,F1.105 + + + MESSAGE ADD,F1.106 + +
    • +
    + + + + + + + + + + + MESSAGE ADD,F1.105 + + + + MESSAGE ADD,F1.106 + +
    +
    + + + + + + + + + + + MESSAGE ADD,F2.105 + + + MESSAGE ADD,F2.106 + +
    + USE RMOV +SELECT ((CUP!="")||(CIG!=""))  (BETWEEN(CUP,#CUP,#CUP))(BETWEEN(CIG,#CIG,#CIG))  (TIPOC=#TIPOCF)(BETWEEN(SOTTOCONTO,#CODCF,#CODCF))(BETWEEN(DATAREG,#DADATA,#ADATA)) +BY SOTTOCONTO CUP CIG DATAREG NUMREG +JOIN MOV INTO NUMREG==NUMREG +FROM NUMREG=#DANUMREG +TO NUMREG=#ANUMREG \ No newline at end of file diff --git a/ct/ct0100a.uml b/ct/ct0100a.uml index 800300404..2e759750b 100755 --- a/ct/ct0100a.uml +++ b/ct/ct0100a.uml @@ -95,7 +95,7 @@ END LIST F_TIPOCF 1 11 BEGIN - PROMPT 1 13 "Tipo " + PROMPT 1 13 "" ITEM "C|Clienti" ITEM "F|Fornitori" FIELD #TIPOCF