From e5be2eed6af53f329e63bfaa942aa72170df9184 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Sun, 24 Sep 2017 21:02:19 +0000 Subject: [PATCH] Patch level : 12.0 440 Files correlati : ca2.exe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corretta l'attivazione del campo articolo sulle righe se attivata la contabilità industriale git-svn-id: svn://10.65.10.50/branches/R_10_00@24103 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/ca/ca2100.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ca/ca2100.cpp b/src/ca/ca2100.cpp index c30746d6c..91db15116 100755 --- a/src/ca/ca2100.cpp +++ b/src/ca/ca2100.cpp @@ -203,17 +203,20 @@ TToken_string& TMovanal_msk::get_rip_row(const TRectype& rrip) rmov.put(RMOVANA_CODFASE, keyrip.get()); rmov.put(RMOVANA_CODCONTO, keyrip.get()); + + if (ci) + rmov.put(RMOVANA_CODART, keyrip.get()); + TToken_string& row = rec2row(rmov, -1); if (ci) { - rmov.put(RMOVANA_CODART, keyrip.get()); - TArticolo & art = cached_article(rmov.get(RMOVANA_CODART)); row.add(art.get(ANAMAG_DESCR), sheet.cid2index(S_DESCART)); } - return row; + + return row; } void TMovanal_msk::split_cg_row(const TRectype& row, const TAnal_ripartizioni_batch& rrip) @@ -414,7 +417,7 @@ void TMovanal_msk::load_cg_mov() set(F_DATACOMP, mov.get(MOV_DATACOMP)); set(F_DESCR, mov.get(MOV_DESCR)); } - set(F_CODCAUS, mov.get(MOV_CODCAUS), 0x2); + set(F_CODCAUS, mov.get(MOV_CODCAUS), 0x3); set(F_NUMDOC, mov.get(MOV_NUMDOC)); set(F_DATADOC, mov.get(MOV_DATADOC)); set(F_TIPODOC, mov.get(MOV_TIPODOC));