root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/branches/R_10_00@22256 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2011-06-10 11:03:48 +00:00
parent e51569561d
commit e6cae1810f
3 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ps/ps1002100.cpp
View File

@ -400,7 +400,7 @@ void TEdit_rdocs_mask::fill_sheet()
query << "USE DOC KEY 2"; query << "USE DOC KEY 2";
query << "\nSELECT (CODNUM=#CODNUM)"; query << "\nSELECT (CODNUM=#CODNUM)";
if (includi_evasi) if (includi_evasi)
query << "&&(BETWEEN(DATADOC,#DADATA,#ADATA))"; query << "&&(ANNO>=#DAANNO)";
else else
query << "&&(DOCEVASO!=\"X\")"; query << "&&(DOCEVASO!=\"X\")";
@ -412,10 +412,7 @@ void TEdit_rdocs_mask::fill_sheet()
recset.set_var("#CODCF", get_long(F_CODCF)); recset.set_var("#CODCF", get_long(F_CODCF));
recset.set_var("#CODNUM", get(F_CODNUM)); recset.set_var("#CODNUM", get(F_CODNUM));
if (includi_evasi) if (includi_evasi)
{ recset.set_var("#DAANNO", get_long(F_DA_ANNO));
recset.set_var("#DADATA", get_date(F_DADATA_EV));
recset.set_var("#ADATA", get_date(F_ADATA_EV));
}
const TString& lav = get(F_LAV); const TString& lav = get(F_LAV);
const TString& col = get(F_COLORE); const TString& col = get(F_COLORE);
@ -437,18 +434,27 @@ void TEdit_rdocs_mask::fill_sheet()
//per ogni documento prende le sole righe non evase e le carica sullo sheet //per ogni documento prende le sole righe non evase e le carica sullo sheet
TDocumento doc(rec); TDocumento doc(rec);
bool rdoc_da_considerare = false;
FOR_EACH_PHYSICAL_RDOC(doc, r, rdoc) FOR_EACH_PHYSICAL_RDOC(doc, r, rdoc)
{ {
if (!rdoc->is_evasa() && rdoc->is_evadibile()) const real qta = rdoc->get_real(RDOC_QTA);
if (qta > ZERO)
{ {
if (lav.full() && rdoc->get(RDOC_CODCMS) != lav) if (includi_evasi)
continue; rdoc_da_considerare = rdoc->is_evadibile();
if (col.full() && rdoc->get(RDOC_FASCMS) != col) else
continue; rdoc_da_considerare = !rdoc->is_evasa() && rdoc->is_evadibile();
if (codart.full() && rdoc->get(RDOC_CODART) != codart) if (rdoc_da_considerare)
continue; {
if (lav.full() && rdoc->get(RDOC_CODCMS) != lav)
continue;
if (col.full() && rdoc->get(RDOC_FASCMS) != col)
continue;
if (codart.full() && rdoc->get(RDOC_CODART) != codart)
continue;
sf_righe.autoload_line(++k, *rdoc); //aggiunge una riga nuova riempiendola con tutti i campi che hanno FIELD nella maschera sf_righe.autoload_line(++k, *rdoc); //aggiunge una riga nuova riempiendola con tutti i campi che hanno FIELD nella maschera
}
} }
} }
} }

5
ps/ps1002100a.h
View File

@ -14,8 +14,9 @@
#define F_CODART 314 #define F_CODART 314
#define F_DESCR 315 #define F_DESCR 315
#define F_INCL_EVASI 316 #define F_INCL_EVASI 316
#define F_DADATA_EV 317 #define F_DA_ANNO 317
#define F_ADATA_EV 318 //#define F_DADATA_EV 317
//#define F_ADATA_EV 318
#define F_RIGHE 320 #define F_RIGHE 320

15
ps/ps1002100a.uml
View File

@ -207,11 +207,18 @@ END
BOOLEAN F_INCL_EVASI BOOLEAN F_INCL_EVASI
BEGIN BEGIN
PROMPT 2 8 "Includi evasi" PROMPT 2 8 "Includi evasi"
MESSAGE FALSE HIDE,F_DADATA_EV|HIDE,F_ADATA_EV MESSAGE FALSE HIDE,F_DA_ANNO
MESSAGE TRUE SHOW,F_DADATA_EV|SHOW,F_ADATA_EV MESSAGE TRUE SHOW,F_DA_ANNO
END END
DATA F_DADATA_EV NUMBER F_DA_ANNO 4
BEGIN
PROMPT 20 8 "Dall' anno "
CHECKTYPE REQUIRED
FLAGS "A"
END
/*DATA F_DADATA_EV
BEGIN BEGIN
PROMPT 20 8 "Dalla data " PROMPT 20 8 "Dalla data "
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
@ -221,7 +228,7 @@ DATA F_ADATA_EV
BEGIN BEGIN
PROMPT 45 8 "Alla data " PROMPT 45 8 "Alla data "
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
END END*/
SPREADSHEET F_RIGHE SPREADSHEET F_RIGHE
BEGIN BEGIN