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

Patch level : 12.0 894

Browse Source 
Files correlati     : lv2.exe
Commento           to :

aggiornati i dati di testat dei clienti nelle varie bolle di consegne ritiro pui
ito buoni etc

IN fatturazione se indicato in configurazione
This commit is contained in:
Alessandro Bonazzi 2019-10-25 14:33:41 +02:00
parent e103d28ecc
commit d9168a7ffb
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/ve/clifor.cpp
View File

@ -233,16 +233,16 @@ void TCli_for::cli2doc(TDocumento& doc)
{ {
doc.put(DOC_CODABIA, get(CLI_CODABI)); doc.put(DOC_CODABIA, get(CLI_CODABI));
doc.put(DOC_CODCABA, get(CLI_CODCAB)); doc.put(DOC_CODCABA, get(CLI_CODCAB));
doc.put(DOC_IBAN, get(CLI_IBAN)); doc.put(DOC_IBAN, get(CLI_IBAN));
} }
else else
{ {
doc.put(DOC_CODABIA, cfban.get(CFBAN_ABI)); doc.put(DOC_CODABIA, cfban.get(CFBAN_ABI));
doc.put(DOC_CODCABA, cfban.get(CFBAN_CAB)); doc.put(DOC_CODCABA, cfban.get(CFBAN_CAB));
doc.put(DOC_IBAN, cfban.get(CFBAN_IBAN)); doc.put(DOC_IBAN, cfban.get(CFBAN_IBAN));
} }
// Trasforma chiave da Vostra a Nostra banca // Trasforma chiave da Vostra a Nostra banca
key.add("N", 2); key.add("N", 2);
const TRectype& cfbanpr = cache().get(LF_CFBAN, key); const TRectype& cfbanpr = cache().get(LF_CFBAN, key);
@ -258,41 +258,42 @@ void TCli_for::cli2doc(TDocumento& doc)
doc.put(DOC_CODCABP, cfbanpr.get(CFBAN_CAB)); doc.put(DOC_CODCABP, cfbanpr.get(CFBAN_CAB));
doc.put(DOC_PROGBNP, cfbanpr.get(CFBAN_PROGPR)); doc.put(DOC_PROGBNP, cfbanpr.get(CFBAN_PROGPR));
} }
doc.put(DOC_RAGGR, v.get(CFV_RAGGDOC)); doc.put(DOC_RAGGR, v.get(CFV_RAGGDOC));
doc.put(DOC_RAGGREFF, v.get(CFV_RAGGEFF)); doc.put(DOC_RAGGREFF, v.get(CFV_RAGGEFF));
doc.put(DOC_CODINDSP, v.get(CFV_CODINDSP)); doc.put(DOC_CODINDSP, v.get(CFV_CODINDSP));
doc.put(DOC_CODAG, v.get(CFV_CODAG)); doc.put(DOC_CODAG, v.get(CFV_CODAG));
doc.put(DOC_CODAGVIS, v.get(CFV_CODAG1)); doc.put(DOC_CODAGVIS, v.get(CFV_CODAG1));
doc.put(DOC_CODSPMEZZO, v.get(CFV_CODSPMEZZO)); doc.put(DOC_CODSPMEZZO, v.get(CFV_CODSPMEZZO));
doc.put(DOC_CODPORTO, v.get(CFV_CODPORTO)); doc.put(DOC_CODPORTO, v.get(CFV_CODPORTO));
doc.put(DOC_CODNOTESP1, v.get(CFV_CODNOTESP1)); doc.put(DOC_CODNOTESP1, v.get(CFV_CODNOTESP1));
doc.put(DOC_CODNOTESP2, v.get(CFV_CODNOTESP2)); doc.put(DOC_CODNOTESP2, v.get(CFV_CODNOTESP2));
doc.put(DOC_CODNOTE, v.get(CFV_CODNOTE)); doc.put(DOC_CODNOTE, v.get(CFV_CODNOTE));
doc.put(DOC_CODVETT1, v.get(CFV_CODVETT1)); doc.put(DOC_CODVETT1, v.get(CFV_CODVETT1));
doc.put(DOC_CODVETT2, v.get(CFV_CODVETT2)); doc.put(DOC_CODVETT2, v.get(CFV_CODVETT2));
doc.put(DOC_CODVETT3, v.get(CFV_CODVETT3)); doc.put(DOC_CODVETT3, v.get(CFV_CODVETT3));
doc.put(DOC_PERCSPINC, v.get(CFV_PERCSPINC)); doc.put(DOC_PERCSPINC, v.get(CFV_PERCSPINC));
doc.put(DOC_ADDBOLLI, v.get(CFV_ADDBOLLI)); doc.put(DOC_ADDBOLLI, v.get(CFV_ADDBOLLI));
doc.put(DOC_CATVEN, v.get(CFV_CATVEN)); doc.put(DOC_CATVEN, v.get(CFV_CATVEN));
const int alleg = get_int(CLI_ALLEG); const int alleg = get_int(CLI_ALLEG);
const bool split_payment = doc.get_date(DOC_DATADOC).year() >= 2015 && get_bool(CLI_SPLITPAY); const bool split_payment = doc.get_date(DOC_DATADOC).year() >= 2015 && get_bool(CLI_SPLITPAY);
doc.put(DOC_LIQDIFF, !split_payment && alleg == 7 && ini_get_bool(CONFIG_DITTA, "cg", "GesLiqDiff") ? "X" : ""); doc.put(DOC_LIQDIFF, !split_payment && alleg == 7 && ini_get_bool(CONFIG_DITTA, "cg", "GesLiqDiff") ? "X" : "");
//listino: deve essere attiva la gestione listini nella ditta //listino: deve essere attiva la gestione listini nella ditta
const bool gest_listini = ini_get_bool(CONFIG_DITTA, "ve", "GES", false, 1); const bool gest_listini = ini_get_bool(CONFIG_DITTA, "ve", "GES", false, 1);
if (gest_listini) if (gest_listini)
{ {
const TDate datadoc = doc.get_date(DOC_DATADOC); const TDate datadoc = doc.get_date(DOC_DATADOC);
const TString& listino = find_listino_al(datadoc); const TString& listino = find_listino_al(datadoc);
doc.put(DOC_CODLIST, listino); doc.put(DOC_CODLIST, listino);
} }
doc.put(DOC_ZONA, v.get(CFV_CODZONA)); doc.put(DOC_ZONA, v.get(CFV_CODZONA));
doc.put(DOC_RAGGR, v.get(CFV_RAGGDOC)); doc.put(DOC_RAGGR, v.get(CFV_RAGGDOC));
//aggiungere gestione spese e bolli??? //aggiungere gestione spese e bolli???
doc.put(DOC_CODPORTO, v.get(CFV_CODPORTO));
} }
const TString& TCli_for::get_iban() const TString& TCli_for::get_iban()