From 0c2c76d65a80a5cdd319a26ea12c818287613e91 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 13 Feb 2010 07:53:02 +0000 Subject: [PATCH] Patch level : 10.0 637 Files correlati : lv3.exe Ricompilazione Demo : [ ] Commento : Aggiornato calcolo conguaglio sui buoni di consegna. git-svn-id: svn://10.65.10.50/trunk@20112 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv3100.cpp | 50 +++++++++++++++++++++++++++++--------------------- lv/verig21.uml | 7 +++++++ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index cd6ad527f..8f74af96c 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -718,9 +718,9 @@ bool TGestione_bolle_msk::lv_codart_handler(TMask_field& f, KEY k) { const real congor = rcont.get_real(LVRCONDV_QTACONG); - const real congat = conat - ritat + congor; + const real congat = conat - conor - ritat + ritor + congor; - rdoc.put(RDOC_QTAGG5, congat); //conguaglio dopo modifica manuale + msk.set(FR_QTAGG5, congat); } } @@ -1191,29 +1191,37 @@ void TGestione_bolle_app::elimina_vuote( const TMask& m) void TGestione_bolle_app::salva_conguaglio( const TMask& m) { - TDocumento_mask& mask = (TDocumento_mask&) m; - TDocumento& d = mask.doc(); + if (ini_get_bool(CONFIG_DITTA, "lv", "Aggcong")) + { + TDocumento_mask& mask = (TDocumento_mask&) m; + TDocumento& d = mask.doc(); - TSheet_field& sheet = mask.sfield(F_SHEET); - const long codcf = mask.get_long(F_CODCF); - const int indsped = mask.get_int(F_CODINDSP); - TDate datadoc = mask.get_date(F_DATADOC); + TSheet_field& sheet = mask.sfield(F_SHEET); + const long codcf = mask.get_long(F_CODCF); + const int indsped = mask.get_int(F_CODINDSP); + TDate datadoc = mask.get_date(F_DATADOC); - const TLaundry_contract cont(codcf, indsped, datadoc); - const int codcont = cont.get_int(LVCONDV_CODCONT); + const TLaundry_contract cont(codcf, indsped, datadoc); + const int codcont = cont.get_int(LVCONDV_CODCONT); - TLocalisamfile rcondv(LF_LVRCONDV); + TLocalisamfile rcondv(LF_LVRCONDV); - FOR_EACH_DOC_ROW_BACK(d, r, row) - { - TRiga_documento& rdoc = (TRiga_documento&)*row; - rcondv.put(LVRCONDV_CODCF,codcf); - rcondv.put(LVRCONDV_CODCONT, codcont); - rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART)); - if (rcondv.read() == NOERR) - rcondv.put(LVRCONDV_QTACONG, rdoc.get_real(RDOC_QTAGG5)); - } - rcondv.rewrite(); + FOR_EACH_DOC_ROW_BACK(d, r, row) + { + TRiga_documento& rdoc = (TRiga_documento&)*row; + rcondv.put(LVRCONDV_CODCF,codcf); + rcondv.put(LVRCONDV_CODCONT, codcont); + rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART)); + if (rcondv.read() == NOERR) + rcondv.put(LVRCONDV_QTACONG, rdoc.get_real(RDOC_QTAGG5)); + const real ritat = rdoc.get_real(RDOC_QTAGG1); + const real conat = rdoc.get_real(RDOC_QTA); + rdoc.put(RDOC_QTAGG4, ritat); + rdoc.put(RDOC_QTAGG3, conat); + + } + rcondv.rewrite(); + } } //ridefinisco il metodo write delle TMotore_application diff --git a/lv/verig21.uml b/lv/verig21.uml index e1ce624cf..0e7d88cfe 100755 --- a/lv/verig21.uml +++ b/lv/verig21.uml @@ -431,6 +431,13 @@ BEGIN FLAGS "D" END +NUMBER FR_QTAGG5 6 0 +BEGIN + PROMPT 60 20 "Cong. " + FLAGS "H" + FIELD QTAGG5 +END + ENDPAGE PAGE "Analitica" 0 2 0 0