From 9d350ff36c19ca74259dcc45b0a9a9d54f9761f4 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 3 Nov 1995 08:15:26 +0000 Subject: [PATCH] Corrette maschere condizioni di pagamento git-svn-id: svn://10.65.10.50/trunk@2071 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba1100c.uml | 4 ++-- ba/ba3700.cpp | 12 ++++++++---- ba/ba3700a.uml | 12 ++++++------ ba/batbclr.uml | 1 + 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ba/ba1100c.uml b/ba/ba1100c.uml index 839c51dd5..c5cf1d31c 100755 --- a/ba/ba1100c.uml +++ b/ba/ba1100c.uml @@ -37,12 +37,12 @@ END BUTTON DLG_OK 9 2 BEGIN - PROMPT -14 -1 "" + PROMPT -12 -1 "" END BUTTON DLG_CANCEL 9 2 BEGIN - PROMPT -24 -1 "" + PROMPT -22 -1 "" END ENDPAGE diff --git a/ba/ba3700.cpp b/ba/ba3700.cpp index 2daee82e9..7c11d3f67 100755 --- a/ba/ba3700.cpp +++ b/ba/ba3700.cpp @@ -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 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; 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; - TString news(15), newp(15), newt(2); + TString news(15), newp(15), newt(1), newu(1); TToken_string ts(36), ns(36); bool recalc = TRUE; @@ -373,6 +373,7 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k) news = ns.get(0); newp = ns.get(1); newt = ns.get(2); + newu = ns.get(4); // qui viene il bello, si fa per dire 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 mod = m_tipo = TRUE; + + if (strcmp(ts.get(4),newu) != 0) // modificato tipo pagamento + mod = m_ulc = TRUE; } break; case K_DEL: @@ -397,7 +401,6 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k) break; } - // settato da recalc_rate se occorre ridefinire lo sheet // aggiungendo o togliendo righe bool need_recalc = FALSE; @@ -411,7 +414,8 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k) ahiahi = pag->recalc_rate(r, m_perc, (m_perc ? (const char*)newp : 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, pag->mese_commerciale(), need_recalc); diff --git a/ba/ba3700a.uml b/ba/ba3700a.uml index ee7fa4c9a..92cd7db46 100755 --- a/ba/ba3700a.uml +++ b/ba/ba3700a.uml @@ -130,7 +130,7 @@ BEGIN ITEM "4|Uguali finche' possibile" MESSAGE "X",909|DISABLE,F_NUM_RATE END -STRING F_ULT_CLASS 2 +STRING F_ULT_CLASS 1 BEGIN PROMPT 53 7 "Ult. class. " USE %CLR @@ -161,9 +161,9 @@ END LIST F_EQUAL_FROM 14 BEGIN - PROMPT 35 7 "a partire da" - ITEM "1|Rata numero... " MESSAGE ENABLE,F_START_RATA - ITEM "2|Ultima modificata" MESSAGE DISABLE,F_START_RATA + PROMPT 35 7 "a partire da" + ITEM "1|Rata numero... " MESSAGE ENABLE,F_START_RATA + ITEM "2|Ultima modificata" MESSAGE DISABLE,F_START_RATA END NUMBER F_START_RATA 2 @@ -186,7 +186,7 @@ BEGIN END ********************************************************************/ - + NUMBER F_FIXSCAD_1 2 BEGIN @@ -292,7 +292,7 @@ BEGIN CHECKTYPE NORMAL HELP "Codice per ulteriore classificazione della data" END - + BUTTON DLG_OK 9 2 BEGIN PROMPT -13 -1 "" diff --git a/ba/batbclr.uml b/ba/batbclr.uml index d2a8134a2..c5268e34b 100755 --- a/ba/batbclr.uml +++ b/ba/batbclr.uml @@ -32,6 +32,7 @@ BEGIN ITEM "8|Rapporti interban. diretti" ITEM "9|Bonifici" KEY 1 + CHECKTYPE REQUIRED END STRING F_CODICEALFA 1