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

Aggiustamenti visualizzazione

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@1391 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-05-24 10:44:44 +00:00
parent dcfc69524d
commit 0db38596e2
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cg/cg5500.cpp
View File

@ -357,7 +357,11 @@ bool Visliq_app::sel_mese_sh2 (TMask_field& f, KEY k)
TMask& m = *(app().get_main_mask());
TSheet_field& sh = (TSheet_field&)m.field(F_VISLIQ2);
int month = sh.selected()+1;
if (sh.items() == 4) month *= 3;
if (sh.items() < 12)
month *= 3;
// click su acconto
if (month > 12) month = 12;
bool ok = FALSE;
if (m.dirty())
@ -965,8 +969,8 @@ void Visliq_app::write_del()
int ctri = _freqviva == "M" ? 6000 + month : 6030 + (month/3);
_del->put("S6", format("%d",ctri));
if (wasdel) _del->write();
else _del->rewrite();
if (wasdel) _del->rewrite();
else _del->write();
}
@ -1046,17 +1050,18 @@ void Visliq_app::read_general(TMask& m)
}
TString nomemese(26);
sv.destroy();
for (i = 1; i <= 13; i++)
{
if (!is_month_ok(i))
if (!is_month_ok(i) && i != 13)
continue;
TToken_string* tt;
if (sv.items() < i) tt = new TToken_string(80);
else tt = &(sv.row(i-1));
TToken_string* tt = new TToken_string(80);
nomemese = itoname(i == 13 ? 12 : i);
if (nomemese == "4 Trimestre") nomemese = "4 Tr.";
if (i == 12) nomemese << " acconto";
if (i == 13) nomemese << " saldo";
@ -1067,7 +1072,7 @@ void Visliq_app::read_general(TMask& m)
tt->add(banche[i-1].get(2)); // concessionaria
tt->add(versamenti[i-1].string());// versamenti
sv.row(i-1) = (*tt);
sv.row(-1) = *tt;
}
sh.enable_column(0, FALSE);

12
cg/cg5500b.uml
View File

@ -41,7 +41,7 @@ END
STRING F_RAGSOC 37 50
BEGIN
PROMPT 16 2 "Rag. soc. "
PROMPT 16 2 ""
FLAGS "D"
END
@ -52,7 +52,7 @@ BEGIN
PICTURE "."
END
SPREADSHEET F_VISLIQ1 0 11
SPREADSHEET F_VISLIQ1 78 11
BEGIN
PROMPT 1 7 "Liquidazione"
ITEM "Mese@10"
@ -80,11 +80,11 @@ END
STRING F_RAGSOC2 37 50
BEGIN
PROMPT 16 2 "Rag. soc. "
PROMPT 16 2 ""
FLAGS "D"
END
SPREADSHEET F_VISLIQ2 0 11
SPREADSHEET F_VISLIQ2 78 11
BEGIN
PROMPT 1 5 "Versamenti"
ITEM "Mese@15"
@ -128,14 +128,14 @@ END
NUMBER 104 15
BEGIN
PROMPT 22 5 "IVA a rimborso "
PROMPT 1 5 "IVA a rimborso "
FLAGS "R"
PICTURE "."
END
NUMBER 105 15
BEGIN
PROMPT 22 6 "Debito/Credito "
PROMPT 1 6 "Debito/Credito "
FLAGS "R"
PICTURE "."
END

6
cg/cg5500c.uml
View File

@ -40,7 +40,7 @@ END
STRING F_RAGSOC 37 50
BEGIN
PROMPT 22 2 "Rag. soc. "
PROMPT 22 2 ""
FLAGS "D"
END
@ -51,7 +51,7 @@ BEGIN
PICTURE "."
END
SPREADSHEET F_VISLIQ1 0 5
SPREADSHEET F_VISLIQ1 78 5
BEGIN
PROMPT 1 7 "Liquidazione"
ITEM "Mese@10"
@ -62,7 +62,7 @@ BEGIN
ITEM "D/C"
END
SPREADSHEET F_VISLIQ2 0 5
SPREADSHEET F_VISLIQ2 78 5
BEGIN
PROMPT 1 12 "Versamenti"
ITEM "Mese@10"