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 
# Conflicts:
#	src/fp/fplib.h
#	src/fp/fplib01.cpp
This commit is contained in:
Mattia Tollari 2019-03-11 11:15:58 +01:00
commit e510134fe7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fp/fplib.h
View File

@ -135,6 +135,7 @@ private:
int _num_linea;
int _counter;
TPaf_container _paf_container;
int _count_r_conai;
// Classe interna per gestire righe aggiuntive in riepilogo
class TRiepilogo_agg
@ -186,8 +187,8 @@ protected:
const TRectype& cco(const TRectype& doc) const; // Contratto/Convenzione/Offerta
void log(int severity, const char* msg);
const char* natura(const TString& codiva) const;
const char* get_esigibilita_iva(const TDocumentoEsteso& doc);
static const char* natura(const TString& codiva);
static const char* get_esigibilita_iva(const TDocumentoEsteso& doc);
void set_IVA(TString codiva, TPaf_record& paf) const;
void set_IVA(const TRiga_documento& rdoc, TPaf_record& paf) const;
bool add_row_art(long& riga_art, const TString& codice_tipo, const TString& codice_valore, TPaf_record& paf);

8
src/fp/fplib01.cpp
View File

@ -1087,7 +1087,7 @@ const int TDoc_fp::force_commit()
return commit();
}
const char* TDoc_fp::natura(const TString& codiva) const
const char* TDoc_fp::natura(const TString& codiva)
{
return cache().get("%IVA", codiva, "S12");
}
@ -1370,6 +1370,7 @@ bool TDoc_fp::export_paf3200f()
return true;
}
bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
{
if (!initialize(doc))
@ -1623,6 +1624,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
if (check_row(*rdoc) && !fp_settings().get_check_not_block())
return false;
_idx_adg_doc_row = 1L;
bool skip_riga = false;
@ -1633,12 +1635,14 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
if (descrizione_riga.empty())
continue;
reset(paf3000f);
paf3000f.set("PT_RIFNUMLINEA", riga);
paf3000f.set("PT_COMMENTO", descrizione_riga);
// <CodiceArticolo>
if (rdoc->is_articolo())
{
const TString& codartmag = rdoc->get(RDOC_CODARTMAG);
const TString& codart = rdoc->get(RDOC_CODART);
long riga_art = 0;
@ -1646,6 +1650,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
{
if (codartmag.full())
{
reset(paf1900f);
paf1900f.set("PY_KEYNLINEA", riga);
ok &= add_row_art(riga_art, "Codice articolo interno", codartmag, paf1900f);
@ -1653,6 +1658,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
// Se il codice articolo del magazzino è diverso quello è del cliente
if (codart.full() && codart != codartmag)
{
reset(paf1900f);
paf1900f.set("PY_KEYNLINEA", riga);
ok &= add_row_art(riga_art, "Codice articolo cliente", codart, paf1900f);