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

Corretto aggiornamento su cambio pagina

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22746 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2012-10-26 08:37:20 +00:00
parent db85e9249a
commit 39f144ba82
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
or/or1.cpp
View File

@ -8,14 +8,10 @@ int main(int argc,char** argv)
switch (n) switch (n)
{ {
case 1: case 1: or1200(argc,argv); break; // stampa dettaglio disponibilita' articoli
or1200(argc,argv); break; // stampa dettaglio disponibilita' articoli case 2: or1300(argc,argv); break; // stampa statistiche sui tempi di consegna
case 2: case 3: or1400(argc,argv); break; // generazione ordini a fornitore
or1300(argc,argv); break; // stampa statistiche sui tempi di consegna default: or1100(argc,argv); break; // stampe ordini
case 3:
or1400(argc,argv); break; // generazione ordini a fornitore
default:
or1100(argc,argv); break; // stampe ordini
} }
return 0; return 0;
} }

14
or/or1400.cpp
View File

@ -380,16 +380,15 @@ void TGenera_ordini_mask::next_page(int p)
if (_filter_changed) if (_filter_changed)
{ {
const TSheet_field& sf = sfield(F_ARTICLES); const TSheet_field& sf = sfield(F_ARTICLES);
if (win() == sf.parent()) if (curr_win() == sf.parent())
update_sheet(); update_sheet();
} }
if (_order_changed) if (_order_changed)
{ {
const TSheet_field& sf = sfield(F_ORDERS); const TSheet_field& sf = sfield(F_ORDERS);
if (win() == sf.parent()) if (curr_win() == sf.parent())
update_orders(); update_orders();
} }
} }
bool TGenera_ordini_mask::on_sheet_event(TOperable_field& o, TField_event e, long jolly) bool TGenera_ordini_mask::on_sheet_event(TOperable_field& o, TField_event e, long jolly)
@ -657,7 +656,7 @@ TGenera_ordini_mask::TGenera_ordini_mask()
serialize(false); serialize(false);
load_user_defs(); load_user_defs();
TConfig c(CONFIG_DITTA); TConfig c(CONFIG_DITTA, "or");
_anamag_query = c.get("OR14_QUERY"); _anamag_query = c.get("OR14_QUERY");
if (_anamag_query.blank()) if (_anamag_query.blank())
{ {
@ -748,8 +747,9 @@ void TCreazione_ordini::print_doc(const TRectype & doc)
commandline = "ve1 -0"; commandline = "ve1 -0";
commandline << ' ' << doc.get(DOC_CODNUM) << ' ' << doc.get(DOC_ANNO) << ' '; commandline << ' ' << doc.get(DOC_CODNUM) << ' ' << doc.get(DOC_ANNO) << ' ';
commandline << doc.get(DOC_PROVV) << ' ' << doc.get(DOC_NDOC) << ' ' << doc.get(DOC_NDOC); commandline << doc.get(DOC_PROVV) << ' ' << doc.get(DOC_NDOC);
commandline << " D"; commandline << " A "; // Anteprima
commandline << (doc.get_int(DOC_STATO)<2 ? "D" : "P");
const int ncopie = tipo.ncopie(); const int ncopie = tipo.ncopie();
if (ncopie > 0) if (ncopie > 0)
@ -764,7 +764,7 @@ void TCreazione_ordini::aggiorna_stato_doc_orig(const TRectype& rdoc)
{ {
const char provv = rdoc.get_char(RDOC_PROVV); const char provv = rdoc.get_char(RDOC_PROVV);
const int anno = rdoc.get_int(RDOC_ANNO); const int anno = rdoc.get_int(RDOC_ANNO);
const TString8 codnum = rdoc.get(RDOC_CODNUM); const TString4 codnum = rdoc.get(RDOC_CODNUM);
const long ndoc = rdoc.get_long(RDOC_NDOC); const long ndoc = rdoc.get_long(RDOC_NDOC);
TDocumento doc_orig(provv, anno, codnum, ndoc); TDocumento doc_orig(provv, anno, codnum, ndoc);
if (doc_orig.is_evaso()) if (doc_orig.is_evaso())

12
or/or1400a.uml
View File

@ -854,16 +854,20 @@ BEGIN
FIELD 47.USER2 FIELD 47.USER2
END END
BUTTON DLG_CANCEL 10 2 ENDPAGE
BEGIN
PROMPT -12 -1 "" TOOLBAR "" 0 0 0 2
END
BUTTON DLG_OK 10 2 BUTTON DLG_OK 10 2
BEGIN BEGIN
PROMPT -22 -1 "" PROMPT -22 -1 ""
END END
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -12 -1 ""
END
ENDPAGE ENDPAGE
ENDMASK ENDMASK