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

Patch level : 12.0 934

Browse Source 
Files correlati     : cg3.exe cg3600a.msk
Commento            :

 - Modificata l'intestazione per i codici fiscali esteri
This commit is contained in:
Alessandro Bonazzi 2020-01-30 20:15:37 +01:00
parent b4d662e3a7
commit 4a1cefa181
2 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/cg/cg3200.cpp
View File

@ -2614,58 +2614,58 @@ void TMastrini_application::crea_intestazione()
if (_numcarat == 1)
{
sep.fill('_'); //Stampa 132 - (sep(132))
set_header (6, (const char *) sep);
set_header (7,"%s@19g%s@117g%s@126g%s@132g%s",
set_header (7, (const char *) sep);
set_header (8,"%s@19g%s@117g%s@126g%s@132g%s",
TR("Operazione"), TR("Documento"), TR("Contro"), TR("Nr"), TR("A"));
if (_stampa_mov_prov)
set_header(7,"@130gM");
set_header (8, TR("Data"));
set_header(8,"@130gM");
set_header (9, TR("Data"));
if (_stampanum < 3)
set_header (8,"@11g%s", TR("Numero"));
set_header (8,"@19g%s@30g%s@38g%s@61g%s@95g%s@111g%s@117g%s@126g%s@132g%s",
set_header (9,"@11g%s", TR("Numero"));
set_header (9,"@19g%s@30g%s@38g%s@61g%s@95g%s@111g%s@117g%s@126g%s@132g%s",
TR("Data"), TR("Numero"), TR("Cod.Causale"), TR("Descrizione"),
TR("Dare"), TR("Avere"), TR("Partita"), TR("Pro"), TR("C"));
if (_stampa_mov_prov)
set_header(8,"@130g%s", TR("P"));
set_header(9,"@130g%s", TR("P"));
sep.fill('_');
set_header (9, (const char *) sep);
set_header (10, (const char *) sep);
}
else
{
sep1.fill('_'); //Stampa 198 - (sep1(198))
set_header (6,"@0g%s", (const char*)sep1);
set_header (7,"@0g%s", (const char*)sep1);
if (_stampa_saldo_des == 3)
{
set_header (7,"%s@23g%s@183g%s@190g%s@197g%s",
set_header (8,"%s@23g%s@183g%s@190g%s@197g%s",
TR("Operazione"), TR("Documento"),
TR("Reg"), TR("Nr"), TR("A"));
}
else
{
set_header (7,"%s@23g%s@169g%s@183g%s@190g%s@197g%s",
set_header (8,"%s@23g%s@169g%s@183g%s@190g%s@197g%s",
TR("Operazione"), TR("Documento"), TR("Contro"),
TR("Reg"), TR("Nr"), TR("A"));
}
if (_stampa_mov_prov)
set_header(7,"@195g%s", TR("M"));
set_header (8,TR("Data"));
set_header(8,"@195g%s", TR("M"));
set_header (9,TR("Data"));
if (_stampanum < 3)
set_header (8,"@11g%s", TR("Numero"));
set_header (9,"@11g%s", TR("Numero"));
switch (_stampa_saldo_des)
{
case 1:
set_header (8,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@152g%s@169g%s@183g%s@189g%s@197g%s",
set_header (9,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@152g%s@169g%s@183g%s@189g%s@197g%s",
TR("Data"), TR("Numero"), TR("Cod.Causale"), TR("Descrizione"), TR("Dare"), TR("Avere"),
TR("Saldo progre."), TR("Saldo movim."), TR("Partita"), TR("Iva"), TR("Prot"), TR("C"));
break;
case 2:
set_header (8,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@152g%s@169g%s@183g%s@189g%s@197g%s",
set_header (9,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@152g%s@169g%s@183g%s@189g%s@197g%s",
TR("Data"), TR("Numero"), TR("Cod.Causale"), TR("Descrizione"), TR("Dare"), TR("Avere"),
TR("Saldo scalare"), TR("Saldo movim."), TR("Partita"), TR("Iva"), TR("Prot"), TR("C"));
break;
case 3:
set_header (8,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@183g%s@189g%s@197g%s",
set_header (9,"@23g%s@34g%s@42g%s@70g%s@112g%s@127g%s@135g%s@183g%s@189g%s@197g%s",
TR("Data"), TR("Numero"), TR("Cod.Causale"), TR("Descrizione"), TR("Dare"), TR("Avere"),
TR("Contropartita"), TR("Iva"), TR("Prot"), TR("C"));
break;
@ -2674,9 +2674,9 @@ void TMastrini_application::crea_intestazione()
}
if (_stampa_mov_prov)
set_header(8,"@195g%s", TR("P"));
set_header(9,"@195g%s", TR("P"));
sep1.fill('_');
set_header (9,"@0g%s", (const char*)sep1);
set_header (10,"@0g%s", (const char*)sep1);
}
calcola_progressivi();
@ -2686,16 +2686,16 @@ void TMastrini_application::crea_intestazione()
{
if (_numcarat == 1)
{
set_header (10,"@42g%s@66g%s", TR("PROGRESSIVI PRECEDENTI"), real2str(_saldo_progre_prec));
set_header (10,"@83g%s", real2str(_progredare));
set_header (10,"@100g%s", real2str(_progreavere));
set_header (11,"@42g%s@66g%s", TR("PROGRESSIVI PRECEDENTI"), real2str(_saldo_progre_prec));
set_header (11,"@83g%s", real2str(_progredare));
set_header (11,"@100g%s", real2str(_progreavere));
}
else
{
set_header (10,"@70g%s@100g%s", TR("PROGRESSIVI PRECEDENTI"), real2str(_progredare));
set_header (10,"@117g%s", real2str(_progreavere));
set_header (11,"@70g%s@100g%s", TR("PROGRESSIVI PRECEDENTI"), real2str(_progredare));
set_header (11,"@117g%s", real2str(_progreavere));
if (_stampa_saldo_des < 3)
set_header (10,"@135g%s", real2str(_saldo_progre_prec));
set_header (11,"@135g%s", real2str(_saldo_progre_prec));
}
_riporto_dare = _progredare;
_riporto_avere = _progreavere;
@ -2716,13 +2716,13 @@ void TMastrini_application::crea_intestazione()
{
if (_numcarat == 1)
{
set_header (10,"@32g%s@83g%s", TR("A RIPORTO"), real2str(dep_dare));
set_header (10,"@100g%s", real2str(dep_avere));
set_header (11,"@32g%s@83g%s", TR("A RIPORTO"), real2str(dep_dare));
set_header (11,"@100g%s", real2str(dep_avere));
}
else
{
set_header (10,"@32g%s@100g%s", TR("A RIPORTO"), real2str(dep_dare));
set_header (10,"@117g%s", real2str(dep_avere));
set_header (11,"@32g%s@100g%s", TR("A RIPORTO"), real2str(dep_dare));
set_header (11,"@117g%s", real2str(dep_avere));
}
}
_riporto_parziale_dare = ZERO;
@ -2732,12 +2732,12 @@ void TMastrini_application::crea_intestazione()
if (_numcarat == 1)
{
sep ="";
set_header(11,"@0g%s",(const char*) sep);
set_header(12,"@0g%s",(const char*) sep);
}
else
{
sep1 ="";
set_header(11,"@0g%s",(const char*) sep1);
set_header(12,"@0g%s",(const char*) sep1);
}
if (_pagina != np && _nummast == 3)
@ -3178,28 +3178,32 @@ int TMastrini_application::stampa_progressivi(int start_riga)
void TMastrini_application::ricerca_clifo()
{
TString ragsoc,indcf,capcf,ptel,tel,dencom,dep;
TString dencom,dep;
TString4 provcom;
TString16 dataini,datafine,paiv,cofi;
TString16 dataini, datafine;
TString descriz,descriz2;
int numrivd;
TString16 key;
key.format("%c|%ld", _tmcf, _sottoc);
key.format("%c|%ld", _tmcf, _sottoc);
const TRectype & clifo = cache().get(LF_CLIFO, key);
ragsoc = clifo.get(CLI_RAGSOC); ragsoc.strip_double_spaces();
paiv = clifo.get(CLI_PAIV);
cofi = clifo.get(CLI_COFI);
indcf = clifo.get(CLI_INDCF);
TString ragsoc = clifo.get(CLI_RAGSOC); ragsoc.strip_double_spaces();
const TString4 statopaiv = clifo.get(CLI_STATOPAIV);
const TString paiv = clifo.get(CLI_PAIV);
const TString cofi = clifo.get(CLI_COFI);
TString indcf = clifo.get(CLI_INDCF);
indcf.trim();
indcf << ' ' << clifo.get(CLI_CIVCF);
capcf = clifo.get(CLI_CAPCF);
ptel = clifo.get(CLI_PTEL);
tel = clifo.get(CLI_TEL);
const TString capcf = clifo.get(CLI_CAPCF);
const TString ptel = clifo.get(CLI_PTEL);
const TString tel = clifo.get(CLI_TEL);
const TString4 statocf = clifo.get(CLI_STATOCF);
const TString4 comcf = clifo.get(CLI_COMCF);
key.format("%s|%s", (const char *) statocf, (const char *) comcf);
const TRectype & comuni = cache().get(LF_COMUNI, key);
if (!comuni.empty())
@ -3285,14 +3289,14 @@ void TMastrini_application::ricerca_clifo()
}
}
set_header (5, FR("@33gP.I.@37g%-11s"),(const char*) paiv);
set_header (5, FR("@49gCF@52g%-16s"),(const char*) cofi);
set_header (5, FR("@33gP.I.@37g%-2s@40g%-12s"), (const char*)statopaiv, (const char*)paiv);
set_header (5, "@66g%-.25s",(const char*) indcf);
set_header (5, "@95g%-5s",(const char*) capcf);
set_header (5, "@101g%-.24s",(const char*) dencom);
set_header (5, "@126g%-5s",(const char*) provcom);
if (_numcarat == 2)
set_header(6, FR("@33gCF@37g%-28s"), (const char*)cofi);
if (_numcarat == 2)
{
set_header (5,"@135g%-4s",(const char*) ptel);
if (tel != "")

2
src/cg/cg3600a.uml
View File

@ -216,7 +216,7 @@ BEGIN
GROUP 3 4
END
STRING F_COFICLI 16
STRING F_COFICLI 28 16
BEGIN
PROMPT 2 9 "Codice Fiscale "
USE LF_CLIFO KEY 4