From 07283e8b7f58541a15f73e8f1df06ee4fd82f391 Mon Sep 17 00:00:00 2001 From: Mattia Tollari Date: Mon, 18 Mar 2019 12:24:15 +0100 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2012.?= =?UTF-8?q?0=20734=20Files=20correlati=20=20=20=20=20:=20fp=20Commento=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20:=20Corretta=20lettura=20campi?= =?UTF-8?q?=20custom,=20si=20=C3=A8=20presentato=20un=20errore=20con=20la?= =?UTF-8?q?=20nuova=20gestione=20"nascondi=20sconti=20in=20fattura",=20ven?= =?UTF-8?q?iva=20letto=20sempre=20il=20campo=20di=20default=20e=20non=20pa?= =?UTF-8?q?ssava=20per=20la=20funzione=20prezzo()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fp/fplib.h | 6 +++--- src/fp/fplib01.cpp | 8 ++++---- src/fp/fplib02.cpp | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/fp/fplib.h b/src/fp/fplib.h index 17fe4dcb5..d8b37fdda 100644 --- a/src/fp/fplib.h +++ b/src/fp/fplib.h @@ -325,9 +325,9 @@ public: static void save_sheet(TSheet_field& sheet_field); static void load_sheet(TSheet_field& sheet_field); - const TString get_qta(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_qta; } - const TString get_prezzo(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_prezzo; } - const TString get_imponibile(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_imponibile; } + const TString& get_qta(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_qta; } + const TString& get_prezzo(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_prezzo; } + const TString& get_imponibile(const TString& codriga, const TString& tipodoc) { return get(codriga, tipodoc)._col_imponibile; } TFP_righe_custom(); }; diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp index 8611565cd..ae6e6349a 100644 --- a/src/fp/fplib01.cpp +++ b/src/fp/fplib01.cpp @@ -1168,11 +1168,11 @@ void TDoc_fp::set_qta_prezzo(TPaf_record& paf1800f, TRiga_documento* rdoc) const static TFP_righe_custom righe_custom; - const TString field_qta = righe_custom.get_qta(rdoc->tipo().codice(), rdoc->doc().tipo().codice()); - const TString field_prezzo = righe_custom.get_prezzo(rdoc->tipo().codice(), rdoc->doc().tipo().codice()); - const TString field_imponibile = righe_custom.get_imponibile(rdoc->tipo().codice(), rdoc->doc().tipo().codice()); + const TString& field_qta = righe_custom.get_qta(rdoc->tipo().codice(), rdoc->doc().tipo().codice()); + const TString& field_prezzo = righe_custom.get_prezzo(rdoc->tipo().codice(), rdoc->doc().tipo().codice()); + const TString& field_imponibile = righe_custom.get_imponibile(rdoc->tipo().codice(), rdoc->doc().tipo().codice()); - const bool custom_prezzo = field_prezzo != RDOC_PREZZO; + const bool custom_prezzo = field_prezzo.full(); real qta = rdoc->get_real(field_qta); // Prendendo la stringa non ho problemi in scrittura della query, a volte accadono cose stupide diff --git a/src/fp/fplib02.cpp b/src/fp/fplib02.cpp index 9f7e5bc79..1460041e0 100644 --- a/src/fp/fplib02.cpp +++ b/src/fp/fplib02.cpp @@ -281,9 +281,6 @@ TFP_righe_custom::TCustCol& TFP_righe_custom::get_no_custom() if(default_cust_col == nullptr) { default_cust_col = new TCustCol(); - default_cust_col->_col_qta = FP_SHT_DEF_QTA; - default_cust_col->_col_prezzo = FP_SHT_DEF_PREZZO; - default_cust_col->_col_imponibile = FP_SHT_DEF_IMPONIBILE; } return *default_cust_col; }