Patch level : 10.0

Files correlati     :
Ricompilazione Demo : [ ]
Commento            : stampa buoni, correzioni per un miglior funzionamento


git-svn-id: svn://10.65.10.50/trunk@19691 c028cbd2-c16b-5b4b-a496-9718f37d4682

lv/lv1100.cpp

@@ -64,48 +64,38 @@ void TStampaBuoni_app::elabora(const TMask& mask) const
 {
 	const TDate data_from = mask.get_date(F_DATA_FROM);
 	TString query = "USE DOC \n"
+									"SELECT (BETWEEN(DATADOC,#DATA_FROM,#DATA_TO))"
+									"&&(BETWEEN(CODCF,#CODCF_FROM,#CODCF_TO))"
+									"&&(BETWEEN(G1:CODITI,#CODITI_FROM,#CODITI_TO))\n"
 									"JOIN CLIFO INTO TIPOCF=='C' CODCF==CODCF\n"
-									"SELECT (BETWEEN(DATADOC,#FROM_DATA,#TO_DATA))\n"
-									"(BETWEEN(CODCF,#FROM_CODCF,#TO_CODCF))\n"
-									//"&&SELECT (BETWEEN(G1:CODITI,#FROM_CODITI,#TO_CODITI))"
-									//"&&(BETWEEN(G1:CODAUT,#FROM_CODAUT,#TO_CODAUT))\n";
 									;
-  query << "FROM PROVV=\"D\" ANNO=" << data_from.year() << " CODNUM=\"" << mask.get(F_CODNUM) << " TIPODOC=\"" << mask.get(F_TIPODOC) << "\"\n"
+  query << "FROM PROVV=\"D\" ANNO=" << data_from.year() << " CODNUM=\"" << mask.get(F_CODNUM) << "\"\n"
-				<< "TO PROVV=\"D\" ANNO=" << data_from.year() << " CODNUM=\"" << mask.get(F_CODNUM) << " TIPODOC=\"" << mask.get(F_TIPODOC) << "\"\n";
+				<< "TO PROVV=\"D\" ANNO=" << data_from.year() << " CODNUM=\"" << mask.get(F_CODNUM) << "\"\n";
   TISAM_recordset buoni(query);                     
   //inserire parametri filtri
-  buoni.set_var("#FROM_DATA",mask.get_date(F_DATA_FROM));
+  buoni.set_var("#DATA_FROM", mask.get_date(F_DATA_FROM));
-  buoni.set_var("#TO_DATA",mask.get_date(F_DATA_TO)); 
+  buoni.set_var("#DATA_TO",	mask.get_date(F_DATA_TO)); 
-  buoni.set_var("#FROM_CODCF",TVariant(mask.get(F_CODCF_FROM)));
+  buoni.set_var("#CODCF_FROM", TVariant(mask.get(F_CODCF_FROM)));
-  buoni.set_var("#TO_CODCF",TVariant(mask.get(F_CODCF_TO)));
+  buoni.set_var("#CODCF_TO", TVariant(mask.get(F_CODCF_TO)));
-	/*
+  buoni.set_var("#CODITI_FROM", TVariant(mask.get(F_CODITI_FROM)));
-  if (mask.get(F_CODITI_FROM).empty())
+  buoni.set_var("#CODITI_TO", TVariant(mask.get(F_CODITI_TO)));
-		buoni.set_var("#FROM_CODITI", "000");
-	else
-		buoni.set_var("#FROM_CODITI", TVariant(mask.get(F_CODITI_FROM)));
-  if (mask.get(F_CODITI_TO).empty())
-		buoni.set_var("#TO_CODITI","ZZZ");
-	else
-		buoni.set_var("#TO_CODITI",TVariant(mask.get(F_CODITI_TO)));
-	*/
-  //buoni.set_var("#FROM_CODAUT",TVariant(mask.get(F_CODAUT_FROM)));
-  //buoni.set_var("#TO_CODAUT",TVariant(mask.get(F_CODAUT_TO)));
   
-	TFilename tmp; tmp.temp();
-  ofstream outf(tmp);
 	TString80 chiavedoc = "D|";
 	chiavedoc << data_from.year() << "|" <<	mask.get(F_CODNUM) << "|";
 
 	TCursor* c = buoni.cursor();
   TCursor_sheet sht(c, " |NDOC|DATADOC|CODCF|20->RAGSOC", TR("Selezione Documenti"),
                    HR("@1|Numero\nDoc.@7|Data\nDoc.@10|Cliente|Ragione Sociale@50"));
+
   if (sht.run() && sht.one_checked())
   {
+		TFilename tmp; tmp.temp();
+		ofstream outf(tmp);
+
 		const long items = sht.items();
 	  for (long i = 0L; i<items; i++)
 			if (sht.checked(i))
 			  outf << chiavedoc << sht.row(i).get_long(1) << endl;
-  }
 	  outf.close();
 
 		TString80 appname = "ve1.exe -2";
@@ -114,6 +104,7 @@ void TStampaBuoni_app::elabora(const TMask& mask) const
 	  app.run();
 		tmp.fremove();
 	}
+}
 
 void TStampaBuoni_app::main_loop()
 {

lv/lv1100a.uml

@@ -14,7 +14,6 @@ END
 STRING F_CODNUM 4
 BEGIN
   PROMPT 2 2 "Numerazione  "
-  FIELD NUM_GEN
   HELP "Codice numerazione"
   USE %NUM
   INPUT CODTAB F_CODNUM
@@ -41,7 +40,6 @@ END
 STRING F_TIPODOC 4
 BEGIN
   PROMPT 2 3 "Tipo         "
-  FIELD TIPODOC
   HELP "Codice tipo documento"
   USE %TIP
   INPUT CODTAB F_TIPODOC
@@ -72,7 +70,6 @@ END
 DATE F_DATA_FROM
 BEGIN
   PROMPT 2 6 "Dal "
-  FIELD #FROM_DATA
   GROUP 1
   CHECKTYPE REQUIRED
   FLAGS "A"
@@ -81,7 +78,6 @@ END
 DATE F_DATA_TO
 BEGIN
   PROMPT 25 6 "Al "
-  FIELD #TO_DATA
   FLAGS "A"
   GROUP 2
   CHECKTYPE REQUIRED
@@ -106,7 +102,6 @@ BEGIN
   OUTPUT F_CODCF_FROM CODCF
   OUTPUT F_RAGSOCCF_FROM RAGSOC
   CHECKTYPE NORMAL
-  FIELD #FROM_CODCF
 END
 
 STRING F_RAGSOCCF_FROM 50
@@ -127,7 +122,6 @@ BEGIN
   OUTPUT F_CODCF_TO CODCF
   OUTPUT F_RAGSOCCF_TO RAGSOC
   CHECKTYPE NORMAL
-  FIELD #TO_CODCF
 END
 
 STRING F_RAGSOCCF_TO 50
@@ -152,7 +146,6 @@ BEGIN
   OUTPUT F_CODITI_FROM CODTAB
   OUTPUT F_DESITI_FROM S0 
   CHECKTYPE SEARCH
-  FIELD #FROM_CODITI
 END
 
 STRING F_DESITI_FROM 50
@@ -172,7 +165,6 @@ BEGIN
   OUTPUT F_CODITI_TO CODTAB
   OUTPUT F_DESITI_TO S0 
   CHECKTYPE SEARCH
-  FIELD #TO_CODITI
 END
 
 STRING F_DESITI_TO 50
@@ -197,7 +189,6 @@ END
 //  OUTPUT F_CODAUT_FROM CODTAB
 //  OUTPUT F_DESAUT_FROM S0 
 //  CHECKTYPE SEARCH
-//  FIELD #FROM_CODAUT
 //END
 //
 //STRING F_DESAUT_FROM 50
@@ -217,7 +208,6 @@ END
 //  OUTPUT F_CODAUT_TO CODTAB
 //  OUTPUT F_DESAUT_TO S0 
 //  CHECKTYPE SEARCH
-//  FIELD #TO_CODAUT
 //END
 
 //STRING F_DESAUT_TO 50