From 3ac9ee15f736c3ed491f52f7255c922cf80528ce Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 9 Sep 1996 10:49:41 +0000 Subject: [PATCH] Corretta ricerca per codice fiscale git-svn-id: svn://10.65.10.50/trunk@3551 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg2100b.uml | 10 +++++----- cg/cg2100c.uml | 23 +++++++++++++++-------- cg/cg2102.cpp | 9 ++++----- cg/cg21sld.uml | 20 ++++++++++---------- cg/cg2200.cpp | 39 +++++++++++++++++++++++++-------------- 5 files changed, 59 insertions(+), 42 deletions(-) diff --git a/cg/cg2100b.uml b/cg/cg2100b.uml index 16b795ebf..b0e1886fe 100755 --- a/cg/cg2100b.uml +++ b/cg/cg2100b.uml @@ -25,7 +25,7 @@ BEGIN CHECKTYPE NORMAL END -STRING F_RAGSOC 50 +STRING F_RAGSOC 50 52 BEGIN PROMPT 17 1 "Ragione " FLAGS "D" @@ -60,7 +60,7 @@ END NUMBER F_ANNOES 4 BEGIN - PROMPT 54 4 "Codice esercizio " + PROMPT 56 4 "Codice esercizio " FIELD ANNOES MESSAGE COPY,K_ANNOES FLAGS "DGZ" @@ -250,7 +250,7 @@ BEGIN FLAGS "D" END -STRING K_RAGSOC 50 +STRING K_RAGSOC 50 52 BEGIN PROMPT 17 1 "Ragione " FLAGS "D" @@ -276,7 +276,7 @@ END NUMBER K_ANNOES 4 BEGIN - PROMPT 56 4 "Esercizio " + PROMPT 56 4 "Codice esercizio " FLAGS "DZ" END @@ -304,7 +304,7 @@ BEGIN FLAGS "D" END -STRING K_DESCRCAUS 50 +STRING K_DESCRCAUS 50 52 BEGIN PROMPT 25 6 "" FLAGS "D" diff --git a/cg/cg2100c.uml b/cg/cg2100c.uml index 26c1da8dc..6c40e63f3 100755 --- a/cg/cg2100c.uml +++ b/cg/cg2100c.uml @@ -144,9 +144,11 @@ BEGIN WARNING "La causale o il saldaconto richiedono il numero documento" END -BOOLEAN F_SOLAIVA +LIST F_SOLAIVA 1 2 BEGIN - PROMPT 1 7 "Movimento di sola IVA" + PROMPT 1 7 "Movimento di sola IVA " + ITEM " |No" + ITEM "X|Si" END LIST F_PROVVISORIO 1 22 @@ -207,8 +209,9 @@ BEGIN INPUT CODCF F_CLIENTE DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC - DISPLAY "Partita IVA@12" PAIV DISPLAY "Sospeso" SOSPESO + DISPLAY "Partita IVA@12" PAIV + DISPLAY "Codice Fiscale@16" COFI OUTPUT F_CLIENTE CODCF OUTPUT F_RAGSOCCLIENTE RAGSOC OUTPUT F_STATOPAIV STATOPAIV @@ -230,8 +233,9 @@ BEGIN INPUT CODCF F_FORNITORE DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC - DISPLAY "Partita IVA@12" PAIV DISPLAY "Sospeso" SOSPESO + DISPLAY "Partita IVA@12" PAIV + DISPLAY "Codice Fiscale@16" COFI OUTPUT F_FORNITORE CODCF OUTPUT F_RAGSOCFORNITORE RAGSOC OUTPUT F_STATOPAIV STATOPAIV @@ -251,9 +255,10 @@ BEGIN INPUT TIPOCF "F" INPUT RAGSOC F_RAGSOCFORNITORE DISPLAY "Ragione Sociale@50" RAGSOC - DISPLAY "Partita IVA@12" PAIV DISPLAY "Codice" CODCF DISPLAY "Sospeso" SOSPESO + DISPLAY "Partita IVA@12" PAIV + DISPLAY "Codice Fiscale@16" COFI COPY OUTPUT F_FORNITORE CHECKTYPE REQUIRED ADD RUN cg0 -1 F @@ -266,9 +271,7 @@ BEGIN USE LF_CLIFO KEY 2 INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOCCLIENTE - DISPLAY "Ragione Sociale@50" RAGSOC - DISPLAY "Partita IVA@12" PAIV - DISPLAY "Codice" CODCF + COPY DISPLAY F_RAGSOCFORNITORE COPY OUTPUT F_CLIENTE CHECKTYPE REQUIRED ADD RUN cg0 -1 C @@ -284,6 +287,8 @@ BEGIN DISPLAY "Codice fiscale@16" COFI DISPLAY "Ragione Sociale@50" RAGSOC DISPLAY "Codice" CODCF + DISPLAY "Sospeso" SOSPESO + DISPLAY "Partita IVA@12" PAIV COPY OUTPUT F_CLIENTE CHECKTYPE NORMAL ADD RUN cg0 -1 C @@ -313,6 +318,8 @@ BEGIN DISPLAY "Partita IVA@12" PAIV DISPLAY "Ragione Sociale@50" RAGSOC DISPLAY "Codice" CODCF + DISPLAY "Sospeso" SOSPESO + DISPLAY "Codice Fiscale@16" COFI COPY OUTPUT F_CLIENTE CHECKTYPE NORMAL ADD RUN cg0 -1 C diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp index d9f8d8609..775c362f7 100755 --- a/cg/cg2102.cpp +++ b/cg/cg2102.cpp @@ -1480,8 +1480,8 @@ bool TPrimanota_application::iva_sottoconto_handler(TMask_field& f, KEY key) if (key == K_TAB && f.dirty()) { TMask& m = f.mask(); - const TEdit_field& sotto = m.efield(109); - const TRectype& piano = sotto.browse()->cursor()->curr(); + const TEdit_field& e = (const TEdit_field&)f; + const TRectype& piano = e.browse()->cursor()->curr(); const TCausale& caus = app().causale(); int spric = piano.get_int("TIPOSPRIC"); if ((spric == 2 || spric == 3) && !caus.corrispettivi()) @@ -2404,8 +2404,7 @@ bool TPrimanota_application::corrvaluta_handler(TMask_field& f, KEY key) bool TPrimanota_application::activate_numrif(bool init_pag) { - CHECK(_msk[2] != NULL, "Null saldaconto mask"); - TMask& m = *_msk[2]; + TMask& m = curr_mask(); bool shown = is_saldaconto(); // Il numero riferimento esiste @@ -2458,7 +2457,7 @@ bool TPrimanota_application::activate_numrif(bool init_pag) // Handler del checkbox di movimento di sola IVA bool TPrimanota_application::solaiva_handler(TMask_field& f, KEY key) { - if (key == K_SPACE) + if (key == K_TAB && f.dirty()) { TMask& m = f.mask(); TPrimanota_application& a = app(); diff --git a/cg/cg21sld.uml b/cg/cg21sld.uml index 9d462234a..6eadd278b 100755 --- a/cg/cg21sld.uml +++ b/cg/cg21sld.uml @@ -48,25 +48,25 @@ BEGIN FLAGS "D" END +NUMBER FS_NRATE 3 +BEGIN + PROMPT 38 4 "Numero di rate " + CHECKTYPE REQUIRED + FLAGS "U" +END + BOOLEAN FS_MCOMM BEGIN - PROMPT 38 4 "Mese commerciale" + PROMPT 38 5 "Mese commerciale" END BOOLEAN FS_RECALC BEGIN - PROMPT 38 5 "Ricalcolo automatico" - MESSAGE TRUE ENABLE,FS_RDIFFER|ENABLE,FS_MCOMM|K_SPACE,FS_RDIFFER + PROMPT 38 6 "Ricalcolo automatico" + MESSAGE TRUE ENABLE,FS_RDIFFER|ENABLE,FS_MCOMM|PUSH,FS_RDIFFER MESSAGE FALSE DISABLE,FS_RDIFFER|DISABLE,FS_MCOMM|DISABLE,FS_NRATE END -NUMBER FS_NRATE 3 -BEGIN - PROMPT 38 6 "Numero di rate " - CHECKTYPE REQUIRED - FLAGS "U" -END - STRING FS_VALUTA 3 BEGIN PROMPT 67 6 "Valuta " diff --git a/cg/cg2200.cpp b/cg/cg2200.cpp index bbb0b5812..c778dc234 100755 --- a/cg/cg2200.cpp +++ b/cg/cg2200.cpp @@ -271,31 +271,42 @@ bool TProvvisori_app::menu(MENU_TAG) TRectype from(LF_MOV); TRectype to(LF_MOV); - const char* s = m.get(F_FROMDATE); + TString16 from_d = m.get(F_FROMDATE); + TString16 to_d = m.get(F_TODATE); + + if (from_d.empty() && to_d.empty()) + { + error_box("E' nessario specificare almeno una data."); + continue; + } if (key == K_ENTER) { - const TDate da(s); + const TDate da(from_d); const TLibro_giornale lg(da.year()); const TDate lp(lg.last_print()); if (da < lp) { - s = lp.string(); - const bool ok = yesno_box("Il libro giornale e stato stampato il %s:\n", - "Si desidera modificare la data iniziale?", s); + from_d = lp.string(); + const bool ok = yesno_box("Il libro giornale e stato stampato il %s:\n" + "Si desidera modificare la data iniziale?", + (const char*)from_d); if (!ok) continue; } } - if (*s) from.put(MOV_DATAREG, s); - s = m.get(F_FROMREG); - if (*s) from.put(MOV_NUMREG, s); + if (from_d.not_empty()) from.put(MOV_DATAREG, from_d); + + const TString& from_r = m.get(F_FROMREG); + if (from_r.not_empty()) from.put(MOV_NUMREG, from_r); + _from_caus = m.get(F_FROMCAUS); - s = m.get(F_TODATE); - if (*s) to.put(MOV_DATAREG, s); - s = m.get(F_TOREG); - if (*s) to.put(MOV_NUMREG, s); + if (to_d.not_empty()) to.put(MOV_DATAREG, to_d); + + const TString& to_r = m.get(F_TOREG); + if (to_r.not_empty()) to.put(MOV_NUMREG, to_r); + _to_caus = m.get(F_TOCAUS); cur.setregion(from, to); @@ -303,10 +314,10 @@ bool TProvvisori_app::menu(MENU_TAG) const TRecnotype total = cur.items(); - TString80 action(key == K_ENTER ? "conferma" : "cancellazione"); + TString action(key == K_ENTER ? "conferma" : "cancellazione"); action << " di "; add_plural(action, total, "movimento"); - TString256 caption("E' stata richiesta la "); + TString caption("E' stata richiesta la "); caption << action << '.'; if (total > 0)