diff --git a/cd/test/ba0804.txt b/cd/test/ba0804.txt
new file mode 100644
index 000000000..30fc7329c
--- /dev/null
+++ b/cd/test/ba0804.txt
@@ -0,0 +1,4 @@
+recdesc\f23.trr
+recdesc\f23.dir
+
+Eliminato campo protocollo fppro che non serviva
diff --git a/cd/test/ba0804a.ini b/cd/test/ba0804a.ini
new file mode 100644
index 000000000..300609e8d
--- /dev/null
+++ b/cd/test/ba0804a.ini
@@ -0,0 +1,32 @@
+[Main]
+Demo=0
+
+[ba2]
+File(372) = recdesc\f23.dir|X
+File(373) = recdesc\f23.trr|X
+Patch = 0804
+Versione = 21511200
+
+[ba99]
+Kill(0) = wxmsw240.dll|x
+Kill(1) = batbsce.txt|x
+Kill(2) = bastfsc.rep|x
+Kill(3) = bastfsc.msk|x
+Kill(4) = bastcms.msk|x
+Kill(5) = bastcms.rep|x
+Kill(6) = bastuue.rep|x
+Kill(7) = bastuue.msk|x
+
+[ba]
+Data = 30-05-2019
+Descrizione = Base
+Dischi = 1
+Moduli = sy
+OEM = 
+Patch = 804
+PostProcess = bainst -0 BA
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/ba0804a1.zip b/cd/test/ba0804a1.zip
new file mode 100644
index 000000000..c1aee4148
Binary files /dev/null and b/cd/test/ba0804a1.zip differ
diff --git a/cd/test/cg0804.txt b/cd/test/cg0804.txt
new file mode 100644
index 000000000..1eb674070
--- /dev/null
+++ b/cd/test/cg0804.txt
@@ -0,0 +1,5 @@
+cg2.exe
+cg2100c.msk
+
+Tolto codice protocollo dai movimenti, non serve
+Periodo liquidazione precedente default gestito con f1
diff --git a/cd/test/cg0804a.ini b/cd/test/cg0804a.ini
new file mode 100644
index 000000000..b9d6cad8b
--- /dev/null
+++ b/cd/test/cg0804a.ini
@@ -0,0 +1,95 @@
+[Main]
+Demo=0
+
+[cg2]
+Edit_23 = cg2 -0
+File(161) = cg2.exe|X
+File(164) = cg2100c.msk|X
+Patch = 0804
+Versione = 21511200
+
+[cg99]
+Kill(0) = bastmsp.rep|x
+Kill(1) = bastivd.rep|x
+Kill(2) = bastvet.rep|x
+Kill(3) = bastivd.msk|x
+Kill(4) = bastnot.msk|x
+Kill(5) = bastesc.rep|x
+Kill(6) = batbdpn.msk|x
+Kill(7) = bastndo.rep|x
+Kill(8) = cgtbcon.msk|x
+Kill(9) = bastzon.msk|x
+Kill(10) = bastmsp.msk|x
+Kill(11) = bastcve.rep|x
+Kill(12) = batblbu.msk|x
+Kill(13) = batbind.msk|x
+Kill(14) = batbpdb.msk|x
+Kill(15) = bastpor.msk|x
+Kill(16) = batbleg.msk|x
+Kill(17) = bastzon.rep|x
+Kill(18) = batbver.msk|x
+Kill(19) = batbndo.msk|x
+Kill(20) = bastcco.msk|x
+Kill(21) = batbscc.msk|x
+Kill(22) = bastvet.msk|x
+Kill(23) = batbtit.msk|x
+Kill(24) = batbcco.msk|x
+Kill(25) = bastarb.rep|x
+Kill(26) = bastver.rep|x
+Kill(27) = bastcam.rep|x
+Kill(28) = bastcve.msk|x
+Kill(29) = batbcfi.msk|x
+Kill(30) = batbdel.msk|x
+Kill(31) = bastcfi.msk|x
+Kill(32) = bastleg.msk|x
+Kill(33) = batbins.msk|x
+Kill(34) = batbreg.msk|x
+Kill(35) = batbpor.msk|x
+Kill(36) = bastdpn.msk|x
+Kill(37) = bastpdb.msk|x
+Kill(38) = batbcam.msk|x
+Kill(39) = batbivd.msk|x
+Kill(40) = bastver.msk|x
+Kill(41) = bastntb.rep|x
+Kill(42) = batbzon.msk|x
+Kill(43) = bastreg.rep|x
+Kill(44) = bastpdb.rep|x
+Kill(45) = bastscc.msk|x
+Kill(46) = bastreg.msk|x
+Kill(47) = bastdpn.rep|x
+Kill(48) = batbmsp.msk|x
+Kill(49) = bastscc.rep|x
+Kill(50) = batbcve.msk|x
+Kill(51) = batbarb.msk|x
+Kill(52) = batbinl.msk|x
+Kill(53) = bastpor.rep|x
+Kill(54) = batbtra.msk|x
+Kill(55) = bastndo.msk|x
+Kill(56) = bastnot.rep|x
+Kill(57) = batbnot.msk|x
+Kill(58) = batblia.msk|x
+Kill(59) = batbesc.msk|x
+Kill(60) = bastleg.rep|x
+Kill(61) = bastntb.msk|x
+Kill(62) = batblia.msk|x
+Kill(63) = bastesc.msk|x
+Kill(64) = bastcam.msk|x
+Kill(65) = bastcco.rep|x
+Kill(66) = batbvet.msk|x
+Kill(67) = bastarb.msk|x
+Kill(68) = bastcfi.rep|x
+Kill(69) = batbntb.msk|x
+
+[cg]
+Data = 30-05-2019
+Descrizione = Contabilita' Generale
+Dischi = 1
+Moduli = ba
+OEM = 
+Patch = 804
+PostProcess = bainst -0 CG
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/cg0804a1.zip b/cd/test/cg0804a1.zip
new file mode 100644
index 000000000..fb00baa14
Binary files /dev/null and b/cd/test/cg0804a1.zip differ
diff --git a/cd/test/cg0806.txt b/cd/test/cg0806.txt
new file mode 100644
index 000000000..e25ec7ff1
--- /dev/null
+++ b/cd/test/cg0806.txt
@@ -0,0 +1,4 @@
+cg5.exe
+
+- Disabilitato il campo credito utilizzato in IVA se il periodo è a credito
+- Risolta Issue #40
\ No newline at end of file
diff --git a/cd/test/cg0806a.ini b/cd/test/cg0806a.ini
new file mode 100644
index 000000000..23647b436
--- /dev/null
+++ b/cd/test/cg0806a.ini
@@ -0,0 +1,93 @@
+[Main]
+Demo=0
+
+[cg1]
+File(61) = cg5.exe|X
+Patch = 806
+Versione = 21511200
+
+[cg99]
+Kill(0) = batbndo.msk|x
+Kill(1) = bastarb.rep|x
+Kill(2) = bastcfi.msk|x
+Kill(3) = batbver.msk|x
+Kill(4) = batbcco.msk|x
+Kill(5) = batbdel.msk|x
+Kill(6) = bastcam.rep|x
+Kill(7) = batbins.msk|x
+Kill(8) = bastver.rep|x
+Kill(9) = bastleg.msk|x
+Kill(10) = bastpor.msk|x
+Kill(11) = batbscc.msk|x
+Kill(12) = batbpdb.msk|x
+Kill(13) = bastcco.msk|x
+Kill(14) = bastzon.rep|x
+Kill(15) = batbtit.msk|x
+Kill(16) = batbleg.msk|x
+Kill(17) = bastvet.msk|x
+Kill(18) = bastcve.rep|x
+Kill(19) = bastmsp.msk|x
+Kill(20) = batbind.msk|x
+Kill(21) = batblbu.msk|x
+Kill(22) = batbesc.msk|x
+Kill(23) = bastcco.rep|x
+Kill(24) = batblia.msk|x
+Kill(25) = bastcam.msk|x
+Kill(26) = bastarb.msk|x
+Kill(27) = batbvet.msk|x
+Kill(28) = bastscc.rep|x
+Kill(29) = bastndo.msk|x
+Kill(30) = bastntb.msk|x
+Kill(31) = batbmsp.msk|x
+Kill(32) = batbtra.msk|x
+Kill(33) = bastleg.rep|x
+Kill(34) = batbnot.msk|x
+Kill(35) = bastesc.msk|x
+Kill(36) = bastnot.rep|x
+Kill(37) = batblia.msk|x
+Kill(38) = batbivd.msk|x
+Kill(39) = bastscc.msk|x
+Kill(40) = batbarb.msk|x
+Kill(41) = batbcam.msk|x
+Kill(42) = bastpdb.rep|x
+Kill(43) = batbcve.msk|x
+Kill(44) = bastdpn.rep|x
+Kill(45) = bastpor.rep|x
+Kill(46) = bastreg.msk|x
+Kill(47) = batbinl.msk|x
+Kill(48) = batbcfi.msk|x
+Kill(49) = batbpor.msk|x
+Kill(50) = bastntb.rep|x
+Kill(51) = bastcve.msk|x
+Kill(52) = batbreg.msk|x
+Kill(53) = bastver.msk|x
+Kill(54) = bastpdb.msk|x
+Kill(55) = bastreg.rep|x
+Kill(56) = bastdpn.msk|x
+Kill(57) = batbzon.msk|x
+Kill(58) = batbntb.msk|x
+Kill(59) = bastcfi.rep|x
+Kill(60) = bastzon.msk|x
+Kill(61) = cgtbcon.msk|x
+Kill(62) = bastivd.rep|x
+Kill(63) = bastmsp.rep|x
+Kill(64) = bastesc.rep|x
+Kill(65) = bastnot.msk|x
+Kill(66) = bastivd.msk|x
+Kill(67) = bastvet.rep|x
+Kill(68) = bastndo.rep|x
+Kill(69) = batbdpn.msk|x
+
+[cg]
+Data = 30-05-2019
+Descrizione = Contabilita' Generale
+Dischi = 1
+Moduli = ba
+OEM = 
+Patch = 806
+PostProcess = bainst -0 CG
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/cg0806a1.zip b/cd/test/cg0806a1.zip
new file mode 100644
index 000000000..288a6347e
Binary files /dev/null and b/cd/test/cg0806a1.zip differ
diff --git a/cd/test/fp0804.txt b/cd/test/fp0804.txt
new file mode 100644
index 000000000..792d584f8
--- /dev/null
+++ b/cd/test/fp0804.txt
@@ -0,0 +1,7 @@
+fp0.exe
+fp0400a.msk
+
+Aggiunto flag periodo liquidazione precedente default (f1)
+Aggiunta a contabil. autom.: scadenze, importi e imponibili
+Risolto problema visualizzazione massimo 4 righe log contabil.
+Aggiunti num reg e prot iva in messaggio di log
diff --git a/cd/test/fp0804a.ini b/cd/test/fp0804a.ini
new file mode 100644
index 000000000..963f32b9c
--- /dev/null
+++ b/cd/test/fp0804a.ini
@@ -0,0 +1,20 @@
+[Main]
+Demo=0
+
+[fp1]
+File(0) = fp0.exe|X
+File(4) = fp0400a.msk|X
+Patch = 0804
+Versione = 21511200
+
+[fp]
+Data = 30-05-2019
+Descrizione = Fattura Elettronica
+Dischi = 1
+Moduli = cg,ve
+OEM = 
+Patch = 804
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/fp0804a1.zip b/cd/test/fp0804a1.zip
new file mode 100644
index 000000000..e02178050
Binary files /dev/null and b/cd/test/fp0804a1.zip differ
diff --git a/cd/test/ve0806.txt b/cd/test/ve0806.txt
new file mode 100644
index 000000000..8cd676ba0
--- /dev/null
+++ b/cd/test/ve0806.txt
@@ -0,0 +1,3 @@
+ve2400.msk
+
+- Risolta Issue #39
\ No newline at end of file
diff --git a/cd/test/ve0806a.ini b/cd/test/ve0806a.ini
new file mode 100644
index 000000000..6d204f03e
--- /dev/null
+++ b/cd/test/ve0806a.ini
@@ -0,0 +1,129 @@
+[Main]
+Demo=0
+
+[ve1]
+File(44) = ve2400.msk|X
+Patch = 806
+Versione = 21511200
+
+[ve99]
+Kill(0) = batbcld.msk|x
+Kill(1) = bastspp.rep|x
+Kill(2) = bastbnp.msk|x
+Kill(3) = bastgmc.rep|x
+Kill(4) = batbgsa.msk|x
+Kill(5) = bastfrm.msk|x
+Kill(6) = batbfca.msk|x
+Kill(7) = bastgcg.rep|x
+Kill(8) = bastprs.rep|x
+Kill(9) = basttip.msk|x
+Kill(10) = bastfrr.rep|x
+Kill(11) = bastrfa.rep|x
+Kill(12) = ve7200a.frm|x
+Kill(13) = batbfrd.msk|x
+Kill(14) = bastcaa.msk|x
+Kill(15) = batbprv.msk|x
+Kill(16) = ve7400conf.ini|x
+Kill(17) = bastfca.msk|x
+Kill(18) = batbasf.msk|x
+Kill(19) = efstbnp.rep|x
+Kill(20) = batbgca.msk|x
+Kill(21) = bastums.rep|x
+Kill(22) = bastctr.msk|x
+Kill(23) = ve7.exe|x
+Kill(24) = basteld.rep|x
+Kill(25) = batbtri.msk|x
+Kill(26) = batbfrr.msk|x
+Kill(27) = batbmre.msk|x
+Kill(28) = ve7701a.ini|x
+Kill(29) = batbtag.msk|x
+Kill(30) = bastasf.rep|x
+Kill(31) = batbrfa.msk|x
+Kill(32) = bastrfc.rep|x
+Kill(33) = ve7200a.msk|x
+Kill(34) = eftbbnp.msk|x
+Kill(35) = batbrfc.msk|x
+Kill(36) = basttag.rep|x
+Kill(37) = bastgca.rep|x
+Kill(38) = bastprs.msk|x
+Kill(39) = ve7300a.frm|x
+Kill(40) = bastabe.msk|x
+Kill(41) = batbnum.msk|x
+Kill(42) = bastspp.msk|x
+Kill(43) = batbbnp.msk|x
+Kill(44) = bastubi.msk|x
+Kill(45) = batbcaa.msk|x
+Kill(46) = bastnum.rep|x
+Kill(47) = batbfsa.msk|x
+Kill(48) = bastrfa.msk|x
+Kill(49) = bastimb.rep|x
+Kill(50) = bastgmc.msk|x
+Kill(51) = batbgcg.msk|x
+Kill(52) = bastgcg.msk|x
+Kill(53) = batbstd.msk|x
+Kill(54) = batbfid.msk|x
+Kill(55) = basttag.msk|x
+Kill(56) = batbctr.msk|x
+Kill(57) = batbspp.msk|x
+Kill(58) = bastums.msk|x
+Kill(59) = bastfrm.rep|x
+Kill(60) = ve7100a.msk|x
+Kill(61) = bastasf.msk|x
+Kill(62) = bastabe.rep|x
+Kill(63) = bastrfc.msk|x
+Kill(64) = basteld.msk|x
+Kill(65) = batbpro.msk|x
+Kill(66) = batbtip.msk|x
+Kill(67) = bastubi.rep|x
+Kill(68) = bastcau.rep|x
+Kill(69) = batbprs.msk|x
+Kill(70) = batbubi.msk|x
+Kill(71) = bastcau.msk|x
+Kill(72) = basttri.rep|x
+Kill(73) = ve7400a.ini|x
+Kill(74) = bastgca.msk|x
+Kill(75) = bastcaa.rep|x
+Kill(76) = baststd.rep|x
+Kill(77) = ve7400a.msk|x
+Kill(78) = batbcau.msk|x
+Kill(79) = bastctr.rep|x
+Kill(80) = baststd.msk|x
+Kill(81) = bastimb.msk|x
+Kill(82) = ve7500a.msk|x
+Kill(83) = bastfrr.msk|x
+Kill(84) = ve7600a.msk|x
+Kill(85) = bastfrd.rep|x
+Kill(86) = basttip.rep|x
+Kill(87) = bastfca.rep|x
+Kill(88) = bastnum.msk|x
+Kill(89) = batbums.msk|x
+Kill(90) = ve7300a.msk|x
+Kill(91) = bastcra.rep|x
+Kill(92) = ve7700a.msk|x
+Kill(93) = batbspt.msk|x
+Kill(94) = basttri.msk|x
+Kill(95) = batbeld.msk|x
+Kill(96) = batbcra.msk|x
+Kill(97) = batbfrm.msk|x
+Kill(98) = batbacr.msk|x
+Kill(99) = batbimb.msk|x
+Kill(100) = batbgmc.msk|x
+Kill(101) = bastcra.msk|x
+Kill(102) = bastbnp.rep|x
+Kill(103) = bastfrd.msk|x
+Kill(104) = efstbnp.msk|x
+Kill(105) = batbabe.msk|x
+
+[ve]
+Data = 03-05-2019
+Descrizione = Vendite
+Dischi = 1
+Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
+OEM = 
+Patch = 806
+PostProcess = bainst -0 VE
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/ve0806a1.zip b/cd/test/ve0806a1.zip
new file mode 100644
index 000000000..b388dd2fe
Binary files /dev/null and b/cd/test/ve0806a1.zip differ
diff --git a/src/cg/cg5500.cpp b/src/cg/cg5500.cpp
index fcead0086..7ffd957a8 100755
--- a/src/cg/cg5500.cpp
+++ b/src/cg/cg5500.cpp
@@ -423,11 +423,11 @@ bool Visliq_app::sel_mese_sh1 (TMask_field& f, KEY k)
   if (sm.is_running())
   {
     // TBC controllare se sono i dati giusti in tt
-    sm.field(102).set(tt.get(1));
-    sm.field(103).set(tt.get(2));
-    sm.field(104).set(tt.get(3));
-    sm.field(105).set(tt.get(4));
-    sm.field(106).set(tt.get(5));  
+    sm.field(S_RISULTATO).set(tt.get(cid2index(S_RISULTATO)));
+    sm.field(S_DEBCRED1	).set(tt.get(cid2index(S_DEBCRED1)));
+    sm.field(S_RIMBORSO).set(tt.get(cid2index(S_RIMBORSO)));
+    sm.field(S_RETTIFICHE).set(tt.get(cid2index(S_RETTIFICHE)));
+    sm.field(S_DEBCRED2).set(tt.get(cid2index(S_DEBCRED2)));
   }
   
   sh.row(sel) = tt;
@@ -436,13 +436,14 @@ bool Visliq_app::sel_mese_sh1 (TMask_field& f, KEY k)
 
   if (app().look_del(month,1))
   {                                         
-    TToken_string& tv = sv.row(sel == (sh.items() - 1) ? sel -1 : sel);
-    tv.add(app().del()->get("D0"),1);
-    tv.add(app().del()->get("S7"),2);
-    tv.add(app().del()->get("S8"),3);
-    tv.add(app().del()->get("S9"),4);
-    tv.add(app().del()->get("R0"),5);
-    sv.force_update(sel == (sh.items() - 1) ? sel -1 : sel);
+		const int nrow = sel == (sh.items() - 1) ? sel - 1 : sel;
+
+    sv.set_row_cell(S_DATA,  app().del()->get("D0"), nrow);
+		sv.set_row_cell(S_ABI, app().del()->get("S7"), nrow);
+		sv.set_row_cell(S_CAB, app().del()->get("S8"),nrow);
+		sv.set_row_cell(S_CONC, app().del()->get("S9"),nrow);
+		sv.set_row_cell(S_VERSAMENTO, app().del()->get("R0"), nrow);
+    sv.force_update(nrow);
   }
   
   return true;
@@ -452,11 +453,11 @@ bool Visliq_app::enable_date(TMask_field& f, KEY k)
 {                                                  
   if (k == K_TAB && (f.focusdirty()|| !f.mask().is_running()))
 	{
-		const bool enable = f.mask().get(104).full() || f.mask().get(109).full();
+		const bool enable = f.mask().get(S_RIMBORSO).full() || f.mask().get(S_CREDF24).full();
 
-		f.mask().enable(110, enable);
+		f.mask().enable(S_DATAAUT, enable);
 		if (!enable)
-			f.mask().set(110, "");
+			f.mask().set(S_DATAAUT, "");
 	}
 	return true;
 }
@@ -1657,19 +1658,25 @@ void Visliq_app::read_general(TMask& m)
 			const real r1 = _lim->get_real("R1");
 			const real r5 = _lim->get_real("R5");
 			const int row = sh.set_row_cell(S_MESE, itoname(i));
-			
+			const TString debcred1 = ris == ZERO ? "" : (ris > ZERO ? "D" : "C");
+			real r0 = _lim->get_real("R0");
+			const TString debcred3 = r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C");
+
+			sh.set_row_cell(S_IVA, abs(r0), row);
+			sh.set_row_cell(S_DEBCRED3, debcred3, row);
 			sh.set_row_cell(S_RISULTATO, abs(ris), row);
-			sh.set_row_cell(S_DEBCRED1,	ris == ZERO ? "" : (ris > ZERO ? "D" : "C"), row);
+			sh.set_row_cell(S_DEBCRED1,	debcred1, row);
 			sh.set_row_cell(S_RIMBORSO, r1, row);
 			sh.set_row_cell(S_RETTIFICHE, abs(r5), row);
 			sh.set_row_cell(S_DEBCRED2, r5 == ZERO ? "" : (r5 > ZERO ? "D" : "C"), row);
 
-			const real criva = _lim->get_real("R15");
+			const real criva = debcred1 == "C" ? ZERO : _lim->get_real("R15");
 			const real crf24 = _lim->get_real("R16");
 			const real autf24 = _lim->get_real("R20");
 			bool enable_date = r1 != ZERO;
 
 		  sh.set_row_cell(S_CREDIVA, criva, row);
+			sh.enable_cell(row, S_CREDIVA, debcred3 == "D");
 		  sh.set_row_cell(S_CREDF24PRE,crf24, row);
 		  sh.set_row_cell(S_CREDF24, autf24	, row);
 			enable_date |= autf24 != ZERO;
@@ -1698,11 +1705,6 @@ void Visliq_app::read_general(TMask& m)
 			}
 			else
 				sh.set_row_cell(S_CREDRES, ZERO, row);
-
-			real r0 = _lim->get_real("R0");
-
-			sh.set_row_cell(S_IVA, abs(r0).string(), row);
-			sh.set_row_cell(S_DEBCRED3, r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), row);
 			sh.set_row_cell(S_DESCR, _lim->get("S3"), row);
 			//			sh.row(row) = (*tt);
 		}
@@ -1819,12 +1821,12 @@ void Visliq_app::write_general(TMask& m)
     bool vfrommask = sv.selected() == (i == 12 ? row + 1 : row) && svm.is_running();
     
     TToken_string& tt_lo = (TToken_string&)_liq_rows[row]; 
-    TToken_string& tt_ln = sh.row(row);  
+//    TToken_string& tt_ln = sh.row(row);  
     
     // risolve menata del dettaglio si'/no  
     if (lfrommask)
       for (int i = 1; i <= 13; i++)
-       tt_ln.add(shm.get(101+i),i);
+       sh.set_row_cell(101 + i, shm.get(101+i), row);
 
     // saltare una riga se dicembre (riga 11 == acconto)  
     TToken_string& tt_vo = (TToken_string&)_vers_rows[i == 12 ? row + 1 : row]; 
@@ -1833,7 +1835,7 @@ void Visliq_app::write_general(TMask& m)
     if (vfrommask)
     { 
       for (int i = 1; i <= 5; i++)
-        tt_vn.add(svm.get(101+i),i);
+				sh.set_row_cell(101 + i, svm.get(101+i), row);
     }
     
     // traduci contenuto righe in real pila
@@ -1841,7 +1843,6 @@ void Visliq_app::write_general(TMask& m)
 		real    nrett(sh.get_real_row_cell(row, S_RETTIFICHE));
     real    orimb(tt_lo.get(cid2index(S_RIMBORSO)));
     real    nrimb(sh.get_real_row_cell(row, S_RIMBORSO));
-    real    crcode(sh.get_real_row_cell(row, S_CREDIVA));
     real    crf24(sh.get_real_row_cell(row, S_CREDF24PRE));
 		real    oautf24(tt_lo.get(cid2index(S_CREDF24)));
 		real    autf24(sh.get_real_row_cell(row, S_CREDF24));
@@ -1852,8 +1853,8 @@ void Visliq_app::write_general(TMask& m)
 
 		real    overs(tt_vo.get(cid2index(S_VERSAMENTO)));
 		real    nvers(sv.get_real_row_cell(row, S_VERSAMENTO));
-		TDate   odate(tt_vo.get(cid2index(S_DATAAUT)));
-		TDate   ndate(sv.get_date_row_cell(row, S_DATAAUT));
+		TDate   odate(tt_vo.get(cid2index(S_DATA)));
+		TDate   ndate(sv.get_date_row_cell(row, S_DATA));
 		TString8 oabi(tt_vo.get(cid2index(S_ABI)));
 		TString8 nabi(sv.get_str_row_cell(row, S_ABI));
 		TString8 ocab(tt_vo.get(cid2index(S_CAB)));
@@ -2047,16 +2048,16 @@ void Visliq_app::write_general(TMask& m)
           round_imposta(intr);
         _lim->put("R14",intr);
       }  
-			if (gestione_manuale)
-				_lim->put("R15", crcode);
-
       _lim->put("R16", crf24);
       _lim->put("R20", autf24);
       _lim->put("D1", dautf24);
       if (compensabile)
       {
-        const real criva(tt_ln.get(6));
+				if (row == 3)
+					int i = 1;
         
+        const real    criva(sh.get_real_row_cell(row, S_CREDIVA));
+
 				cr_res += autf24;
         cr_res -= crf24;
         cr_res -= criva;
@@ -2064,7 +2065,9 @@ void Visliq_app::write_general(TMask& m)
 					sh.set_back_and_fore_color(COLOR_LTYELLOW, COLOR_DKRED, row, 7);
 				else
 					sh.set_back_and_fore_color(NORMAL_BACK_COLOR, NORMAL_COLOR, row, 7);
-      }         
+        if (gestione_manuale)
+					_lim->put("R15", criva);
+			}
       _lim->put("S3", descr);
 
       _lim->rewrite();
@@ -2099,25 +2102,21 @@ void Visliq_app::write_general(TMask& m)
 			const real iva_acq = _lam->get_real("R1");   // IVA vendite
 			const real ris = iva_ven - iva_acq;
 
-			tt_ln.add(abs(ris).string(), 1);
-      tt_ln.add(ris == 0 ? "" : (ris > 0 ? "D" : "C"), 2);
+			sh.set_row_cell(S_RISULTATO, abs(ris), row);
+			sh.set_row_cell(S_DEBCRED1, ris == ZERO ? "" : (ris > ZERO ? "D" : "C"), row);
 
-      tt_ln.add((_lim->get_real("R1")).string(),3);
+			sh.set_row_cell( S_RIMBORSO, _lim->get_real("R1"), row);
 			
-			int sr5 = (_lim->get_real("R5")).sign();
-			real r5abs = abs(_lim->get_real("R5"));
+			real r5 = (_lim->get_real("R5"));
 			
-			tt_ln.add(r5abs.string(),4);
-      tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5);
-			if ( cr_res < ZERO)
-	      tt_ln.add("",10);
-			else
-				tt_ln.add(cr_res.string(), 10);
+			sh.set_row_cell(S_RETTIFICHE, abs(r5), row);
+			sh.set_row_cell(S_DEBCRED2, r5 == ZERO ? "" : (r5 > ZERO? "D" : "C"), row);
+			sh.set_row_cell(S_CREDRES,  cr_res < ZERO ? ZERO : cr_res, row);
 		
 			real r0 = _lim->get_real("R0");
 
-			tt_ln.add(abs(r0).string(), 11);
-			tt_ln.add(r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), 12);
+			sh.set_row_cell(S_IVA, abs(r0), row);
+			sh.set_row_cell(S_DEBCRED3, r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), row);
 		}
     _from_one = false;      
   } // for mese liq. (riga sheet)
diff --git a/src/include/msksheet.h b/src/include/msksheet.h
index 283174cc5..d817e027f 100755
--- a/src/include/msksheet.h
+++ b/src/include/msksheet.h
@@ -165,12 +165,12 @@ public:
 	virtual int set_row_cell(short id, const real& value, int nrow = -1);
 	virtual int set_row_cell(short id, const TDate& value, int nrow = -1);
 
-	virtual const char * get_str_row_cell(int nrow, short id) { return row(nrow).get(); }
-	virtual char get_char_row_cell(int nrow, short id) { return row(nrow).get_char(); }
-	virtual long get_long_row_cell(int nrow, short id) { return row(nrow).get_long(); }
-	virtual int get_int_row_cell(int nrow, short id) { return row(nrow).get_int(); }
-	virtual real get_real_row_cell(int nrow, short id) { return real(row(nrow).get()); }
-	virtual TDate get_date_row_cell(int nrow, short id) { return TDate(row(nrow).get()); }
+	virtual const char * get_str_row_cell(int nrow, short id) { return row(nrow).get(cid2index(id)); }
+	virtual char get_char_row_cell(int nrow, short id) { return row(nrow).get_char(cid2index(id)); }
+	virtual long get_long_row_cell(int nrow, short id) { return row(nrow).get_long(cid2index(id)); }
+	virtual int get_int_row_cell(int nrow, short id) { return row(nrow).get_int(cid2index(id)); }
+	virtual real get_real_row_cell(int nrow, short id) { return real(row(nrow).get(cid2index(id))); }
+	virtual TDate get_date_row_cell(int nrow, short id) { return TDate(row(nrow).get(cid2index(id))); }
 
   char separator() const { return _separator; }