From 512c2a7daf82ba8e011a4a6e1b06f88c8e20a0d7 Mon Sep 17 00:00:00 2001
From: smen <smen@sirio-is.it>
Date: Tue, 5 Apr 2022 17:13:38 +0200
Subject: [PATCH] Patch level         : 12.0 1134 Files correlati     : ve
 Commento: Modificata la logica di insierimento dei campi di calcolo nei
 documenti interattivi e nelle stampe standard

---
 src/ve/veacc.rep    |  2 +-
 src/ve/vecnford.rep |  2 +-
 src/ve/vefat.rep    |  2 +-
 src/ve/velib02.cpp  |  6 +++++-
 src/ve/velib03a.cpp | 14 +++++++-------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/ve/veacc.rep b/src/ve/veacc.rep
index 0542d2882..2539ffd1b 100755
--- a/src/ve/veacc.rep
+++ b/src/ve/veacc.rep
@@ -437,7 +437,7 @@ MESSAGE ENABLE,51</prescript>
    <prescript description="B1.56 PRESCRIPT">MESSAGE _ALIGN,#52,BOTTOM</prescript>
   </field>
   <field x="78" deactivated="" type="Prezzo" hidden="" align="right" link="" bg_color="#00FFFF" dynamic_height="" shade_offset="" width="10" codval="" id="57" pattern="1" hide_zero="1" text="###.###.###,@@">
-   <source>34.IMPNS</source>
+   <source>34.IMPONIBILE</source>
    <prescript description="B1.57 PRESCRIPT">MESSAGE _ALIGN,#52,BOTTOM</prescript>
   </field>
   <field x="88.75" deactivated="" type="Stringa" hidden="" link="" bg_color="#EFEFEF" dynamic_height="" shade_offset="" width="3" codval="" id="58" pattern="1" hide_zero="" text="">
diff --git a/src/ve/vecnford.rep b/src/ve/vecnford.rep
index 1cbd5574b..92c2a21ff 100755
--- a/src/ve/vecnford.rep
+++ b/src/ve/vecnford.rep
@@ -384,7 +384,7 @@ MESSAGE ENABLE,51</prescript>
   </field>
   <field x="76" deactivated="" type="Valuta" hidden="" align="right" link="" bg_color="#00FFFF" dynamic_height="" shade_offset="" width="10" codval="33.CODVAL" id="57" pattern="1" hide_zero="1" text="###.###.###,@@">
    <groups>29</groups>
-   <source>34.IMPNS</source>
+   <source>34.IMPONIBILE</source>
    <prescript description="B1.57 PRESCRIPT">MESSAGE _ALIGN,#52,TOP</prescript>
   </field>
   <field x="118" deactivated="" type="Prezzo" hidden="1" align="right" link="" bg_color="#E1E1E1" dynamic_height="" shade_offset="" width="15" codval="33.CODVAL" id="59" pattern="1" hide_zero="1" text="###.###.###,@@">
diff --git a/src/ve/vefat.rep b/src/ve/vefat.rep
index 9fc8ede55..7b40f588f 100755
--- a/src/ve/vefat.rep
+++ b/src/ve/vefat.rep
@@ -359,7 +359,7 @@ MESSAGE ENABLE,51</prescript>
   </field>
   <field x="76.5" deactivated="" type="Prezzo" hidden="" align="right" link="" bg_color="#00FFFF" dynamic_height="" shade_offset="" width="12" codval="33.CODVAL" id="57" pattern="1" hide_zero="1" text="###.###.###,@@">
    <groups>29</groups>
-   <source>34.IMPNS</source>
+   <source>34.IMPONIBILE</source>
    <prescript description="B1.57 PRESCRIPT">MESSAGE _ALIGN,#52,BOTTOM</prescript>
   </field>
   <field x="89.75" deactivated="" type="Stringa" hidden="" link="" bg_color="#EFEFEF" dynamic_height="" shade_offset="" width="3" codval="" id="58" pattern="1" hide_zero="" text="">
diff --git a/src/ve/velib02.cpp b/src/ve/velib02.cpp
index 0b2b507e5..db6cebab7 100755
--- a/src/ve/velib02.cpp
+++ b/src/ve/velib02.cpp
@@ -84,7 +84,11 @@ void TTipo_riga_documento::read_formule()
 	_no_desc = profile.get_bool("NODESC");
   _formule = profile.get("CAMPICALC");
 	_extended_desc_search = 	ini_get_bool(CONFIG_DITTA, "Main", "CUSTOM_SEARCH_" TOSTRING(LF_ANAMAG), false, 2);
-  const TString& calcoli = profile.get("CALCOLI");
+  
+  TString calcoli = profile.get("CALCOLI");
+
+  if (!is_descrizione() && calcoli.blank())
+    calcoli = "*";
   if (calcoli == "*")
   {         
     TISAM_recordset frr("USE %FRR");
diff --git a/src/ve/velib03a.cpp b/src/ve/velib03a.cpp
index 818322871..a639244e1 100755
--- a/src/ve/velib03a.cpp
+++ b/src/ve/velib03a.cpp
@@ -368,14 +368,14 @@ void TTipo_documento::read_formule()
   TFilename profile; profile_name(profile);
 	TFilename p(profile); p.custom_path();
 
-	if (p.exist()) // evita la creazione di profili vuoti
-	{
-		TConfig prof(profile, "MAIN");
-		prof.write_protect();  // Altrimenti non si distrugge!!!
+  if (p.exist()) // evita la creazione di profili vuoti
+  {
+    TConfig prof(profile, "MAIN");
+    prof.write_protect();  // Altrimenti non si distrugge!!!
 
-		_tipocr = prof.get_char("TIPOCR", NULL, -1, ' ');
-		_formule = prof.get("CAMPICALC");
-		const TString& calcoli = prof.get("CALCOLI");
+    _tipocr = prof.get_char("TIPOCR", NULL, -1, ' ');
+    _formule = prof.get("CAMPICALC");
+    const TString& calcoli = prof.get("CALCOLI");
 		if (calcoli == "*")
 		{
 			TTable frd("%FRD");