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));