From 0f36fc6225f9b810d52330a7ad34c518811c67a6 Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Wed, 22 Jan 2020 12:21:22 +0100
Subject: [PATCH] Patch level         : 12.0 928 Files correlati     : ve0.exe
 ve1.exe ve5.exe ve6.exe Commento            :

- Aggiunte funzioni sulle righe documento :

  QTACONAI(<categoria> [ <tipo calcolo (0=netto, 1=esente, 2=lordo)])
  VALCONAI(<categoria> [ <tipo calcolo (0=netto, 1=esente, 2=lordo)])
---
 src/ve/velib03a.cpp | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/ve/velib03a.cpp b/src/ve/velib03a.cpp
index 5ae72b15b..317a3efa5 100755
--- a/src/ve/velib03a.cpp
+++ b/src/ve/velib03a.cpp
@@ -1129,20 +1129,22 @@ void TExpr_documento::evaluate_user_func(int index, int nparms, TEval_stack & st
 				{
 					const TString8 sottocat = _row->get(conai_sottocat_name(i));
 
-					if (sottocat.full() && sottocat_found.find(sottocat) < 0)
+					if (sottocat.full() && sottocat.starts_with(cat))
 					{
-						sottocat_found.add(sottocat);
-						stack.push(sottocat);
-						stack.push(tipo_calcolo);						
-						evaluate_user_func(_qtaconai, 2, stack, type);
-
-						real valqta = stack.pop_real();
-
-						if (_doc)
+						if (sottocat.full() && sottocat_found.find(sottocat) < 0)
 						{
-							int rows = _doc->physical_rows();
-							const TRectype & scc = cache().get("&VESCC", sottocat);
-							TString conai_codart(scc.get("S1"));
+							sottocat_found.add(sottocat);
+							stack.push(sottocat);
+							stack.push(tipo_calcolo);
+							evaluate_user_func(_qtaconai, 2, stack, type);
+
+							real valqta = stack.pop_real();
+
+							if (_doc)
+							{
+								int rows = _doc->physical_rows();
+								const TRectype & scc = cache().get("&VESCC", sottocat);
+								TString conai_codart(scc.get("S1"));
 
 								for (int i = rows; i >= 1; i--)
 								{
@@ -1158,9 +1160,10 @@ void TExpr_documento::evaluate_user_func(int index, int nparms, TEval_stack & st
 									}
 
 								}
+							}
+							else
+								val = ZERO;
 						}
-						else
-							val = ZERO;
 					}
 				}
 			}