From 0efdee7b30de6082b5c9faca979289e030babe3c Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 21 Jun 1996 10:43:26 +0000 Subject: [PATCH] Corretti errori MI1101 e MI1093 git-svn-id: svn://10.65.10.50/trunk@3055 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- sc/sc2100.cpp | 3 ++- sc/sc2100a.uml | 2 +- sc/sc2400.cpp | 20 ++++++++++++++------ sc/sc2400a.uml | 6 +++--- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sc/sc2100.cpp b/sc/sc2100.cpp index c65b604af..3a3e0020b 100755 --- a/sc/sc2100.cpp +++ b/sc/sc2100.cpp @@ -1428,7 +1428,8 @@ bool TStampaEC_application::destroy() } void TStampaEC_application::on_firm_change() -{ +{ + mask().reset(); TApplication::on_firm_change(); TConfig c(CONFIG_DITTA, "cg"); _lingua_ditta = c.get("CodLin"); diff --git a/sc/sc2100a.uml b/sc/sc2100a.uml index 50d92ccf6..4823f7f52 100755 --- a/sc/sc2100a.uml +++ b/sc/sc2100a.uml @@ -16,7 +16,7 @@ END STRING F_RAGSOC 50 46 BEGIN PROMPT 14 1 "R.S. " - FLAGS "D" + FLAGS "DP" END GROUPBOX DLG_NULL 68 8 diff --git a/sc/sc2400.cpp b/sc/sc2400.cpp index b9b7f7a15..12e5c019c 100755 --- a/sc/sc2400.cpp +++ b/sc/sc2400.cpp @@ -216,7 +216,8 @@ bool TStampaSol_application::destroy() } void TStampaSol_application::on_firm_change() -{ +{ + mask().reset(); TApplication::on_firm_change(); TConfig c(CONFIG_DITTA, "cg"); _lingua_ditta= c.get("CodLin"); @@ -228,11 +229,18 @@ bool TStampaSol_application::menu(MENU_TAG) { TSol_mask &m= mask(); while (m.run() != K_QUIT) - { - _form= new TSol_form(m, _gesval, F_DATALIMOP, F_DATALIMSOL); - print_selected(); - delete _form; - _form= NULL; + { + const TDate dlimsol(m.get(F_DATALIMSOL)); + const TDate dsped(m.get(F_DATASEND)); + if (dlimsol > dsped) + error_box("La data limite sollecito deve essere specificata e non puo' essere superiore alla data di invio"); + else + { + _form= new TSol_form(m, _gesval, F_DATALIMOP, F_DATALIMSOL); + print_selected(); + delete _form; + _form= NULL; + } } return FALSE; } diff --git a/sc/sc2400a.uml b/sc/sc2400a.uml index 6cb587b57..5b66e9542 100755 --- a/sc/sc2400a.uml +++ b/sc/sc2400a.uml @@ -16,7 +16,7 @@ END STRING F_RAGSOC 50 46 BEGIN PROMPT 16 1 "R.S. " - FLAGS "D" + FLAGS "DP" END GROUPBOX DLG_NULL 68 8 @@ -70,8 +70,8 @@ DATE F_DATALIMSOL BEGIN PROMPT 2 5 "Data limite sollecito " FLAGS "A" - VALIDATE DATE_CMP_FUNC <= F_DATASEND - WARNING "La data limite sollecito deve essere specificata e non puo' essere superiore alla data di invio" +// VALIDATE DATE_CMP_FUNC <= F_DATASEND +// WARNING "La data limite sollecito deve essere specificata e non puo' essere superiore alla data di invio" CHECKTYPE REQUIRED END