diff --git a/src/ve/velib06.cpp b/src/ve/velib06.cpp index 6cd62df7e..200f475d4 100755 --- a/src/ve/velib06.cpp +++ b/src/ve/velib06.cpp @@ -2039,7 +2039,7 @@ bool TDocumento_mask::ss_handler(TMask_field& f, KEY key) { // Controllo se la commessa è veramente obbligatoria in base alla configurazione TConfig& ini = ca_config(); - if ((ini.get_int("Authorizations") & 0x6) && (ini.get_bool("CmsRequired") || ini.get("FathFasi").full())) + if ((ini.get_int("Authorizations") & 0x6) && ca_active(mask.doc().get_date(DOC_DATADOC) && (ini.get_bool("CmsRequired") || ini.get("FathFasi").full()))) { const short cmes = mask.cms_end_sh(); if (cmes > 0) // Puo' succedere che sia < 0 in assenza di righe buone diff --git a/src/ve/velib06a.cpp b/src/ve/velib06a.cpp index e4261df94..d5b5d1489 100755 --- a/src/ve/velib06a.cpp +++ b/src/ve/velib06a.cpp @@ -2957,7 +2957,7 @@ bool codcdc_handler(TMask_field& f, KEY key) mask.mask2doc(); TDocumento& doc = mask.doc(); - const bool req = doc.valid() && doc.tipo().head_ca_required(); + const bool req = ca_active(doc.get_date(DOC_DATADOC)) && doc.valid() && doc.tipo().head_ca_required(); if (f.empty() && req) return f.error_box(TR("Il centro di costo è obbligatorio per questo tipo documento")); @@ -2977,7 +2977,7 @@ bool codcms_handler(TMask_field& f, KEY key) TDocumento& doc = mask.doc(); TSheet_field& sf = mask.sfield(F_SHEET); - const bool req = doc.valid() && doc.tipo().head_ca_required(); + const bool req = ca_active(doc.get_date(DOC_DATADOC)) && doc.valid() && doc.tipo().head_ca_required(); if (f.empty()) {