From 3931306edfd8da8f6a94db5894df19abb505b9b5 Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Wed, 24 Jun 2020 18:55:21 +0200
Subject: [PATCH] 2Patch level        : 12.0 972 Files correlati     :
 verig01.msk verig02.msk verig03.msk Commento            :
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Aggiunti i campi CONAI alle righr di spesa a quantitĂ  e prezzo
---
 src/ve/verig.uml   | 56 +++++++++-------------------------------------
 src/ve/verig00.uml |  2 +-
 src/ve/verig02.uml |  2 --
 src/ve/verig03.uml |  2 +-
 src/ve/verig04.uml |  1 -
 5 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/src/ve/verig.uml b/src/ve/verig.uml
index 584d45493..a10a91d97 100755
--- a/src/ve/verig.uml
+++ b/src/ve/verig.uml
@@ -1,5 +1,4 @@
 #include "veuml.h"
-#ifdef FULL_SCREEN
 TOOLBAR "" 0 0 0 2
 
 BUTTON DLG_OK 10 2
@@ -25,14 +24,13 @@ BEGIN
 END
 
 ENDPAGE
-#endif
 
 #ifndef MASK_WIDTH
-#define MASK_WIDTH 76
+#define MASK_WIDTH 0
 #endif
 
 #ifndef MASK_HEIGHT
-#define MASK_HEIGHT 21
+#define MASK_HEIGHT 0
 #endif
 
 #ifndef MASK_TITLE1
@@ -158,7 +156,6 @@ END
 ENDIF
 ENDIF
 
-
 IF(defined(FLD_CODART) || defined(FLD_CODALT))
 
 IFDEF(FLD_CODART)
@@ -1537,10 +1534,10 @@ ENDIF
 #include USR_PAGE_1
 #endif
 
-#ifdef PAGE_2
-
 ENDPAGE
 
+#ifdef PAGE_2
+
 PAGE "Pag.2"  -1 -1 MASK_WIDTH MASK_HEIGHT
 
 IFDEF(FLD_CODMAGC)
@@ -2476,6 +2473,7 @@ ELSEIF
   FIELD CODAGG2  
 ENDIF
 END
+ENDIF
 
 IFDEF(FLD_RIDPREZZO)
 CURRENCY FR_RIDPREZZO 18
@@ -2504,11 +2502,11 @@ ENDIF
 #include USR_PAGE_2
 #endif
 
-#endif
-
 ENDPAGE
 
-#ifdef IS_MERCE
+#endif
+
+#ifdef HAS_CONAI
 
 PAGE "Conai"  -1 -1 MASK_WIDTH MASK_HEIGHT
 
@@ -2688,46 +2686,10 @@ BEGIN
   FIELD PCON(10)
 END
 
-ENDIF
-
 ENDPAGE
 
 #endif
 
-
-#ifndef FULL_SCREEN
-ENDPAGE
-
-TOOLBAR "" 0 0 0 2
-
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -14 -1 ""
-END
-
-BUTTON DLG_CANCEL 10 2
-BEGIN
-  PROMPT -24 -1 ""
-END
-
-#ifndef PAGE_1
-BUTTON DLG_DELREC 10 2
-BEGIN
-  PROMPT -34 -1 "Elimina"
-  MESSAGE EXIT,K_DEL
-END
-
-BUTTON DLG_USER 10 2
-BEGIN
-  PROMPT -44 -1 "~Collega"
-  PICTURE BMP_LINK
-END
-#define PAGE_1
-#endif
-
-#endif
-
-
 PAGE "Contabilità analitica - Commesse"  -1 -1 MASK_WIDTH MASK_HEIGHT
 
 GROUPBOX DLG_NULL 78 14
@@ -2811,4 +2773,6 @@ END
 
 ENDIF // Campi analitici
 
+ENDPAGE
+
 ENDMASK
diff --git a/src/ve/verig00.uml b/src/ve/verig00.uml
index 36f5012f1..e19ced7a1 100755
--- a/src/ve/verig00.uml
+++ b/src/ve/verig00.uml
@@ -2,7 +2,7 @@
 
 #define FULL_SCREEN
 #define PAGE_2
-#define IS_MERCE
+#define HAS_CONAI
 
 DEFINE_FIELD(CODMAG)
 DEFINE_FIELD(DESMAG)
diff --git a/src/ve/verig02.uml b/src/ve/verig02.uml
index ba4801727..c46953a65 100755
--- a/src/ve/verig02.uml
+++ b/src/ve/verig02.uml
@@ -3,8 +3,6 @@
 #define FULL_SCREEN
 
 #define MASK_TITLE1 "Spese di tipo (Valore)"
-#define PAGE_2
-
 
 DEFINE_FIELD(CODSPV)
 DEFINE_FIELD(DESCRSPV)
diff --git a/src/ve/verig03.uml b/src/ve/verig03.uml
index 7eda4180e..ec062d487 100755
--- a/src/ve/verig03.uml
+++ b/src/ve/verig03.uml
@@ -3,7 +3,7 @@
 #define FULL_SCREEN
 
 #define MASK_TITLE1 "Spese di tipo (Quantita'/Prezzo)"
-#define PAGE_2
+#define HAS_CONAI
 
 DEFINE_FIELD(CODSPQ)
 DEFINE_FIELD(DESCRSPQ)
diff --git a/src/ve/verig04.uml b/src/ve/verig04.uml
index 8ef9d3860..8969a9792 100755
--- a/src/ve/verig04.uml
+++ b/src/ve/verig04.uml
@@ -9,7 +9,6 @@ DEFINE_FIELD(DESCRSPP)
 DEFINE_FIELD(PERCSP)
 DEFINE_FIELD(CODIVA)
 DEFINE_FIELD(DESIVA)
-#define PAGE_2
 
 #include "verig.uml"