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

Patch level : 12.0 550

Browse Source 
Files correlati     : bs
Commento            : 

C/F:
- Per i c/f adesso metto la banca in ultima riga
- Aggiunta traduzione cod ass fisc

Doc:
- Aggiunto codart "B1" per i bancali

git-svn-id: svn://10.65.10.50/branches/R_10_00@24445 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2018-03-27 13:41:55 +00:00
parent c67fb8be96
commit db9335219c
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/bs/bs0300.cpp
View File

@ -906,11 +906,28 @@ void TSknet_sync::load_clifo(const char tipocf)
cfv.put(CFV_RAGGDOC, !odbc.get("RaggDoc").as_string().blank()); cfv.put(CFV_RAGGDOC, !odbc.get("RaggDoc").as_string().blank());
int riga = 1;
// Cerco l'ultima riga
{
TLocalisamfile app(LF_CFBAN);
TRectype rapp(LF_CFBAN);
rapp.put("TIPOCF", tipocf);
rapp.put("CODCF", codcf);
rapp.put("", "V");
if (rapp.read(app, _isgteq) == NOERR)
{
while (rapp.get("TIPOCF") == tipocf && rapp.get("CODCF") == codcf && rapp.get("TIPOBAN") == "V")
{
riga++;
rapp.next(app);
}
}
}
TLocalisamfile cfb(LF_CFBAN); TLocalisamfile cfb(LF_CFBAN);
cfb.put("TIPOCF", tipocf); cfb.put("TIPOCF", tipocf);
cfb.put("CODCF", codcf); cfb.put("CODCF", codcf);
cfb.put("TIPOBAN", "V"); cfb.put("TIPOBAN", "V");
cfb.put("NRIGA", 1); cfb.put("NRIGA", riga);
TString cin, abi, cab, contcor, iban; TString cin, abi, cab, contcor, iban;
if (tipocf == 'C') if (tipocf == 'C')
{ {
@ -1052,7 +1069,7 @@ void TSknet_sync::load_clifo(const char tipocf)
else else
if (token.starts_with("ASSFIS=")) if (token.starts_with("ASSFIS="))
{ {
cfv.put(CFV_ASSFIS, token.mid(7)); cfv.put(CFV_ASSFIS, cache().get("%SKI", token.mid(7), "S6"));
} }
else else
{ {
@ -1396,6 +1413,7 @@ void TSknet_sync::sync_doc()
} }
const TString80 codart = docs.get("CodArticolo").as_string(); const TString80 codart = docs.get("CodArticolo").as_string();
const TString descr = docs.get("DSRiga").as_string();
if (tiporiga == "01" && ini_get_bool(CONFIG_DITTA, "BS", "SKUseCustomRiga", false)) if (tiporiga == "01" && ini_get_bool(CONFIG_DITTA, "BS", "SKUseCustomRiga", false))
{ {
@ -1408,7 +1426,10 @@ void TSknet_sync::sync_doc()
TRectype& rdoc = doc->new_row(tiporiga); TRectype& rdoc = doc->new_row(tiporiga);
rdoc.put(RDOC_CODART, codart); if(codart.blank() && tiporiga == "02" && descr.starts_with("Bancal"))
rdoc.put(RDOC_CODART, "B1");
else
rdoc.put(RDOC_CODART, codart);
if (tipoart == 2) if (tipoart == 2)
{ {
@ -1424,8 +1445,6 @@ void TSknet_sync::sync_doc()
rdoc.put(RDOC_CODARTMAG, codart); rdoc.put(RDOC_CODARTMAG, codart);
// rdoc.check_row(); // rdoc.check_row();
const TString descr = docs.get("DSRiga").as_string();
rdoc.put(RDOC_DESCR, descr.sleft(50)); rdoc.put(RDOC_DESCR, descr.sleft(50));
if (descr.len() > 50) if (descr.len() > 50)
{ {