From 78632e9fcc8f912de003e878081d699f8349ff98 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 5 Feb 2010 17:48:05 +0000 Subject: [PATCH] Patch level : 10.0 606 Files correlati : tc1.exe Ricompilazione Demo : [ ] Commento : Invio a Zucchetti git-svn-id: svn://10.65.10.50/trunk@20063 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- tc/tc1100.cpp | 15 +++++++++++++++ tc/tc1100a.ini | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tc/tc1100.cpp b/tc/tc1100.cpp index 52583f957..765bdc841 100755 --- a/tc/tc1100.cpp +++ b/tc/tc1100.cpp @@ -500,6 +500,7 @@ void TInvio_file::validate(TCursor& cur,TRecord_text &rec, TToken_string &s, TSt const TRectype & mov = cur.curr(LF_MOV); TToken_string key(mov.get(MOV_TIPO)); const int fldcod = atoi(s.get()); + const int fldcodcf = atoi(s.get()); key.add(mov.get_long(MOV_CODCF)); const TRectype & clifo = cache().get(LF_CLIFO, key); @@ -508,6 +509,20 @@ void TInvio_file::validate(TCursor& cur,TRecord_text &rec, TToken_string &s, TSt if (valore.blank()) valore = clifo.get(CLI_PAIV); add_field(rec, fldcod, valore.len() == 16 ? "F" : (valore.len() == 0 ? "" : "P")); + if (!clifo.empty()) + { + key.cut(0); + key.add(mov.get(MOV_NUMREG)); + key.add(1); + const TRectype & rmov = cache().get(LF_RMOV,key); + const char t = rmov.get_char(RMV_TIPOC); + const int gr = rmov.get_int(RMV_GRUPPO); + const int co = rmov.get_int(RMV_CONTO); + const long so = rmov.get_long(RMV_SOTTOCONTO); + + const TString codcf = bill2ricl(t, gr, co, so); + add_field(rec, fldcodcf, codcf); + } } else NFCHECK("Macro non definita: %s", (const char *)code); str = valore; diff --git a/tc/tc1100a.ini b/tc/tc1100a.ini index 73bd9b9d3..5708512d8 100755 --- a/tc/tc1100a.ini +++ b/tc/tc1100a.ini @@ -551,7 +551,7 @@ NAME(23) = CODICE CODIFICA PARTITA IVA TYPE(23) = STRINGA POSITION(23) = 95 LENGTH(23) = 16 -MESSAGE(23) = _CFPIT,22 +MESSAGE(23) = _CFPIT,22,21 NAME(24) = DESCRIZIONE ALTERNATIVA TYPE(24) = STRINGA