From 0ee519a646ae28496bd3a14161e75ea723329b44 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 13 Oct 2004 09:01:46 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=202.2?= =?UTF-8?q?=2034=20Files=20correlati=20=20=20=20=20:=20batbnum.msk=20ve0.e?= =?UTF-8?q?xe=20Ricompilazione=20Demo=20:=20[=20]=20Commento=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20:=20Possilbiltr=C3=A0=20diu=20avere=20numeraz?= =?UTF-8?q?ioni=20che=20non=20controllano=20l=C3=A0esercizio=20contabile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@12394 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/batbnum.h | 1 + ve/batbnum.uml | 6 ++++++ ve/velib.h | 2 +- ve/velib06a.cpp | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ve/batbnum.h b/ve/batbnum.h index 7ad86a9d5..fd51635de 100755 --- a/ve/batbnum.h +++ b/ve/batbnum.h @@ -74,3 +74,4 @@ #define F_NUMAUTO 271 #define F_ULTDATAPROV 272 #define F_EMRI 273 +#define F_CNTES 274 diff --git a/ve/batbnum.uml b/ve/batbnum.uml index 3e1384830..093e330fb 100755 --- a/ve/batbnum.uml +++ b/ve/batbnum.uml @@ -930,6 +930,12 @@ PAGE "Tipi documento validi" -1 -1 60 14 FIELD B3 END + BOOLEAN F_CNTES + BEGIN + PROMPT 2 18 "Nessun controllo sull'esercizio" + FIELD B4 + END + ENDPAGE ENDMASK diff --git a/ve/velib.h b/ve/velib.h index 7e6218692..0454a4e21 100755 --- a/ve/velib.h +++ b/ve/velib.h @@ -329,7 +329,7 @@ public: const bool auto_num() const { return get_bool("B1"); } const bool dont_test_datadoc() const { return get_bool("B2"); } const bool fattura_emettere_ricevere() const { return get_bool("B3"); } - + const bool test_eser() const { return ! get_bool("B4"); } const TString & tipo_doc(int i) const; int ntipi_doc() const; diff --git a/ve/velib06a.cpp b/ve/velib06a.cpp index 7e9a761c8..c8500b241 100755 --- a/ve/velib06a.cpp +++ b/ve/velib06a.cpp @@ -234,6 +234,9 @@ bool data_hndl( TMask_field& field, KEY key ) if (!datadoc.ok()) return field.error_box("La data documento deve essere comunque indicata."); + const TCodice_numerazione codnum(m.get(F_CODNUM)); + if (codnum.test_eser()) + { TEsercizi_contabili esc; if (esc.date2esc(datadoc) <= 0) return field.error_box("La data documento non appartiene ad un esercizio valido."); @@ -254,8 +257,8 @@ bool data_hndl( TMask_field& field, KEY key ) return FALSE; // L'errore viene segnalato nella read } } + } - const TCodice_numerazione codnum(m.get(F_CODNUM)); if (codnum.dont_test_datadoc()) return TRUE; // Non devo fare altri test