From 60cd776c02aa668d036f55b888af681091731202 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Tue, 22 Jul 2025 03:45:49 +0200 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2012.?= =?UTF-8?q?00=20=201396=20Files=20correlati=20=20=20=20=20:=20ve0.exe=20fp?= =?UTF-8?q?0.exe=20fp0300a.msk=20cg2.exe=20cg5.exe=20Commento=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20:=20Se=20non=20=C3=A8=20att?= =?UTF-8?q?iva=20l'analitica=20non=20mostra=20la=20pagina=20relativa=20IL?= =?UTF-8?q?=20ripristino=20funziona=20anche=20senza=20la=20data=20di=20ult?= =?UTF-8?q?ima=20stampa=20Pulsante=20per=20segnare=20fatture=20come=20invi?= =?UTF-8?q?ate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ve/velib.h | 3 +++ src/ve/velib06.cpp | 3 ++- src/ve/velib06a.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ve/velib.h b/src/ve/velib.h index d59f32759..f2560cc6e 100755 --- a/src/ve/velib.h +++ b/src/ve/velib.h @@ -1157,6 +1157,7 @@ public: class TDocumento_mask : public TVariable_mask // velib06 { int _progs_page; // pagina in cui cominciano i progressivi + int _anal_page; // pagina analitica TSheet_field* _sheet; // Spreadsheet TDocumento _doc; // documento TCodgiac_livelli * _livelli_giac; // livelli di giacenza @@ -1292,6 +1293,8 @@ public: TString& codart() { return _codart; } const TString & codart() const { return _codart; } + const int anal_page() const { return _anal_page; } + TArray& color_rules() { return _color_rules; } void sel_color(); diff --git a/src/ve/velib06.cpp b/src/ve/velib06.cpp index 2454b432b..6cd62df7e 100755 --- a/src/ve/velib06.cpp +++ b/src/ve/velib06.cpp @@ -91,7 +91,7 @@ short conai_sottocat_id(int id) TDocumento_mask::TDocumento_mask(const char* td) : TVariable_mask(), _progs_page(-1), _condv(NULL), //_smartcard(NULL), _cms_start(-1), _cms_end(-1), _cms_start_sh(-1), _cms_end_sh(-1), - _cdc_start(-1), _cdc_end(-1), _cdc_start_sh(-1), _cdc_end_sh(-1) + _cdc_start(-1), _cdc_end(-1), _cdc_start_sh(-1), _cdc_end_sh(-1), _anal_page(-1) { CHECK(td && *td && strlen(td) <= 4, "TDocumento_mask(TipoDocumento) not (MaskName)"); { @@ -608,6 +608,7 @@ void TDocumento_mask::insert_anal_page() create_page(TR("Analitica"), newpage); // Inserisce una pagina vuota con un titolo a caso add_groupbox(DLG_NULL, newpage, "", 1, 0, 78, 6); + _anal_page = newpage; add_string(DLG_NULL, newpage, TR("Cod. num. "), 2, 1, 4, "D").set_group(2); add_string(DLG_NULL, newpage, "", 24, 1, 50, "D").set_group(3); add_string(DLG_NULL, newpage, TR("Tipo doc. "), 2, 2, 4, "D").set_group(4); diff --git a/src/ve/velib06a.cpp b/src/ve/velib06a.cpp index 71e80adce..e4261df94 100755 --- a/src/ve/velib06a.cpp +++ b/src/ve/velib06a.cpp @@ -450,6 +450,8 @@ bool data_hndl( TMask_field& field, KEY key ) { TDocumento_mask& m = (TDocumento_mask &) field.mask(); + if ((field.initial_check(key) || field.to_check(key)) && m.anal_page() >= 0) + m.enable_single_page(m.anal_page(), ca_active(field.get_date())); if (field.to_check(key)) { if (m.id2pos(F_DATAINSC) > 0)