From 3c03d4192080b863392029226081786dee353922 Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Fri, 25 Jun 2021 00:10:24 +0200
Subject: [PATCH] Patch level         : 12.0 1064 Files correlati     :
 ce0400a.msk ce4.exe

Commento        :

Aggiunto un flag per attivare la contabilizzazione cespiti in analitica
---
 src/ce/ce0400a.h   | 1 +
 src/ce/ce0400a.uml | 9 ++++++++-
 src/ce/ce4400.cpp  | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ce/ce0400a.h b/src/ce/ce0400a.h
index b45bb3723..5d4429277 100755
--- a/src/ce/ce0400a.h
+++ b/src/ce/ce0400a.h
@@ -55,4 +55,5 @@
 #define F_VEND_CESP_CO 337
 #define F_VEND_CESP_SO 338
 #define F_VEND_CESP_D  339
+#define F_COLLCOAN    340
 
diff --git a/src/ce/ce0400a.uml b/src/ce/ce0400a.uml
index a815957bf..78adccc43 100755
--- a/src/ce/ce0400a.uml
+++ b/src/ce/ce0400a.uml
@@ -165,10 +165,17 @@ BOOLEAN F_COLLCOGE
 BEGIN
   PROMPT 2 0 "Attiva collegamento a contabilita'"
   FIELD COLLCOGE
-  MESSAGE FALSE DISABLE,9@
+  MESSAGE FALSE CLEAR,9@
   MESSAGE TRUE ENABLE,9@
 END
 
+BOOLEAN F_COLLCOAN
+BEGIN
+  PROMPT 42 0 "Attiva collegamento a contabilita' analitica"
+  FIELD COLLCOAN
+  MODULE CA
+END
+
 BOOLEAN F_PLUSMIN
 BEGIN
   PROMPT 2 1 "Genera anche movimenti plus/minusvalenza"
diff --git a/src/ce/ce4400.cpp b/src/ce/ce4400.cpp
index 58adb17d9..abb196ab2 100755
--- a/src/ce/ce4400.cpp
+++ b/src/ce/ce4400.cpp
@@ -1525,7 +1525,7 @@ bool TContabilizza_ce::create()
 {
   _mask = new TContabilizza_ce_mask;
   //chiede se ha la CA; serve per la contabilizzazione analitica
-  _has_ca = dongle().active(CAAUT);
+  _has_ca = dongle().active(CAAUT) && ini_get_bool(CONFIG_DITTA, "ce", "COLLCOAN");
   //config ditta cespiti
   _config_ditta_ce = new TConfig(CONFIG_DITTA, "ce");