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

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/branches/R_10_00@22397 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2011-07-19 14:47:01 +00:00
parent 9cb4f3dc19
commit a37f40dfa9
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cg/cg3600.cpp
View File

@ -1737,33 +1737,38 @@ void TMastrini_grid::cell_request(long rec, short id, TGrid_cell& cell)
if (riga.tipo() == riga_mastrino) if (riga.tipo() == riga_mastrino)
{ {
const TRectype& rmov = _mastrino.riga(rec); const TRectype& rmov = _mastrino.riga(rec);
cell.set(rmov.get(RMV_DESCR)); TString descr(rmov.get(RMV_DESCR));
const TRectype& mov = _mastrino.testata(rec);
if (cell.empty()) if (cell.empty())
{ {
const TRectype& mov = _mastrino.testata(rec); descr = mov.get(MOV_DESCR);
TString descr(mov.get(MOV_DESCR));
if (cell.empty()) if (cell.empty())
{ {
TBill uncle(rmov,true); TBill uncle(rmov,true);
descr = uncle.descrizione(); descr = uncle.descrizione();
} }
if (app().query_mask().get_bool(F_ST_CONTSEP))
descr << "\n" << cache().get("&NPENT", mov.get(MOV_CONTSEP), "S0");
cell.set(descr);
} }
if (app().query_mask().get_bool(F_ST_CONTSEP))
descr << "\n" << cache().get("&NPENT", mov.get(MOV_CONTSEP), "S0");
cell.set(descr);
} }
else else
{ {
const TRectype& rmov = _mastrino.riga(rec); const TRectype& rmov = _mastrino.riga(rec);
cell.set(rmov.get(RMV_DESCR)); const TRectype& mov = _mastrino.testata(rec);
TString descr(rmov.get(MOV_DESCR));
// Bug 0001748: ignora descrizioni generate da contabilizzazione // Bug 0001748: ignora descrizioni generate da contabilizzazione
if (cell.empty() || cell == _mastrino.conto().descrizione()) if (cell.empty() || descr == _mastrino.conto().descrizione())
{ {
const TBill conto(rmov); const TBill conto(rmov);
cell.set(conto.descrizione()); descr = conto.descrizione();
} }
if (app().query_mask().get_bool(F_ST_CONTSEP))
descr << "\n" << cache().get("&NPENT", mov.get(MOV_CONTSEP), "S0");
cell.set(descr);
} }
break; break;
case 105: // Dare case 105: // Dare

1
cg/cgmenu.men
View File

@ -218,6 +218,7 @@ Flags = ""
Item_01 = "Apertura nuovo esercizio", "cg4 -4 C", "F" Item_01 = "Apertura nuovo esercizio", "cg4 -4 C", "F"
Item_02 = "Apertura nuovo esercizio IVA", "cg4 -4 I", "F" Item_02 = "Apertura nuovo esercizio IVA", "cg4 -4 I", "F"
Item_03 = "Chiusura/Apertura conti", "cg4 -5", "F" Item_03 = "Chiusura/Apertura conti", "cg4 -5", "F"
Item_04 = "Chiusura/Apertura conti Contabilita' sep.", "np0 -1", "F"
[CGMENU_022] [CGMENU_022]
Caption = "Gestione versamenti IVA" Caption = "Gestione versamenti IVA"