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

Patch level : 4.0 boh patch

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            : Corretto trasferimento a PMC (_caus non esiste se cespite)


git-svn-id: svn://10.65.10.50/trunk@14123 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
cris 2006-06-26 14:58:21 +00:00
parent 26ddddc702
commit 1a0ca41a6f
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
crpa/crpa0.cpp
View File

@ -120,13 +120,14 @@ bool TIni2Sql::test_swap_conto(const int gr, const int co, const char sezione) c
bool TIni2Sql::test_swap() const
{
bool s = false;
if (_caus != NULL && *_caus->codice() > ' ') // esiste la causale
{
const char sez = _caus->sezione_clifo();
const TipoIVA iva = _caus->iva();
const bool vendite = iva == nessuna_iva ? _doc->tipocf() == 'C' : iva == iva_vendite;
s = vendite ^ (sez == 'D');
}
if (_caus != NULL)
if (*_caus->codice() > ' ') // esiste la causale
{
const char sez = _caus->sezione_clifo();
const TipoIVA iva = _caus->iva();
const bool vendite = iva == nessuna_iva ? _doc->tipocf() == 'C' : iva == iva_vendite;
s = vendite ^ (sez == 'D');
}
return s;
}
@ -832,19 +833,25 @@ bool TIni2Sql::search_conto_cespite(TBill& conto, const TRiga_documento& r)
int esc = esercizi.date2esc(r.doc().get_date(DOC_DATADOC));
TString16 str;
str.format("%04d", esc);
const TRectype& curr_ccb = cache().get("CCB", str);
TString80 codtab = curr_ccb.get("CODTAB");
const char* codgruppo = codtab.sub(5,6);
const char* codspecie = codtab.sub(7,10);
TToken_string key;
key.add(codgruppo);
key.add(codspecie);
key.add(codcat);
const TRectype& collces = cache().get(LF_COLLCES, key);
gr = collces.get_int(COLLCES_GRUPPOQNO);
co = collces.get_int(COLLCES_CONTOQNO);
so = collces.get_int(COLLCES_SOTTOCQNO);
conto.set(gr,co,so);
TTable tabccb("CCB");
tabccb.put("CODTAB", str);
tabccb.read();
TString80 codtab = tabccb.get("CODTAB");
if (codtab.sub(0,4) == str)
{
int codgruppo = atoi(codtab.sub(5,6));
const char* codspecie = codtab.sub(7,10);
TLocalisamfile collces(LF_COLLCES);
collces.zero();
collces.put(COLLCES_CODGRUPPO, codgruppo);
collces.put(COLLCES_CODSPECIE, codspecie);
collces.put(COLLCES_CODCAT, codcat);
collces.read();
gr = collces.get_int(COLLCES_GRUPPOQNO);
co = collces.get_int(COLLCES_CONTOQNO);
so = collces.get_int(COLLCES_SOTTOCQNO);
conto.set(gr,co,so);
}
return (conto.ok());
}
@ -913,6 +920,8 @@ void TIni2Sql::write_sqlinsert()
const int nriga = build_nriga(*paragrafo);
if (nriga <= _doc->rows())
{
if (_caus != NULL)
_caus = NULL;
_rigadoc = new TRiga_documento((*_doc)[nriga]);
if (is_cespite)
ok = search_conto_cespite(_conto, (*_rigadoc));