diff --git a/ba/ba0100.cpp b/ba/ba0100.cpp index d360b7551..870f8601c 100755 --- a/ba/ba0100.cpp +++ b/ba/ba0100.cpp @@ -820,8 +820,6 @@ void TMenu_application::test_temp() } } -#ifdef DBG - HIDDEN bool pwd_handler(TMask_field& fld, KEY key) { if (key == K_F8) @@ -840,8 +838,6 @@ HIDDEN bool pwd_handler(TMask_field& fld, KEY key) return TRUE; } -#endif - void TMenu_application::reload_images() { _menu.reload_images(); diff --git a/ba/batbclr.rpt b/ba/batbclr.rpt index d1c80e7b0..d5232d052 100755 --- a/ba/batbclr.rpt +++ b/ba/batbclr.rpt @@ -1,6 +1,6 @@ [Headers] 80 -Tabella Classificazione rate +Tabella Classificazione pagamenti 1|@3g%s|Codice 1|@14g%s|Descrizione diff --git a/ba/batbcms.h b/ba/batbcms.h index 69d989ee2..00860515e 100755 --- a/ba/batbcms.h +++ b/ba/batbcms.h @@ -10,3 +10,4 @@ #define F_RESP 110 #define F_CHIUSA 111 #define F_RAGSOC 112 +#define F_PRORATA 113 diff --git a/ba/batbcms.rpt b/ba/batbcms.rpt index 868b8a08f..99a996e88 100755 --- a/ba/batbcms.rpt +++ b/ba/batbcms.rpt @@ -9,9 +9,10 @@ Tabella Commesse 1|@72g%s|Da rend. 2|@3g%s|Cliente 2|@62g%s|Regime iva +2|@72g%s|Prorata 3|@3g%s|Data ini. 3|@14g%s|Data fine -3|@26g%s|Pubblico +3|@26g%s|Pubblica 3|@35g%s|Prorogata 3|@45g%s|Chiusa 3|@52g%s|Responsabile @@ -23,6 +24,7 @@ Tabella Commesse 2|I0|@3g@6n 2|20->RAGSOC|@10g@50,ls 2|S7|@62g@17t +2|B4|@79g@6f 3|D0|@3g@ld 3|D1|@14g@ld 3|B0|@26g@8f diff --git a/ba/batbcms.uml b/ba/batbcms.uml index 08861d631..50897d791 100755 --- a/ba/batbcms.uml +++ b/ba/batbcms.uml @@ -86,6 +86,12 @@ BEGIN ITEM "FC|Fuori campo" END +BOOLEAN F_PRORATA +BEGIN + PROMPT 50 8 "Utilizza Prorata" + FIELD B4 +END + BOOLEAN F_PUBB BEGIN PROMPT 4 10 "Pubblico"