From b40c4686c6bbe12aea558e378dfd742b642e5650 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Wed, 28 Dec 2016 00:27:47 +0000 Subject: [PATCH] Patch level : 12.322 Files correlati : lv2.exe lv3.exe f168.trr lv0400a.msk Diana 2000 ---------- Spese automatiche da contratto sui buoni di consegna. git-svn-id: svn://10.65.10.50/branches/R_10_00@23480 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/ve/velib.h | 2 +- src/ve/velib03.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ve/velib.h b/src/ve/velib.h index d76e51c4c..32befc017 100755 --- a/src/ve/velib.h +++ b/src/ve/velib.h @@ -884,7 +884,7 @@ public: TPagamento& pagamento(); - void update_spese_aut(TString_array & spese, bool preserve_old = false, TSheet_field * sh = NULL); + void update_spese_aut(TString_array & spese, bool preserve_old = false, TSheet_field * sh = NULL, bool force = false); real calc_conai_qta(TCONAI_class type); void update_conai(); diff --git a/src/ve/velib03.cpp b/src/ve/velib03.cpp index 502df5db8..446b1b2d9 100755 --- a/src/ve/velib03.cpp +++ b/src/ve/velib03.cpp @@ -2801,15 +2801,15 @@ void TDocumento::update_raee() } } -void TDocumento::update_spese_aut(TString_array & spese_aut, bool preserve_old, TSheet_field* sh) +void TDocumento::update_spese_aut(TString_array & spese_aut, bool preserve_old, TSheet_field* sh, bool force) { const bool updated = get_bool(DOC_SPESEUPD); - if (updated) + if (!force && updated) return; const bool interactive = sh != NULL; - if (tipo().spese_aut()) + if (force || tipo().spese_aut()) { const int nrows = physical_rows(); int i;