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

Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00

Browse Source
This commit is contained in:
Sirio Builder 2019-09-16 10:07:33 +02:00
commit f577ccf63e
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cg/cg1500.cpp
View File

@ -3908,17 +3908,32 @@ int TStampa_bilanci::stampa_intestazione_ditta()
riga.right_just(_stampa_width-10);
//_stampa_mov_provv(1=normale,2=globale,3=solo provvisori)
const char* tipoprovv = "";
if (_stampa_mov_prov > 0x1)
tipoprovv = TR("GLOBALE");
if (!(_stampa_mov_prov & 0x1))
tipoprovv = TR("PROVVISORIO");
//l'uso della overwrite e' una vera vaccata!
riga.overwrite (format("%s %s %s %s", TR("Partita iva"), (const char*)_paiva, TR("Codice fiscale"), (const char*)_cofi));
riga.overwrite (tipoprovv, 85);
set_header (r++, "%s", (const char*) riga);
if (_stampa_mov_prov > 0x1)
{
TString tipoprovv;
if ((_stampa_mov_prov & 0x1))
tipoprovv << TR("Movimenti : Normali");
if (_stampa_mov_prov > 0x1)
tipoprovv << TR(" Provvisori :");
if (_stampa_mov_prov & 0x2)
tipoprovv << TR(" Manuali");
if (_stampa_mov_prov & 0x4)
tipoprovv << TR(" Competenza costi/ricavi");
if (_stampa_mov_prov & 0x8)
tipoprovv << TR(" Cespiti");
riga.cut(0);
riga.overwrite(tipoprovv, (_stampa_width - tipoprovv.len()) /2);
set_header(r++, "%s", (const char*)riga);
}
return r;
}

6
src/cg/cg1500a.uml
View File

@ -173,17 +173,17 @@ END
BOOLEAN F_PROVVM
BEGIN
PROMPT 30 11 "Provv.Manuali"
PROMPT 29 11 "Provvisori : Manuali"
END
BOOLEAN F_PROVVB
BEGIN
PROMPT 50 11 "Provv.Bilancio"
PROMPT 52 11 "Comp. costi/ricavi"
END
BOOLEAN F_PROVVC
BEGIN
PROMPT 70 11 "Provv.Cespiti"
PROMPT 73 11 "Cespiti"
END
LIST F_MODULO 1 12