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:
Mattia Tollari 2019-03-06 15:56:08 +01:00
commit d273645f03
6 changed files with 90 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cd/test/fp0722.txt Normal file
View File

@ -0,0 +1,3 @@
fp0.exe
Corretta lettura codice IVA incasso

19
cd/test/fp0722a.ini Normal file
View File

@ -0,0 +1,19 @@
[Main]
Demo=0
[fp1]
File(0) = fp0.exe|X
Patch = 0722
Versione = 21511200
[fp]
Data = 06-03-2019
Descrizione = Fattura Elettronica
Dischi = 1
Moduli = cg,ve
OEM =
Patch = 722
PostProcess =
PreProcess =
Versione = 21511200

BIN
cd/test/fp0722a1.zip Normal file
View File

Binary file not shown.

107
src/fp/fp0400.cpp
View File

@ -159,65 +159,70 @@ void TPassive_mask::elenco_prots_sel(TString& string) const
void TPassive_mask::aggiungi_riga(TLocalisamfile& clifo, TSheet_field& sf, TSheet_field& sf_err)
{
int forn_code = -1;
TString denom = fp_db().sq_get("RAG_SOC");
int forn_code = -1;
TString denom = fp_db().sq_get("RAG_SOC");
const TString paa_codfisc = fp_db().sq_get("COD_FISC");
const TString paa_piva = fp_db().sq_get("P_IVA");
const TString paa_codpaese = fp_db().sq_get("COD_PAESE");
const TString paa_codsdi = fp_db().sq_get("COD_SDI");
TString prot = fp_db().sq_get("TIPO_PROT");
TString prot = fp_db().sq_get("TIPO_PROT");
TString filter_elab = get(F_FATTSEL);
TToken_string& row = sf.row(-1);
clifo.zero();
clifo.put(CLI_TIPOCF, 'F');
if (denom.blank()) {
denom = fp_db().sq_get("NOME");
denom << " " << fp_db().sq_get("COGNOME");
}
denom.cut(50);
row.add(fp_db().sq_get_int("ANNO"), 1);
row.add(fp_db().sq_get("TIPO_SDI"));
row.add(fp_db().sq_get("NUM_DOC"));
// Trasformo formato data da yyyy-mm-gg a italiano
TDate date_t(fp_db().sq_get_date("DATA_DOC"));
row.add(date_t);
row.add(fp_db().sq_get("TOT_DOC"));
// Dopo aver fatto le ricerche se lo trovo lo segno e lo aggiungo, se no coloro la cella
forn_code = find_fornitore(clifo);
TString forn_str; forn_str << forn_code;
TString nr_row; nr_row << sf.items();
_forn_code.add(forn_str);
_list_fatt_err.add(nr_row);
if (forn_code == 0) row.add("X");
else row.add("");
if(forn_code >= 0)
if( filter_elab.blank() && forn_code != 0 || filter_elab == "E" && forn_code == 0 || filter_elab == "A")
{
row.add(clifo.get(CLI_CODCF));
row.add(clifo.get(CLI_RAGSOC));
}
else
{
//sf.set_back_and_fore_color(COLOR_RED, COLOR_WHITE, 2, sf.cid2index(S_FORNITORE));
//sf.set_back_and_fore_color(COLOR_RED, COLOR_WHITE, 2, sf.cid2index(S_RAGSOC));
add_row_err_forn(forn_code, sf_err, denom);
}
if (denom.blank()) {
denom = fp_db().sq_get("NOME");
denom << " " << fp_db().sq_get("COGNOME");
}
denom.cut(50);
row.add(paa_codpaese, sf.cid2index(S_STATOPAIV));
row.add(paa_piva);
row.add(paa_codfisc);
row.add(fp_db().sq_get_int("ANNO"), 1);
row.add(fp_db().sq_get("TIPO_SDI"));
row.add(fp_db().sq_get("NUM_DOC"));
// Trasformo formato data da yyyy-mm-gg a italiano
TDate date_t(fp_db().sq_get_date("DATA_DOC"));
row.add(date_t);
row.add(fp_db().sq_get("TOT_DOC"));
// Dopo aver fatto le ricerche se lo trovo lo segno e lo aggiungo, se no coloro la cella
TString forn_str; forn_str << forn_code;
TString nr_row; nr_row << sf.items();
_forn_code.add(forn_str);
_list_fatt_err.add(nr_row);
if (forn_code == 0) row.add("X");
else row.add("");
if (forn_code >= 0)
{
row.add(clifo.get(CLI_CODCF));
row.add(clifo.get(CLI_RAGSOC));
}
else
{
//sf.set_back_and_fore_color(COLOR_RED, COLOR_WHITE, 2, sf.cid2index(S_FORNITORE));
//sf.set_back_and_fore_color(COLOR_RED, COLOR_WHITE, 2, sf.cid2index(S_RAGSOC));
add_row_err_forn(forn_code, sf_err, denom);
}
row.add(paa_codpaese, sf.cid2index(S_STATOPAIV));
row.add(paa_piva);
row.add(paa_codfisc);
row.add(fp_db().sq_get("ATTACHMENT") != "0" ? "" : "X");
row.add(paa_codsdi.blank() ? fp_db().sq_get("PEC") : paa_codsdi);
row.add(denom);
row.add(fp_db().sq_get("ANNO_PROT") << (prot.empty() ? "" : "-") << prot << "/" << fp_db().sq_get("NUM_PROT") << (prot.empty() ? " (no prot.)" : ""));
TString key_prot; key_prot << fp_db().sq_get("KEYPROG") << ";" << fp_db().sq_get("KEYHEAD") << ";" << fp_db().sq_get("KEYFATT");
row.add(key_prot);
}
row.add(fp_db().sq_get("ATTACHMENT") != "0" ? "" : "X");
row.add(paa_codsdi.blank() ? fp_db().sq_get("PEC") : paa_codsdi);
row.add(denom);
row.add(fp_db().sq_get("ANNO_PROT") << (prot.empty() ? "" : "-") << prot << "/" << fp_db().sq_get("NUM_PROT") << (prot.empty() ? " (no prot.)" : ""));
TString key_prot; key_prot << fp_db().sq_get("KEYPROG") << ";" << fp_db().sq_get("KEYHEAD") << ";" << fp_db().sq_get("KEYFATT");
row.add(key_prot);
}
void TPassive_mask::aggiungi_prot() const
@ -538,10 +543,14 @@ bool TPassive_mask::on_field_event(TOperable_field& o, TField_event e, long joll
aggiorna_forn();
break;
case F_DATAINI:
if (e == fe_init)
o.set(ini_get_string(CONFIG_DITTA, "fp", "LastXML", "01-01-2019"));
else if (e == fe_close)
ini_set_string(CONFIG_DITTA, "fp", "LastXML", o.get());
if (e == fe_init)
{
TDate inizio_mese = TDate(TODAY); inizio_mese.set_day(1);
o.set(inizio_mese);
//o.set(ini_get_string(CONFIG_DITTA, "fp", "LastXML", "01-01-2019"));
}
//else if (e == fe_close)
// ini_set_string(CONFIG_DITTA, "fp", "LastXML", o.get());
break;
case F_DATAEND:
if (e == fe_init)

1
src/fp/fp0400a.h
View File

@ -2,6 +2,7 @@
#define F_DATAINI 501
#define F_DATAEND 502
#define F_SAVEFOR 503
#define F_FATTSEL 504
#define END_MASK 599

9
src/fp/fp0400a.uml
View File

@ -48,6 +48,15 @@ BEGIN
CHECKTYPE REQUIRED
END
RADIOBUTTON F_FATTSEL 3 80
BEGIN
PROMPT 1 2 "Fatture da visualizzare"
ITEM "|Non elaborate"
ITEM "E|Elaborate"
ITEM "A|Tutte"
FLAGS "Z"
END
SPREADSHEET F_PROT 25 10
BEGIN
PROMPT 1 6 "Selezionare o aggiungere un filtro sul Tipo Progressivo"