diff --git a/sc/sc2100.cpp b/sc/sc2100.cpp index f32b008fa..b67772932 100755 --- a/sc/sc2100.cpp +++ b/sc/sc2100.cpp @@ -295,9 +295,18 @@ bool TStampaEC_application::select_ec() { // sciroppa profilo if (_form != NULL) delete _form; - _form = new TForm(BASE_EC_PROFILE, m.get(F_CODPROF)); - _linprof[0] = _form->code()[_form->code().len() - 1]; - _linprof[1] = '\0'; + TString16 base(m.get(F_PROFBASE)); + TString16 code(m.get(F_CODPROF)); + + _form = new TForm(base, code.empty() ? NULL : (const char*)code); + + if (base == BASE_EC_PROFILE) _linprof = ""; + else + { + _linprof[0] = base[base.len() - 1]; + _linprof[1] = '\0'; + } + print_selected(); } return k != K_ESC; @@ -360,7 +369,7 @@ bool TStampaEC_application::print_ec(long clifo) } else { - warning_box ("Dio bestia! Cliente analfabeta!"); +// TBC: ci vuole? warning_box ("Dio bestia! Cliente analfabeta!"); }; return TRUE; @@ -402,9 +411,9 @@ bool TStampaEC_application::create() _ditta->lfile().put("CODDITTA", get_firm()); _ditta->read(); - TConfig tc(CONFIG_DITTA); - _lingua = tc.get("CodLin", ""); - _gesval = tc.get_bool("GesVal", ""); + TConfig tc(CONFIG_DITTA, "cg"); + _lingua = tc.get("CodLin"); + _gesval = tc.get_bool("GesVal"); dispatch_e_menu(MENU_ITEM(1)); diff --git a/sc/sc2100a.h b/sc/sc2100a.h index d5853632a..8bf73dbfa 100755 --- a/sc/sc2100a.h +++ b/sc/sc2100a.h @@ -21,6 +21,7 @@ #define R_SORTCF 121 #define F_NSEL 122 #define F_COMSEND 123 +#define F_PROFBASE 124 // basename of profile #define BASE_EC_PROFILE "PEC" diff --git a/sc/sc2100a.uml b/sc/sc2100a.uml index d1ce761a8..6f2e57048 100755 --- a/sc/sc2100a.uml +++ b/sc/sc2100a.uml @@ -23,18 +23,34 @@ BEGIN PROMPT 0 7 "" END -STRING F_CODPROF 5 +STRING F_PROFBASE 8 BEGIN - PROMPT 1 8 "Codice profilo " - USE LF_FORM KEY 1 - DISPLAY "Codice" CODPROF + PROMPT 1 8 "Profilo base" + USE LF_FORM KEY 1 SELECT (CODPROF="")&&(TIPOPROF[1,3]=BASE_EC_PROFILE) + DISPLAY "Codice@9" TIPOPROF DISPLAY "Descrizione@50" DESC - INPUT TIPOPROF BASE_EC_PROFILE - INPUT CODPROF F_CODPROF - OUTPUT F_CODPROF CODPROF + INPUT TIPOPROF F_PROFBASE + OUTPUT F_PROFBASE TIPOPROF OUTPUT F_DESPROF DESC HELP "" FLAGS "" + CHECKTYPE REQUIRED +END + +STRING F_CODPROF 5 +BEGIN + PROMPT 25 8 "" + USE LF_FORM KEY 1 SELECT CODPROF!="" + DISPLAY "Codice" CODPROF + DISPLAY "Descrizione@50" DESC + INPUT TIPOPROF F_PROFBASE SELECT + INPUT CODPROF F_CODPROF +// OUTPUT F_PROFBASE TIPOPROF + OUTPUT F_CODPROF CODPROF + OUTPUT F_DESPROF DESC + HELP "" + FLAGS "" + CHECKTYPE NORMAL END STRING F_DESPROF 50 30