diff --git a/cg/cg2100a.uml b/cg/cg2100a.uml index d77897702..9c9fedac6 100755 --- a/cg/cg2100a.uml +++ b/cg/cg2100a.uml @@ -8,12 +8,12 @@ PAGE "Ricerca" -1 -1 77 8 GROUPBOX DLG_NULL 78 3 BEGIN - PROMPT 1 0 "" + PROMPT 1 1 "@bDitta" END NUMBER F_CODDITTA 5 BEGIN - PROMPT 3 1 "Ditta " + PROMPT 3 2 "Codice " FLAGS "FRD" USE LF_NDITTE CHECKTYPE NORMAL @@ -23,13 +23,19 @@ END STRING F_RAGSOC 50 BEGIN - PROMPT 17 1 "Ragione " + PROMPT 17 2 "Ragione " FLAGS "D" END +GROUPBOX DLG_NULL 78 8 +BEGIN + PROMPT 1 5 "@bMovimento di prima nota" + FLAGS "R" +END + NUMBER F_NUMREG 6 BEGIN - PROMPT 1 4 "Numero operazione " + PROMPT 3 6 "Numero operazione " HELP "Numero del movimento di prima nota da gestire" FLAGS "R" FIELD LF_MOV->NUMREG @@ -47,7 +53,7 @@ END DATE F_DATAREG BEGIN - PROMPT 1 6 "Data operazione " + PROMPT 3 8 "Data operazione " CHECKTYPE REQUIRED HELP "Data in cui viene registrata l'operazione" MESSAGE COPY,F_ANNOIVA,7,10 @@ -55,26 +61,26 @@ END NUMBER F_ANNOIVA 4 BEGIN - PROMPT 51 6 "Anno IVA " + PROMPT 52 8 "Anno IVA " FLAGS "D" END DATE F_DATACOMP BEGIN - PROMPT 1 7 "Data di competenza " + PROMPT 3 9 "Data di competenza " HELP "Data di competenza dell'operazione" CHECKTYPE REQUIRED END NUMBER F_ANNOES 4 BEGIN - PROMPT 51 7 "Codice esercizio " + PROMPT 52 9 "Codice esercizio " FLAGS "DRZ" END STRING F_CODCAUS 3 BEGIN - PROMPT 1 9 "Causale " + PROMPT 3 11 "Causale " FLAGS "UZ" FIELD CODCAUS USE LF_CAUSALI @@ -92,7 +98,7 @@ END STRING F_DESCRCAUS 50 BEGIN - PROMPT 21 9 "" + PROMPT 23 11 "" USE LF_CAUSALI KEY 2 CHECKTYPE NORMAL INPUT DESCR F_DESCRCAUS diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp index 53adeb8c4..7f0014ce6 100755 --- a/cg/cg2102.cpp +++ b/cg/cg2102.cpp @@ -1220,7 +1220,7 @@ bool TPrimanota_application::iva_notify(TSheet_field& iva, int r, KEY k) if (a._as400) return TRUE; - if (k = K_INS || k == K_CTRL+K_DEL) + if (k == K_INS || k == K_CTRL+K_DEL) return TRUE; TToken_string& row = iva.row(r);