Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00

This commit is contained in:
Mattia Tollari 2019-01-25 11:48:46 +01:00
commit 890cfff6c4

View File

@ -1025,7 +1025,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
// DatiSede
paf0200f.set("P2_SEDEIND", _ditta.via_residenza());
paf0200f.set("P2_SEDENRCIVICO", _ditta.civico_residenza());
paf0200f.set("P2_SEDENRCIVICO", _ditta.civico_residenza().left(8));
paf0200f.set("P2_SEDECAP", _ditta.CAP_residenza());
paf0200f.set("P2_SEDECOMUNE", _ditta.comune_residenza());
paf0200f.set("P2_SEDEPROV", _ditta.provincia_residenza());
@ -1104,7 +1104,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
paf0400f.set("P4_SEDEIND", cliente.via_residenza());
paf0400f.set("P4_SEDENRCIVICO", cliente.civico_residenza());
paf0400f.set("P4_SEDENRCIVICO", cliente.civico_residenza().left(8));
paf0400f.set("P4_SEDECOMUNE", cliente.comune_residenza());
paf0400f.set("P4_SEDENAZ", cliente.stato_residenza_ISO());
@ -1904,7 +1904,10 @@ bool TDoc_fp::doc_to_paf(const TRectype& rec)
TDocumentoEsteso doc;
if (doc.read(rec) == NOERR)
{
return doc_to_paf(doc) ? fp_db().sq_commit() : fp_db().sq_rollback();
if (doc_to_paf(doc))
return fp_db().sq_commit();
fp_db().sq_rollback();
}
return false;
}