root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0 212

Browse Source 
Files correlati     : cg4.exe cg4300a.msk
Ricompilazione Demo : [ ]
Commento            :
Eliminato loop infinito per cui era impossibile uscire dall'applicazione
Aggiornata barra principale della maschera di liquidazione


git-svn-id: svn://10.65.10.50/trunk@18029 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2009-01-15 16:22:41 +00:00
parent 3f1990ece6
commit 6053c3785c
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cg/cg4300.cpp
View File

@ -845,7 +845,7 @@ void TLiquidazione_app::build_ditte_sheet(wht what)
bool TLiquidazione_app::set_liquidazione() bool TLiquidazione_app::set_liquidazione()
{ {
TMask m("cg4300a.msk"); TMask m("cg4300a");
m.set_handler(CG43_FLD_DTO, to_ditt_handler); m.set_handler(CG43_FLD_DTO, to_ditt_handler);
m.set_handler(CG43_FLD_DFR, fr_ditt_handler); m.set_handler(CG43_FLD_DFR, fr_ditt_handler);
@ -857,25 +857,20 @@ bool TLiquidazione_app::set_liquidazione()
m.set_handler(CG43_BUT_ANN, reset_button); m.set_handler(CG43_BUT_ANN, reset_button);
m.set_handler(CG43_CHK_FINAL, chk_final_handler); m.set_handler(CG43_CHK_FINAL, chk_final_handler);
m.set(CG43_FLD_SELECTED, _selected.ones()); m.set(CG43_FLD_SELECTED, _selected.ones());
m.set(CG43_FLD_ANNO, _year); m.set(CG43_FLD_ANNO, _year);
set_choice_limits(m); set_choice_limits(m);
KEY k;
// stampa abilitata per default // stampa abilitata per default
m.set(CG43_CHK_STAMPA,"X"); m.set(CG43_CHK_STAMPA,"X");
_month = m.get_int(CG43_LST_MESE); _month = m.get_int(CG43_LST_MESE);
do
{
m.set(CG43_RDB_VERS, _what); m.set(CG43_RDB_VERS, _what);
k = m.run(); const KEY k = m.run();
if (k == K_ESC) if (k == K_ENTER)
break; {
// handlers have set everything // handlers have set everything
_month = _what == trimestre ? m.get_int(CG43_LST_TRIM) : _month = _what == trimestre ? m.get_int(CG43_LST_TRIM) :
m.get_int(CG43_LST_MESE); m.get_int(CG43_LST_MESE);
@ -889,8 +884,6 @@ bool TLiquidazione_app::set_liquidazione()
if (_isprint) printer().setdate(_date); if (_isprint) printer().setdate(_date);
if (_printonly) _recalc = never; if (_printonly) _recalc = never;
} }
while (k != K_ENTER && k != K_ESC);
return k == K_ENTER; return k == K_ENTER;
} }

4
cg/cg4300a.uml
View File

@ -1,10 +1,10 @@
#include "cg4300a.h" #include "cg4300a.h"
TOOLBAR "topbar" 0 0 0 2 TOOLBAR "topbar" 0 0 0 2
#include <stdbar.h> #include <printbar.h>
ENDPAGE ENDPAGE
PAGE "Calcolo Liquidazioni" -1 -1 68 16 PAGE "Calcolo Liquidazioni" 0 2 0 0
RADIOBUTTON CG43_RDB_VERS 16 RADIOBUTTON CG43_RDB_VERS 16
BEGIN BEGIN

7
cg/cglib03.cpp
View File

@ -106,11 +106,12 @@ int analizza_IVA(const real& imptot, const real& ivatot, const real perc_ind,
// associato ad un motivo ed una percentuale di indetraibilita' // associato ad un motivo ed una percentuale di indetraibilita'
int get_tipodet_from_rmi(const TRectype& rmi, const TRectype& mov,real& percind) int get_tipodet_from_rmi(const TRectype& rmi, const TRectype& mov,real& percind)
{ {
const TCausale c(mov.get(MOV_CODCAUS));
const int annodoc = mov.get_date(MOV_DATAREG).year(); const int annodoc = mov.get_date(MOV_DATAREG).year();
int tipodet; const TCausale caus(mov.get(MOV_CODCAUS), annodoc);
int tipodet = 0;
percind = indetraibile_al(rmi.get(RMI_TIPODET), caus, annodoc, tipodet);
percind = indetraibile_al(rmi.get(RMI_TIPODET), c, annodoc, tipodet);
return tipodet; return tipodet;
} }