diff --git a/or/or1.cpp b/or/or1.cpp index d2bc75367..1159b5823 100755 --- a/or/or1.cpp +++ b/or/or1.cpp @@ -8,14 +8,10 @@ int main(int argc,char** argv) switch (n) { - case 1: - or1200(argc,argv); break; // stampa dettaglio disponibilita' articoli - case 2: - or1300(argc,argv); break; // stampa statistiche sui tempi di consegna - case 3: - or1400(argc,argv); break; // generazione ordini a fornitore - default: - or1100(argc,argv); break; // stampe ordini + case 1: or1200(argc,argv); break; // stampa dettaglio disponibilita' articoli + case 2: or1300(argc,argv); break; // stampa statistiche sui tempi di consegna + case 3: or1400(argc,argv); break; // generazione ordini a fornitore + default: or1100(argc,argv); break; // stampe ordini } return 0; } diff --git a/or/or1400.cpp b/or/or1400.cpp index a309b8226..bd7951652 100755 --- a/or/or1400.cpp +++ b/or/or1400.cpp @@ -380,16 +380,15 @@ void TGenera_ordini_mask::next_page(int p) if (_filter_changed) { const TSheet_field& sf = sfield(F_ARTICLES); - if (win() == sf.parent()) + if (curr_win() == sf.parent()) update_sheet(); } if (_order_changed) { const TSheet_field& sf = sfield(F_ORDERS); - if (win() == sf.parent()) + if (curr_win() == sf.parent()) update_orders(); } - } 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); load_user_defs(); - TConfig c(CONFIG_DITTA); + TConfig c(CONFIG_DITTA, "or"); _anamag_query = c.get("OR14_QUERY"); if (_anamag_query.blank()) { @@ -748,8 +747,9 @@ void TCreazione_ordini::print_doc(const TRectype & doc) commandline = "ve1 -0"; commandline << ' ' << doc.get(DOC_CODNUM) << ' ' << doc.get(DOC_ANNO) << ' '; - commandline << doc.get(DOC_PROVV) << ' ' << doc.get(DOC_NDOC) << ' ' << doc.get(DOC_NDOC); - commandline << " D"; + commandline << doc.get(DOC_PROVV) << ' ' << doc.get(DOC_NDOC); + commandline << " A "; // Anteprima + commandline << (doc.get_int(DOC_STATO)<2 ? "D" : "P"); const int ncopie = tipo.ncopie(); 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 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); TDocumento doc_orig(provv, anno, codnum, ndoc); if (doc_orig.is_evaso()) diff --git a/or/or1400a.uml b/or/or1400a.uml index 8b798dc54..64aa3f653 100755 --- a/or/or1400a.uml +++ b/or/or1400a.uml @@ -854,16 +854,20 @@ BEGIN FIELD 47.USER2 END -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -12 -1 "" -END +ENDPAGE + +TOOLBAR "" 0 0 0 2 BUTTON DLG_OK 10 2 BEGIN PROMPT -22 -1 "" END +BUTTON DLG_CANCEL 10 2 +BEGIN + PROMPT -12 -1 "" +END + ENDPAGE ENDMASK