From 2c162365c1ba27f9c43617f9e8513620dea97d80 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 14 May 2014 08:21:33 +0000
Subject: [PATCH] Adattamenti per modulo ci
git-svn-id: svn://10.65.10.50/branches/R_10_00@22931 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
ca/ca0600a.h | 2 ++
ca/ca0600a.uml | 76 ++++++++++++++++++++++++++++++++++++++++++--------
ca/calib01.cpp | 2 +-
ca/commesse.h | 2 ++
ca/f147.dir | 2 +-
ca/f147.trr | 8 ++++--
6 files changed, 75 insertions(+), 17 deletions(-)
diff --git a/ca/ca0600a.h b/ca/ca0600a.h
index 2d72dea33..76bf6060a 100755
--- a/ca/ca0600a.h
+++ b/ca/ca0600a.h
@@ -59,6 +59,8 @@
#define F_CMS_INDETR 258
#define F_CMS_FINAN 259
#define F_CMS_FORN 260
+#define F_CMS_SICUREZZA 263
+#define F_CMS_CODIVA 264
#define F_CMS_MAG 353
#define F_CMS_DESCMAG 354
diff --git a/ca/ca0600a.uml b/ca/ca0600a.uml
index ac010bb87..a4ba35029 100755
--- a/ca/ca0600a.uml
+++ b/ca/ca0600a.uml
@@ -27,36 +27,36 @@ END
BOOLEAN F_CMS_LOCDIV
BEGIN
- PROMPT 2 13 "Commessa in localit� diversa"
+ PROMPT 22 12 "Commessa in localit� diversa"
FIELD LOCDIV
END
GROUPBOX DLG_NULL 78 7
BEGIN
- PROMPT 1 14 "@bLocazione"
+ PROMPT 1 13 "@bLocazione"
END
STRING F_CMS_INDIR 35
BEGIN
- PROMPT 2 15 "Indirizzo "
+ PROMPT 2 14 "Indirizzo "
FIELD INDIR
END
STRING F_CMS_CIV 10
BEGIN
- PROMPT 50 15 "N. "
+ PROMPT 50 14 "N. "
FIELD CIV
END
STRING F_CMS_LOC 35
BEGIN
- PROMPT 2 16 "Localit� "
+ PROMPT 2 15 "Localit� "
FIELD LOC
END
STRING F_CMS_STATO 3
BEGIN
- PROMPT 2 17 "Stato "
+ PROMPT 2 16 "Stato "
FIELD STATO
FLAGS "Z"
USE %STA
@@ -71,7 +71,7 @@ END
STRING F_CMS_DESTATO 50
BEGIN
- PROMPT 20 17 ""
+ PROMPT 20 16 ""
USE %STA KEY 2
INPUT S0 F_CMS_DESTATO
DISPLAY "Stato@50" S0
@@ -81,7 +81,7 @@ END
STRING F_CMS_COM 4
BEGIN
- PROMPT 2 18 "Comune "
+ PROMPT 2 17 "Comune "
FIELD COM
FLAGS "U"
USE LF_COMUNI
@@ -102,19 +102,19 @@ END
STRING F_CMS_PROV 2
BEGIN
- PROMPT 21 18 "Provincia "
+ PROMPT 21 17 "Provincia "
FLAGS "D"
END
STRING F_CMS_CAP 5
BEGIN
- PROMPT 38 18 "CAP "
+ PROMPT 38 17 "CAP "
FIELD CAP
END
STRING F_CMS_DEN 50
BEGIN
- PROMPT 2 19 " "
+ PROMPT 2 18 " "
USE LF_COMUNI KEY 2
INPUT DENCOM F_CMS_DEN
DISPLAY "Denominazione@50" DENCOM
@@ -124,6 +124,40 @@ BEGIN
COPY OUTPUT F_CMS_COM
END
+GROUPBOX DLG_NULL 78 3
+BEGIN
+ PROMPT 1 20 "@bCliente"
+END
+
+STRING F_CMS_CODCF 6
+BEGIN
+ PROMPT 2 21 "Cliente "
+ USE LF_CLIFO
+ INPUT TIPOCF "C"
+ INPUT CODCF F_CMS_CODCF
+ DISPLAY "Codice" CODCF
+ DISPLAY "Ragione Sociale@50" RAGSOC
+ DISPLAY "Partita IVA@12" PAIV
+ OUTPUT F_CMS_CODCF CODCF
+ OUTPUT F_CMS_CRAGSOC RAGSOC
+ CHECKTYPE NORMAL
+ ADD RUN cg0 -1
+ FIELD CODCF
+END
+
+STRING F_CMS_CRAGSOC 50
+BEGIN
+ PROMPT 22 21 ""
+ USE LF_CLIFO KEY 2
+ INPUT TIPOCF "C"
+ INPUT RAGSOC F_CMS_CRAGSOC
+ DISPLAY "Ragione Sociale@50" RAGSOC
+ DISPLAY "Codice" CODCF
+ DISPLAY "Partita IVA@12" PAIV
+ COPY OUTPUT F_CMS_CODCF
+END
+
+
ENDPAGE
PAGE "Parametri" -1 -1 64 6
@@ -388,7 +422,7 @@ END
ENDPAGE
-PAGE "Parametri" -1 -1 64 6
+PAGE "Parametri 2" -1 -1 64 6
GROUPBOX DLG_NULL 78 6
BEGIN
@@ -456,6 +490,24 @@ BEGIN
MESSAGE ENABLE,F_CMS_DATAANTIC
END
+CURRENCY F_CMS_SICUREZZA 15
+BEGIN
+ PROMPT 2 10 "Sicurezza "
+ FIELD SICUREZZA
+END
+
+STRING F_CMS_CODIVA 4
+BEGIN
+ PROMPT 38 10 "IVA "
+ USE %IVA
+ INPUT CODTAB F_CMS_CODIVA
+ DISPLAY "Codice" CODTAB
+ DISPLAY "Descrizione@50" S0
+ OUTPUT F_CMS_CODIVA CODTAB
+ CHECKTYPE NORMAL
+ FIELD CODIVA
+END
+
DATE F_CMS_DATAANTIC
BEGIN
PROMPT 53 10 "Data anticipo "
diff --git a/ca/calib01.cpp b/ca/calib01.cpp
index 0ba1e4e28..1830d7dea 100755
--- a/ca/calib01.cpp
+++ b/ca/calib01.cpp
@@ -782,7 +782,7 @@ void ca_create_browse2(TEdit_field& kfld, int level, int logic, short key_id)
}
int ca_create_fields(TMask& msk, int page, int logicnum, int x, int y,
- short key_id, short des_id, unsigned int mode, const char* fieldname, int from )
+ short key_id, short des_id, unsigned int mode, const char* fieldname, int from )
{
TWait_cursor hourglass;
const TMultilevel_code_info& mci = ca_multilevel_code_info(logicnum);
diff --git a/ca/commesse.h b/ca/commesse.h
index 71cfd3842..22f5cf191 100755
--- a/ca/commesse.h
+++ b/ca/commesse.h
@@ -58,6 +58,8 @@
#define COMMESSE_LISRILPR "LISRILPR"
#define COMMESSE_LISRILCN "LISRILCN"
#define COMMESSE_CONTSEP "CONTSEP"
+#define COMMESSE_SICUREZZA "SICUREZZA"
+#define COMMESSE_CODIVA "CODIVA"
#endif
diff --git a/ca/f147.dir b/ca/f147.dir
index c37f50fdc..716f7720d 100755
--- a/ca/f147.dir
+++ b/ca/f147.dir
@@ -1,3 +1,3 @@
147
0
-$commesse||0|480|0|Archivio Commesse|||
+$commesse||0|502|0|Archivio Commesse|||
diff --git a/ca/f147.trr b/ca/f147.trr
index d4da7869d..56d034891 100755
--- a/ca/f147.trr
+++ b/ca/f147.trr
@@ -1,5 +1,5 @@
147
-57
+59
CODCMS|1|20|0|Codice Commessa
DESCRIZ|1|50|0|Descrizione
DESCRAGG|11|10|0|Descrizione aggiuntiva
@@ -52,11 +52,13 @@ DATAGAR|5|8|0|Periodo di gazanzia data
SALMIN|1|20|0|Modalit� di fatturazione
CODMAG|1|5|0|Codice magazzino e deposito
CODCOSTO|1|20|0|Codice Centro di Costo
-INDETR|1|1|0|Codice intetraibilita' IVA
+INDETR|1|1|0|Codice intetraibilit� IVA
CODCONTO|1|20|0|Codice Conto analitico
LISRILPR|1|4|0|Listino per la rilevazione ore preventive di default
LISRILCN|1|4|0|Listino per la rilevazione ore consuntive di default
-CONTSEP|1|6|0|Contabilita' separata
+CONTSEP|1|6|0|Contabilit� separata
+SICUREZZA|4|18|3|Importo sicurezza
+CODIVA|1|4|0|Codice IVA
2
CODCMS|
UPPER(DESCRIZ)|X