diff --git a/mg/mg1100.cpp b/mg/mg1100.cpp index 2781687de..f01030da4 100755 --- a/mg/mg1100.cpp +++ b/mg/mg1100.cpp @@ -864,7 +864,7 @@ bool TMask_movmag::handle_datacomp(TMask_field &fld, KEY k) { TMask& m = fld.mask(); const TDate dt = fld.get(); - const int codes = dt.ok() ? esercizi().date2esc(dt) : 0; + const int codes = esercizi().date2esc(dt); if (codes > 0) { m.set(F_ANNOES, codes); @@ -882,7 +882,7 @@ bool TMask_movmag::handle_datareg(TMask_field &fld, KEY k) { const TMask& m = fld.mask(); const TDate dt = fld.get(); - const int codes = dt.ok() ? esercizi().date2esc(dt) : 0; + const int codes = esercizi().date2esc(dt); if (codes <= 0) return fld.error_box(TR("La data di registrazione non appartiene a nessun esercizio contabile")) ; diff --git a/mg/mglib02.cpp b/mg/mglib02.cpp index f1fc73bac..ef0b4fa2b 100755 --- a/mg/mglib02.cpp +++ b/mg/mglib02.cpp @@ -369,27 +369,25 @@ real TArticolo::convert_to_um(const real& v, const TString& to_um, const TString return r; } -TArticolo::TArticolo(const char* codice) - : TMultiple_rectype(LF_ANAMAG) +TArticolo::TArticolo(const char* codice) : TMultiple_rectype(LF_ANAMAG) { add_file(LF_UMART,"NRIGA"); add_file(LF_CODCORR,"NRIGA"); add_file(LF_DESLIN,"NRIGA"); if (codice && *codice) { - const int err=read(codice); + const int err = read(codice); if (err != NOERR) - error_box(FR("Impossibile leggere l'articolo %s: Errore %d"),codice, err); - + error_box(FR("Impossibile leggere l'articolo %s: Errore %d"), codice, err); } } TArticolo::TArticolo(const TRectype& rec) : TMultiple_rectype(rec) { - add_file(LF_UMART,"NRIGA"); + add_file(LF_UMART, "NRIGA"); add_file(LF_CODCORR,"NRIGA"); - add_file(LF_DESLIN,"NRIGA"); + add_file(LF_DESLIN, "NRIGA"); read(rec.get(ANAMAG_CODART)); } diff --git a/mg/mgstcau.uml b/mg/mgstcau.uml index 49e0f30e5..f232034e2 100755 --- a/mg/mgstcau.uml +++ b/mg/mgstcau.uml @@ -1,4 +1,4 @@ -#include "../ba/ba3200.h" + #include "../ba/ba3200.h" TOOLBAR "topbar" 0 0 0 2 #include