diff --git a/ci/ci1200.cpp b/ci/ci1200.cpp index 2d11e68ac..74ce04618 100755 --- a/ci/ci1200.cpp +++ b/ci/ci1200.cpp @@ -20,14 +20,14 @@ class TRiepiloghi_mask : public TAutomask protected: virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); - int create_sheet_fields(int lf, int& y, short& dlg, bool required = false); + int create_sheet_fields(int lf, int& y, short& dlg/*, bool required = false*/); void create_sheet(); public: TRiepiloghi_mask(); }; -int TRiepiloghi_mask::create_sheet_fields(int lf, int& y, short& dlg, bool required) +int TRiepiloghi_mask::create_sheet_fields(int lf, int& y, short& dlg/*, bool required*/) { TSheet_field& sf = sfield(F_COMMESSE); TMask& sm = sf.sheet_mask(); @@ -44,7 +44,7 @@ int TRiepiloghi_mask::create_sheet_fields(int lf, int& y, short& dlg, bool requi for (int i = 0; i < h; i++) { TEdit_field& fld = sm.efield(dlg+i); - fld.check_type(required ? CHECK_REQUIRED : CHECK_NORMAL); + fld.check_type(/*required ? CHECK_REQUIRED : */CHECK_NORMAL); TEdit_field& dfld = sm.efield(dlg+50+i); dfld.set_field(EMPTY_STRING); // Toglie campi che fan saltare gli output! @@ -77,18 +77,15 @@ void TRiepiloghi_mask::create_sheet() if (fasinfo.parent() == LF_CDC) create_sheet_fields(LF_FASI, y, dlg); else - { - const bool cdc_req = ini.get_bool("CdcRequired"); - create_sheet_fields(LF_CDC, y, dlg, cdc_req); - } + create_sheet_fields(LF_CDC, y, dlg); } else if (level == "CMS") // Crea commessa { - const bool cms_req = ini.get_bool("CmsRequired"); + const bool cms_req = false; if (fasinfo.parent() == LF_COMMESSE) - create_sheet_fields(LF_FASI, y, dlg, cms_req); + create_sheet_fields(LF_FASI, y, dlg); else - create_sheet_fields(LF_COMMESSE, y, dlg, cms_req); + create_sheet_fields(LF_COMMESSE, y, dlg); } } @@ -298,8 +295,8 @@ void TRiepiloghi_recordset::set_filter(const TRiepiloghi_mask& msk, int cms_row) _codfas = rel.curr().get(RMOVANA_CODFASE); } set_var("#S_CDC", TVariant(_codcosto), true); - set_var("#S_CMS", TVariant(_codcms), true); - set_var("#S_FAS", TVariant(_codfas), true); + set_var("#S_CMS", TVariant(_codcms), true); + set_var("#S_FAS", TVariant(_codfas), true); TToken_string td(80, ','); _tipidoc.destroy();