From e321aa0052a7385e54f0502bab1a7d39242c32ef Mon Sep 17 00:00:00 2001 From: rajitgill Date: Fri, 9 Oct 2009 17:38:40 +0000 Subject: [PATCH] Patch level :lv2.exe Files correlati : Ricompilazione Demo : [ ] Commento :Correzzioni fatturazione git-svn-id: svn://10.65.10.50/trunk@19416 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv2500.cpp | 19 ++++++-- lv/lv2500a.h | 14 +++--- lv/lv2500a.uml | 119 ++++++++++++++++++++++++++++++++++++------------- 3 files changed, 112 insertions(+), 40 deletions(-) diff --git a/lv/lv2500.cpp b/lv/lv2500.cpp index c9ab23ea9..146d846f9 100755 --- a/lv/lv2500.cpp +++ b/lv/lv2500.cpp @@ -817,7 +817,8 @@ void TFatturazione_lav_app::main_loop() //preparo la query TString query; //&&(BETWEEN(DATADOC,#DADATA,#ADATA))&&(STATO==\"2\")&&(TIPODOC==\"B01\") - query << "USE DOC KEY 3 SELECT (TIPOCF==\"C\")\n" + query << "USE DOC KEY 3 SELECT (TIPOCF==\"C\")&&" + << "(BETWEEN(CODCF," << msk.get_int(F_DACODCF) << ',' << msk.get_int(F_ACODCF) << ")\n" << "BY TIPOCF CODCF DATADOC\n" << "FROM " << "DATADOC=" << dal << " PROVV=D ANNO=" << year << "\n" << "TO " << "DATADOC=" << al << " PROVV=D ANNO=" << year << "\n"; @@ -827,12 +828,24 @@ void TFatturazione_lav_app::main_loop() //instanzio il recordset TISAM_recordset recset(query); + TProgind pi(recset.items(), "Fatturazione",true,true); + long last_clifo=0; //scorro tutti documenti che la query mi restiuisce for (bool ok = recset.move_first(); ok; ok = recset.move_next()) { //leggo il codcf const long clifo = recset.get(DOC_CODCF).as_int(); - + if (clifo != last_clifo) + { + TString80 str; + str << TR("Elaborazione Cliente ") << clifo; + pi.set_text(str); + last_clifo=clifo; + } + + if (!pi.addstatus(1)) + break; + //se non č l'ultimo cliente, allora: if (clifo != lastcli) { @@ -843,7 +856,7 @@ void TFatturazione_lav_app::main_loop() elab.put("B15", 'X'); elab.elabora(docsin, docsout, datafat); docsout.write(); - docsout.destroy(-1) ; + docsout.destroy(-1); docsin.rewrite(); docsin.destroy(-1); } diff --git a/lv/lv2500a.h b/lv/lv2500a.h index 2dcd48a90..564f922a5 100755 --- a/lv/lv2500a.h +++ b/lv/lv2500a.h @@ -1,11 +1,15 @@ #define F_DADATA 101 #define F_ADATA 102 #define F_DATAFAT 103 -#define F_COD_ELAB 104 -#define F_DESC_ELAB 105 -#define F_PERFAT 106 -#define F_CODCATC 107 -#define F_CODZONA 108 +#define F_DACODCF 104 +#define F_DARAGSOC 105 +#define F_ACODCF 106 +#define F_ARAGSOC 107 +#define F_COD_ELAB 108 +#define F_DESC_ELAB 109 +#define F_PERFAT 110 +#define F_CODCATC 111 +#define F_CODZONA 112 diff --git a/lv/lv2500a.uml b/lv/lv2500a.uml index 96a3728a1..035fca619 100755 --- a/lv/lv2500a.uml +++ b/lv/lv2500a.uml @@ -14,19 +14,101 @@ END DATE F_ADATA BEGIN - PROMPT 45 1 "al " + PROMPT 25 1 " Al " END DATE F_DATAFAT BEGIN - PROMPT 2 2 "Data di fatturazione " + PROMPT 43 1 "Data fatturazione " FLAGS "A" CHECKTYPE REQUIRED END +NUMBER F_DACODCF 6 +BEGIN + PROMPT 2 2 "Dal Cliente " + FLAGS "U" + KEY 1 + USE LF_CLIFO + INPUT TIPOCF "C" + INPUT CODCF F_DACODCF + DISPLAY "Codice" CODCF + DISPLAY "Ragione Sociale@50" RAGSOC + OUTPUT F_DACODCF CODCF + OUTPUT F_DARAGSOC RAGSOC + ADD RUN cg0 -1 +END + +STRING F_DARAGSOC 50 30 +BEGIN + PROMPT 32 2 "" + KEY 1 + USE LF_CLIFO KEY 2 + INPUT TIPOCF "C" + INPUT RAGSOC F_DARAGSOC + DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Codice" CODCF + COPY OUTPUT F_DACODCF + ADD RUN cg0 -1 +END + +NUMBER F_ACODCF 6 +BEGIN + PROMPT 2 3 "Al Cliente " + FLAGS "U" + KEY 1 + USE LF_CLIFO + INPUT TIPOCF "C" + INPUT CODCF F_ACODCF + DISPLAY "Codice" CODCF + DISPLAY "Ragione Sociale@50" RAGSOC + OUTPUT F_ACODCF CODCF + OUTPUT F_ARAGSOC RAGSOC + ADD RUN cg0 -1 +END + +STRING F_ARAGSOC 50 30 +BEGIN + PROMPT 32 3 "" + KEY 1 + USE LF_CLIFO KEY 2 + INPUT TIPOCF "C" + INPUT RAGSOC F_ARAGSOC + DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Codice" CODCF + COPY OUTPUT F_ACODCF + ADD RUN cg0 -1 +END + +STRING F_COD_ELAB 8 +BEGIN + PROMPT 2 4 "Tipo Fatturazione " + FLAG "U" + USE %ELD SELECT I0==2 + INPUT CODTAB F_COD_ELAB + DISPLAY "Codice@8" CODTAB + DISPLAY "Descrizione@50" S0 + DISPLAY "Numerazione" S5 + OUTPUT F_COD_ELAB CODTAB + OUTPUT F_DESC_ELAB S0 + CHECKTYPE REQUIRED +END + +STRING F_DESC_ELAB 50 30 +BEGIN + PROMPT 32 4 "" + USE %ELD KEY 2 SELECT I0==2 + INPUT S0 F_DESC_ELAB + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice@8" CODTAB + DISPLAY "Numerazione" S5 + COPY OUTPUT F_COD_ELAB + CHECKTYPE REQUIRED +END + STRING F_CODCATC 2 BEGIN - PROMPT 2 3 "Codice Categoria economica " + PROMPT 2 5 "Codice Categoria Economica " FIELD LF_CFVEN->CODCATC USE CCO INPUT CODTAB F_CODCATC @@ -39,7 +121,7 @@ END STRING F_CODZONA 2 BEGIN - PROMPT 2 4 "Codice Zona " + PROMPT 40 5 "Codice Zona " FIELD LF_CFVEN->CODZONA GROUP 7 USE ZON @@ -51,36 +133,9 @@ BEGIN CHECKTYPE NORMAL END - -STRING F_COD_ELAB 8 -BEGIN - PROMPT 2 5 "Codice " - FLAG "U" - USE %ELD SELECT I0==2 - INPUT CODTAB F_COD_ELAB - DISPLAY "Codice@8" CODTAB - DISPLAY "Descrizione@50" S0 - DISPLAY "Numerazione" S5 - OUTPUT F_COD_ELAB CODTAB - OUTPUT F_DESC_ELAB S0 - CHECKTYPE REQUIRED -END - -STRING F_DESC_ELAB 50 -BEGIN - PROMPT 2 6 "Descrizione " - USE %ELD KEY 2 SELECT I0==2 - INPUT S0 F_DESC_ELAB - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice@8" CODTAB - DISPLAY "Numerazione" S5 - COPY OUTPUT F_COD_ELAB - CHECKTYPE REQUIRED -END - RADIOBUTTON F_PERFAT 1 70 BEGIN - PROMPT 2 7 "@bPeriodicitā di fatturazione " + PROMPT 2 6 "@bPeriodicitā di fatturazione " ITEM "3|Mensile" ITEM "2|Quindicinale" ITEM "1|Settimanale"