diff --git a/cg/cg4302.cpp b/cg/cg4302.cpp index b9c762cef..ae47c38a4 100755 --- a/cg/cg4302.cpp +++ b/cg/cg4302.cpp @@ -640,9 +640,9 @@ real TLiquidazione_app::versamenti_IVA(int month, const char* types, bool intr) int tp = typ.get_int(i); if (look_del(month,tp)) { - if (_del->get_bool("B0") || _is_visliq) // solo se stampata, a meno - // che non sia per visliq - ret += _del->get_real("R0"); + //if (_del->get_bool("B0") || _is_visliq) // solo se stampata, a meno + // che non sia per visliq + ret += _del->get_real("R0"); if (intr) ret -= _del->get_real("R1"); // al netto degli interessi } } diff --git a/cg/cg4700a.uml b/cg/cg4700a.uml index c5545b468..c503554e4 100755 --- a/cg/cg4700a.uml +++ b/cg/cg4700a.uml @@ -2,7 +2,29 @@ TOOLBAR "" 0 20 0 2 -#include +BUTTON DLG_SAVEREC 8 2 +BEGIN +PROMPT -14 -1 "~Registra" +MESSAGE EXIT,K_SAVE +END + +BUTTON DLG_FINDREC 8 2 +BEGIN +PROMPT -24 -1 "Ri~cerca" +MESSAGE EXIT,K_F9 +END + +BUTTON DLG_CANCEL 8 2 +BEGIN +PROMPT -34 -1 "" +MESSAGE EXIT,K_ESC +END + +BUTTON DLG_QUIT 8 2 +BEGIN +PROMPT -44 -1 "" +MESSAGE EXIT,K_QUIT +END ENDPAGE @@ -64,8 +86,6 @@ BEGIN FLAGS "R" FIELD R4 NUM_CALC ROUND(#THIS_FIELD,-3) - //NUM_EXPR (#THIS_FIELD>=0.0) - //WARNING "Valore non valido (>=0.0)" END NUMBER F_CREDITO 15 @@ -76,8 +96,6 @@ BEGIN FLAGS "R" FIELD R6 NUM_CALC ROUND(#THIS_FIELD,-3) - //NUM_EXPR (#THIS_FIELD>=0.0) - //WARNING "Valore non valido (>=0.0)" END ENDPAGE