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

@@ -108,23 +108,27 @@ void TPrint_CUP::print_or_preview(const bool stampa)
     {
       long from_nreg = 0L;
       long to_nreg = 0L;
+      
+      const TDate dataini = _mask->get_date(F_DADATA);
+      const TDate datafine = _mask->get_date(F_ADATA);
+      if (dataini.ok() || datafine.ok())
+      {
         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)
+        for (int err = mov.read(_isgteq); err == NOERR; err = mov.read(_isnext))
-          from_nreg = mov.get_long(MOV_NUMREG);
-      }
-      const TDate datafine = _mask->get_date(F_ADATA);
-      if (datafine.ok())
         {
-        mov.put(MOV_DATAREG, datafine);
+          const TDate date = mov.get(MOV_DATAREG);
-        if (mov.read(_isgreat) == NOERR)
+          if (date < dataini)
-          to_nreg = mov.get_long(MOV_NUMREG);
+            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);

ct/ct0100M1.rep

@@ -13,6 +13,8 @@
   <field x="18" y="2.5" type="Testo" align="center" width="10" pattern="1" text="Data Reg." />
   <field x="39.5" y="2.5" type="Testo" align="right" width="5" pattern="1" text="Dare" />
   <field x="51.5" y="2.5" type="Testo" align="right" width="7" pattern="1" text="Avere" />
+  <field x="65" y="2.5" type="Testo" align="right" width="8" pattern="1" text="Num.Doc." />
+  <field x="77" y="2.5" type="Testo" align="center" width="10" pattern="1" text="Data Doc." />
   <field border="1" x="1" y="3.5" type="Linea" width="100" height="0" pattern="1" />
   <field x="3" y="1.5" type="Array" bg_color="#C0C0C0" width="10" id="101" pattern="1">
    <font face="Arial" bold="1" size="8" />
@@ -94,6 +96,12 @@
     <li Value="Avere" Code="A">MESSAGE DISABLE,105|ENABLE,106</li>
    </list>
   </field>
+  <field x="66" type="Stringa" align="left" width="7" pattern="1">
+   <source>23.NUMDOC</source>
+  </field>
+  <field x="75" type="Data" width="10" pattern="1">
+   <source>23.DATADOC</source>
+  </field>
   <field x="31" type="Valuta" align="right" width="14" id="105" pattern="1" text="###.###.###,@@">
    <source>IMPORTO</source>
    <postscript description="B1.105 POSTSCRIPT">MESSAGE ADD,F3.105</postscript>
@@ -163,8 +171,9 @@
   </field>
  </section>
  <sql>USE RMOV
-SELECT ((CUP!="")&#26;&#26;(BETWEEN(CUP,#CUP,#CUP)))&#26;&#26;((CIG!="")&#26;&#26;(BETWEEN(CIG,#CIG,#CIG)))&#26;&#26;(TIPOC=#TIPOCF)&#26;&#26;(BETWEEN(SOTTOCONTO,#CODCF,#CODCF))&#26;&#26;(BETWEEN(DATAREG,#DADATA,#ADATA))
+SELECT ((CUP!="")||(CIG!="")) &#26;&#26; (BETWEEN(CUP,#CUP,#CUP))&#26;&#26;(BETWEEN(CIG,#CIG,#CIG)) &#26;&#26; (TIPOC=#TIPOCF)&#26;&#26;(BETWEEN(SOTTOCONTO,#CODCF,#CODCF))&#26;&#26;(BETWEEN(DATAREG,#DADATA,#ADATA))
-BY CUP CIG SOTTOCONTO
+BY CUP CIG SOTTOCONTO DATAREG NUMREG
+JOIN MOV INTO NUMREG==NUMREG
 FROM NUMREG=#DANUMREG
 TO NUMREG=#ANUMREG</sql>
 </report>

ct/ct0100M2.rep

@@ -22,6 +22,8 @@
     <li Value="Fornitore" Code="F" />
    </list>
   </field>
+  <field x="64" y="2.5" type="Testo" align="right" width="8" pattern="1" text="Num.Doc." />
+  <field x="75" y="2.5" type="Testo" align="center" width="10" pattern="1" text="Data Doc." />
  </section>
  <section type="Head" level="1" height="6" pattern="1">
   <prescript description="H1 PRESCRIPT">MESSAGE RESET,F1</prescript>
@@ -97,6 +99,12 @@
    <source>IMPORTO</source>
    <postscript description="B1.106 POSTSCRIPT">MESSAGE ADD,F3.106</postscript>
   </field>
+  <field x="66" type="Stringa" align="Left" width="7" pattern="1">
+   <source>23.NUMDOC</source>
+  </field>
+  <field x="75" type="Data" width="10" pattern="1">
+   <source>23.DATADOC</source>
+  </field>
  </section>
  <section type="Foot" pattern="1">
   <field border="1" x="0.5" y="0.25" type="Linea" width="100" height="0" pattern="1" />
@@ -158,8 +166,9 @@
   </field>
  </section>
  <sql>USE RMOV
-SELECT ((CUP!="")&#26;&#26;(BETWEEN(CUP,#CUP,#CUP)))&#26;&#26;((CIG!="")&#26;&#26;(BETWEEN(CIG,#CIG,#CIG)))&#26;&#26;(TIPOC=#TIPOCF)&#26;&#26;(BETWEEN(SOTTOCONTO,#CODCF,#CODCF))&#26;&#26;(BETWEEN(DATAREG,#DADATA,#ADATA))
+SELECT ((CUP!="")||(CIG!="")) &#26;&#26; (BETWEEN(CUP,#CUP,#CUP))&#26;&#26;(BETWEEN(CIG,#CIG,#CIG)) &#26;&#26; (TIPOC=#TIPOCF)&#26;&#26;(BETWEEN(SOTTOCONTO,#CODCF,#CODCF))&#26;&#26;(BETWEEN(DATAREG,#DADATA,#ADATA))
-BY SOTTOCONTO CUP CIG
+BY SOTTOCONTO CUP CIG DATAREG NUMREG
+JOIN MOV INTO NUMREG==NUMREG
 FROM NUMREG=#DANUMREG
 TO NUMREG=#ANUMREG</sql>
 </report>

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