Corrette maschere condizioni di pagamento

git-svn-id: svn://10.65.10.50/trunk@2071 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-11-03 08:15:26 +00:00
parent 313732f8ac
commit 9d350ff36c
4 changed files with 17 additions and 12 deletions

View File

@ -37,12 +37,12 @@ END
BUTTON DLG_OK 9 2 BUTTON DLG_OK 9 2
BEGIN BEGIN
PROMPT -14 -1 "" PROMPT -12 -1 ""
END END
BUTTON DLG_CANCEL 9 2 BUTTON DLG_CANCEL 9 2
BEGIN BEGIN
PROMPT -24 -1 "" PROMPT -22 -1 ""
END END
ENDPAGE ENDPAGE

View File

@ -346,7 +346,7 @@ bool BA3700_application::ult_class(TMask_field& f, KEY k)
bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k) bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
{ {
bool doit = TRUE, m_perc = FALSE, m_pag = FALSE; bool doit = TRUE, m_perc = FALSE, m_pag = FALSE;
bool m_scad = FALSE, m_tipo = FALSE, mod = FALSE; bool m_scad = FALSE, m_tipo = FALSE, m_ulc = FALSE, mod = FALSE;
word ahiahi = P_OK; word ahiahi = P_OK;
sht* s = (sht*)get_app_data(); sht* s = (sht*)get_app_data();
@ -357,7 +357,7 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
if (!pag) return TRUE; if (!pag) return TRUE;
TString news(15), newp(15), newt(2); TString news(15), newp(15), newt(1), newu(1);
TToken_string ts(36), ns(36); TToken_string ts(36), ns(36);
bool recalc = TRUE; bool recalc = TRUE;
@ -373,6 +373,7 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
news = ns.get(0); news = ns.get(0);
newp = ns.get(1); newp = ns.get(1);
newt = ns.get(2); newt = ns.get(2);
newu = ns.get(4);
// qui viene il bello, si fa per dire // qui viene il bello, si fa per dire
if (ts.get_int(0) != atoi(news)) // modificata scadenza if (ts.get_int(0) != atoi(news)) // modificata scadenza
@ -387,6 +388,9 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
if (strcmp(ts.get(2),newt) != 0) // modificato tipo pagamento if (strcmp(ts.get(2),newt) != 0) // modificato tipo pagamento
mod = m_tipo = TRUE; mod = m_tipo = TRUE;
if (strcmp(ts.get(4),newu) != 0) // modificato tipo pagamento
mod = m_ulc = TRUE;
} }
break; break;
case K_DEL: case K_DEL:
@ -397,7 +401,6 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
break; break;
} }
// settato da recalc_rate se occorre ridefinire lo sheet // settato da recalc_rate se occorre ridefinire lo sheet
// aggiungendo o togliendo righe // aggiungendo o togliendo righe
bool need_recalc = FALSE; bool need_recalc = FALSE;
@ -412,6 +415,7 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
(m_perc ? (const char*)newp : NULL), (m_perc ? (const char*)newp : NULL),
(m_scad ? (const char*)news : NULL), (m_scad ? (const char*)news : NULL),
(m_tipo ? (const char*)newt : NULL), (m_tipo ? (const char*)newt : NULL),
(m_ulc ? (const char*)newu : NULL),
rdiff, rdiff,
pag->mese_commerciale(), pag->mese_commerciale(),
need_recalc); need_recalc);

View File

@ -130,7 +130,7 @@ BEGIN
ITEM "4|Uguali finche' possibile" MESSAGE "X",909|DISABLE,F_NUM_RATE ITEM "4|Uguali finche' possibile" MESSAGE "X",909|DISABLE,F_NUM_RATE
END END
STRING F_ULT_CLASS 2 STRING F_ULT_CLASS 1
BEGIN BEGIN
PROMPT 53 7 "Ult. class. " PROMPT 53 7 "Ult. class. "
USE %CLR USE %CLR
@ -161,9 +161,9 @@ END
LIST F_EQUAL_FROM 14 LIST F_EQUAL_FROM 14
BEGIN BEGIN
PROMPT 35 7 "a partire da" PROMPT 35 7 "a partire da"
ITEM "1|Rata numero... " MESSAGE ENABLE,F_START_RATA ITEM "1|Rata numero... " MESSAGE ENABLE,F_START_RATA
ITEM "2|Ultima modificata" MESSAGE DISABLE,F_START_RATA ITEM "2|Ultima modificata" MESSAGE DISABLE,F_START_RATA
END END
NUMBER F_START_RATA 2 NUMBER F_START_RATA 2

View File

@ -32,6 +32,7 @@ BEGIN
ITEM "8|Rapporti interban. diretti" ITEM "8|Rapporti interban. diretti"
ITEM "9|Bonifici" ITEM "9|Bonifici"
KEY 1 KEY 1
CHECKTYPE REQUIRED
END END
STRING F_CODICEALFA 1 STRING F_CODICEALFA 1