From a56e6648ad25a23042e9cb09977ddfef7f90b425 Mon Sep 17 00:00:00 2001
From: Mattia Tollari <mtollari@sirio-is.it>
Date: Fri, 2 Aug 2019 11:10:21 +0200
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2012.?=
 =?UTF-8?q?0=20866=20Files=20correlati=20=20=20=20=20:=20pa=20Commento=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20:=20Aggiunto=20codice=20commes?=
 =?UTF-8?q?sa=20e=20gestione=20commesse=20per=20sanit=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pa/patbcon.h   | 22 ++++++++++++----------
 src/pa/patbcon.uml | 24 ++++++++++++++++++------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/pa/patbcon.h b/src/pa/patbcon.h
index aa99a4e25..88b4e9519 100644
--- a/src/pa/patbcon.h
+++ b/src/pa/patbcon.h
@@ -1,16 +1,18 @@
 #ifndef __PATBCON_H
 #define __PATBCON_H
 
-#define F_CON_TIPO         101
-#define F_CON_CODCF        102
-#define F_CON_RAGSOC       112
-#define F_CON_CODICE       103
-#define F_CON_DESCRIZIONE  113
-#define F_CON_DATA         104
-#define F_CON_RIFAMM       105
-#define F_CON_CAUS1        121
-#define F_CON_CAUS2        122
-#define F_CON_CAUS3        123
+#define F_CON_TIPO					101
+#define F_CON_CODCF					102
+#define F_CON_RAGSOC				112
+#define F_CON_CODICE				103
+#define F_CON_DESCRIZIONE		113
+#define F_CON_DATA					104
+#define F_CON_RIFAMM				105
+#define F_CON_CAUS1					121
+#define F_CON_CAUS2					122
+#define F_CON_CAUS3					123
+#define F_CON_COMCON				124
+#define B_CON_ASL						125
 
 #endif
 
diff --git a/src/pa/patbcon.uml b/src/pa/patbcon.uml
index a5d197273..5f3da7692 100644
--- a/src/pa/patbcon.uml
+++ b/src/pa/patbcon.uml
@@ -79,7 +79,7 @@ BEGIN
 END
 
 
-GROUPBOX DLG_NULL 78 5
+GROUPBOX DLG_NULL 78 6
 BEGIN
   PROMPT 1 5 "@bDati contratto/convenzione/ordine P.A."
 END
@@ -109,30 +109,42 @@ END
 
 STRING F_CON_RIFAMM 20
 BEGIN
-  PROMPT 24 7 "Riferimento amministrazione   "
+  PROMPT 2 8 "Riferimento amministrazione   "
   FIELD S4
 END
 
+STRING F_CON_COMCON 20
+BEGIN
+  PROMPT 2 9 "Codice commessa o convenzione "
+  FIELD S5
+END
+
+BOOLEAN B_CON_ASL
+BEGIN
+  PROMPT 55 9 "Commessa per sanità"
+  FIELD B0
+END
+
 GROUPBOX DLG_NULL 78 5
 BEGIN
-  PROMPT 1 10 "@bCausale"
+  PROMPT 1 11 "@bCausale"
 END
 
 STRING F_CON_CAUS1 50
 BEGIN
-  PROMPT 14 11 ""
+  PROMPT 14 12 ""
   FIELD S1
 END
 
 STRING F_CON_CAUS2 50
 BEGIN
-  PROMPT 14 12 ""
+  PROMPT 14 13 ""
   FIELD S2
 END
 
 STRING F_CON_CAUS3 50
 BEGIN
-  PROMPT 14 13 ""
+  PROMPT 14 14 ""
   FIELD S3
 END