diff --git a/cg/cg2100a.uml b/cg/cg2100a.uml index 702a55db6..0c674a724 100755 --- a/cg/cg2100a.uml +++ b/cg/cg2100a.uml @@ -15,7 +15,7 @@ NUMBER F_CODDITTA 5 BEGIN PROMPT 3 1 "Ditta " FLAGS "FRD" - USE LF_NDITTE KEY 1 + USE LF_NDITTE CHECKTYPE NORMAL INPUT CODDITTA F_CODDITTA OUTPUT F_RAGSOC RAGSOC @@ -77,7 +77,7 @@ BEGIN PROMPT 1 9 "Causale " FLAGS "UZ" FIELD CODCAUS - USE LF_CAUSALI KEY 1 + USE LF_CAUSALI INPUT CODCAUS F_CODCAUS DISPLAY "Codice" CODCAUS DISPLAY "Descrizione@50" DESCR diff --git a/cg/cg2100c.uml b/cg/cg2100c.uml index e9a412506..b2b4cab1c 100755 --- a/cg/cg2100c.uml +++ b/cg/cg2100c.uml @@ -575,7 +575,7 @@ BEGIN FLAGS "D" END -SPREADSHEET F_SHEETIVA 0 7 +SPREADSHEET F_SHEETIVA 0 6 BEGIN PROMPT 0 4 "" ITEM "Imponibile@15" @@ -604,7 +604,7 @@ BEGIN PICTURE "." END -SPREADSHEET F_SHEETCG +SPREADSHEET F_SHEETCG 0 -2 BEGIN PROMPT 0 12 "" ITEM "Dare@15F" diff --git a/cg/cg2104.cpp b/cg/cg2104.cpp index 50d4ec5d8..7d7fae9bd 100755 --- a/cg/cg2104.cpp +++ b/cg/cg2104.cpp @@ -506,12 +506,13 @@ bool TPrimanota_application::reset_handler(TMask_field& f, KEY key) } bool TPrimanota_application::recalc_handler(TMask_field& f, KEY key) -{ - if (key == K_SPACE) +{ + TPrimanota_application& a = app(); + if (key == K_SPACE && a.is_fattura()) { TMask& m = f.mask(); TSheet_field& ps = (TSheet_field&)m.field(FS_RATESHEET); - TPagamento& pag = app().pagamento(); + TPagamento& pag = a.pagamento(); const bool recalc_aut = f.get().not_empty(); @@ -537,8 +538,8 @@ bool TPrimanota_application::recalc_handler(TMask_field& f, KEY key) { pag.set_tipo_prima_rata(pag.tipo_prima_rata() + 3); m.set(FS_TIPOPR, pag.desc_tpr()); - app().reset_pagamento(); - app().set_scadenze(m); + a.reset_pagamento(); + a.set_scadenze(m); } else warning_box("Il tipo prima rata e' stato modificato in \"%s\" per " "poter mantenere la rateazione scelta e la possibilita' di " diff --git a/cg/cg21sld.uml b/cg/cg21sld.uml index 37e5e1ac6..9d462234a 100755 --- a/cg/cg21sld.uml +++ b/cg/cg21sld.uml @@ -200,7 +200,7 @@ BEGIN CHECKTYPE NORMAL END -SPREADSHEET FS_RATESHEET 0 -1 +SPREADSHEET FS_RATESHEET 0 -2 BEGIN PROMPT 1 11 "Rate" ITEM "Scadenza@10"