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

Patch level : nopatch

Browse Source 
Files correlati     :
Commento        :

Implementazione nuovo modulo FP
This commit is contained in:
smen 2021-12-01 17:56:13 +01:00
parent 3748ead37d
commit de5d736e92
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fp/fp1100.cpp
View File

@ -118,7 +118,7 @@ void TBolliinfatt_mask::fill()
const TTipo_documento& td = cached_tipodoc(doc.get(DOC_TIPODOC));
bool sent = false;
if (chiave_paf(doc, hfatt, bfatt))
if (chiave_paf_doc(doc, hfatt, bfatt))
{
TString qry_paf7 = "SELECT PAF0700F.P7_IMPORTOBOLLO, PAF0100F.P1_GESTIONE FROM PAF0700F JOIN PAF0100F ON P7_KEYPRGINVIO = P1_KEYPRGINVIO AND P7_KEYHEADERFATT = P1_KEYHEADERFATT AND P7_KEYBODYFATT = P1_KEYBODYFATT WHERE P7_KEYHEADERFATT = '";
qry_paf7 << hfatt << "' AND P7_KEYBODYFATT = '" << bfatt << "' AND P7_IMPORTOBOLLO > 0";

2
src/fp/fp1200.cpp
View File

@ -187,7 +187,7 @@ void TMancati_mask::fill()
if(!check_doc_filter(doc))
continue;
if (!chiave_paf(doc, hfatt, bfatt) || !paf0100f.search(nullptr, hfatt, bfatt) || paf0100f.sq_get("P1_GESTIONE") != "N")
if (!chiave_paf_doc(doc, hfatt, bfatt) || !paf0100f.search(nullptr, hfatt, bfatt) || paf0100f.sq_get("P1_GESTIONE") != "N")
{
continue;
}

36
src/fp/fplib01.cpp
View File

@ -709,9 +709,17 @@ bool TFPBuono_di_consegna::already_exist(map<TString20, TDate>& ancestors_s) con
}
return false;
}
/***************************************************************************
* TDoc_fp
***************************************************************************/
/*
/$$$$$$$$ /$$$$$$$
|__ $$__/| $$__ $$
| $$ | $$ \ $$ /$$$$$$ /$$$$$$$
| $$ | $$ | $$ /$$__ $$ /$$_____/
| $$ | $$ | $$| $$ \ $$| $$
| $$ | $$ | $$| $$ | $$| $$
| $$ | $$$$$$$/| $$$$$$/| $$$$$$$
|__/ |_______/ \______/ \_______/
*/
bool TDoc_fp::parse_sconto(const TString& formula, TToken_string& sconti) const
{
sconti.cut(0);
@ -2609,9 +2617,19 @@ TDoc_fp::~TDoc_fp()
delete _doc_rec;
}
/***************************************************************************
* TReg_fp
***************************************************************************/
/*
/$$$$$$$$ /$$$$$$$
|__ $$__/| $$__ $$
| $$ | $$ \ $$ /$$$$$$ /$$$$$$
| $$ | $$$$$$$/ /$$__ $$ /$$__ $$
| $$ | $$__ $$| $$$$$$$$| $$ \ $$
| $$ | $$ \ $$| $$_____/| $$ | $$
| $$ | $$ | $$| $$$$$$$| $$$$$$$
|__/ |__/ |__/ \_______/ \____ $$
/$$ \ $$
| $$$$$$/
\______/
*/
bool TReg_fp::insert(TPaf_record& p)
{
@ -2947,8 +2965,10 @@ bool TReg_fp::reg_to_paf(const TMovimento_contabile& mov)
ok &= export_paf0100f();
ok &= export_paf3200f();
// <CedentePrestatore>
TPaf_record& paf0200f = _paf_container.get_paf("PAF0200F");
TAnagrafica fornitore(mov.clifo());
const TAnagrafica & fornitore = mov.clifo().anagrafica();
if (!paf0200f.is_full())
{
if (fornitore.partita_IVA().full())
@ -2966,6 +2986,8 @@ bool TReg_fp::reg_to_paf(const TMovimento_contabile& mov)
{
paf0200f.set("P2_ANADENOMIN", fornitore.ragione_sociale()); //
}
paf0200f.set("P2_ANACODEORI", fornitore.cod_EORI());
paf0200f.set("P2_REGFISCALE", ""); //TODO DA RF01 A RF09
// DatiSede
paf0200f.set("P2_SEDEIND", fornitore.via_residenza()); //