From 6aa5e5509b95242dc2a5cd7076e67cbb95c7147f Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 9 Feb 2010 09:59:24 +0000 Subject: [PATCH] Patch level : 10.0 606 Files correlati : cg2.exe Ricompilazione Demo : [ ] Commento : Aggiunti i campi soloiva e codiva al protocol in per poter importare anche movimenti di sola iva con una sola aliquota (vedi Diana2000) git-svn-id: svn://10.65.10.50/trunk@20080 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg2100.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp index 1e90b1f2d..ece3a97ad 100755 --- a/cg/cg2100.cpp +++ b/cg/cg2100.cpp @@ -1674,13 +1674,6 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query) if (val.blank()) val = TDate(TODAY).string(); msk.set(F_DATAREG, val); - if (msk.id2pos(F_SOLAIVA) >= 0) - { - val = ini.get("SOLAIVA"); - msk.set(F_SOLAIVA, val); - val = ini.get("CODIVA"); - msk.set(F_CODIVA, val); - } } else { @@ -1688,6 +1681,16 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query) if (iva() != nessuna_iva) { + if (msk.id2pos(F_SOLAIVA) >= 0) + { + const TString16 val = ini.get("SOLAIVA"); + msk.set(F_SOLAIVA, val); + } + if (msk.id2pos(F_CODIVA) >= 0) + { + const TString16 val = ini.get("CODIVA"); + msk.set(F_CODIVA, val); + } add_cgs_tot(msk); TSheet_field& is = ivas();