From 205a0763fc24cc7a08f91dbb8c7044210ec877fd Mon Sep 17 00:00:00 2001
From: rajitgill <rajitgill@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 1 Sep 2008 12:46:28 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@17140 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/f169.dir    |  2 +-
 lv/f169.trr    | 11 ++++++++-
 lv/lv0400.h    | 65 +++++++++++++++++++++++++++-----------------------
 lv/lv0400b.uml | 50 +++++++++++++++++++++++++++++++++-----
 4 files changed, 90 insertions(+), 38 deletions(-)

diff --git a/lv/f169.dir b/lv/f169.dir
index 927b51f91..c1183491f 100755
--- a/lv/f169.dir
+++ b/lv/f169.dir
@@ -1,3 +1,3 @@
 169
 0
-$lvrcondv|||291|0|Righe del contratto|||
+$lvrcondv|||312|0|Righe del contratto|||
diff --git a/lv/f169.trr b/lv/f169.trr
index 7fa7348b9..8d46991d7 100755
--- a/lv/f169.trr
+++ b/lv/f169.trr
@@ -1,5 +1,5 @@
 169
-29
+38
 CODCF|3|6|0|Codice cliente
 CODCONT|3|6|0|Codice contratto
 CODART|1|20|0|Codice articolo
@@ -29,6 +29,15 @@ ARTBLOC|2|1|0|Articolo bloccato
 CALCCONS|2|1|0|Calcolo consegnato
 TIPONOL|2|1|0|Tipo noleggio
 COLORE|1|20|0|Colore
+LIVELLO|1|1|0|Livello
+TIPOPARTE|1|1|0|Tipo parte
+CODLAV1|1|3|0|Codice lavaggio 1
+CODLAV2|1|3|0|Codice lavaggio 2
+LINDEST1|1|3|0|Linea destinazione 1
+LINDEST2|1|3|0|Linea destinazione 2
+LAVATRICE|1|3|0|Lavatrice
+ARTLAVCONT|1|4|0|Art. Lavacont
+MANGDEST|1|3|0|Mangano destinazione
 1
 CODCF+CODCONT+CODART|
 
diff --git a/lv/lv0400.h b/lv/lv0400.h
index 30525132a..6802295f1 100755
--- a/lv/lv0400.h
+++ b/lv/lv0400.h
@@ -4,36 +4,41 @@
 #define F_DATAIN       204
 #define F_DATASC       205
 #define F_RIGHE        206
-#define F_PERFAT       207
-#define F_TIPOCAN      208
-#define F_INPERFAT     209
-#define F_DTLASTFAT    210
-#define F_ATTFATNODT   211
-#define F_FORFNOCONS   212
-#define F_TIPOSTPRZ    213
-#define F_TIPOLIS      214
-#define F_TIPOIMB      215
-#define F_CAUSMAG      216
-#define F_CAUSMAGDESC  217 
-#define F_CONTSPOR     218
-#define F_SSCONS       219
-#define F_RIFBOLFAT    220
-#define F_ADDCAPROT    221
-#define F_PROFORME     222
-#define F_STRCONS      223
-#define F_FATTSOSP     224
-#define F_STDICITURA   225
-#define F_CICLAGGIO    226
-#define F_STPRZBOL     227
-#define F_STETIMATI    228
-#define F_STETITS      229
-#define F_STDDTPTS     230
-#define F_IMPMINFAT    231
-#define F_PERCNOCONT   232
-#define F_PERCTOLPES   233
-#define F_NUMUT        234
-#define F_NUMETI       235
-#define F_RITAUDTTMP   236
+#define F_TIPOLOGIA    207
+#define F_COLORE       208
+#define F_PPCONF       209 
+#define F_PPCOLLO      210
+#define F_PPPALLET     211
+#define F_PERFAT       212
+#define F_TIPOCAN      213
+#define F_INPERFAT     214
+#define F_DTLASTFAT    215
+#define F_ATTFATNODT   216
+#define F_FORFNOCONS   217
+#define F_TIPOSTPRZ    218
+#define F_TIPOLIS      219
+#define F_TIPOIMB      220
+#define F_CAUSMAG      221
+#define F_CAUSMAGDESC  222 
+#define F_CONTSPOR     223
+#define F_SSCONS       224
+#define F_RIFBOLFAT    225
+#define F_ADDCAPROT    226
+#define F_PROFORME     227
+#define F_STRCONS      228
+#define F_FATTSOSP     229
+#define F_STDICITURA   230
+#define F_CICLAGGIO    231
+#define F_STPRZBOL     232
+#define F_STETIMATI    233
+#define F_STETITS      234
+#define F_STDDTPTS     235
+#define F_IMPMINFAT    236
+#define F_PERCNOCONT   237
+#define F_PERCTOLPES   238
+#define F_NUMUT        239
+#define F_NUMETI       240
+#define F_RITAUDTTMP   241
 #define S_CODART       101
 #define S_DESCR        102
 #define S_UM           103
diff --git a/lv/lv0400b.uml b/lv/lv0400b.uml
index cbea652a3..5d3d17bd2 100755
--- a/lv/lv0400b.uml
+++ b/lv/lv0400b.uml
@@ -88,6 +88,44 @@ BEGIN
   ITEM "Arrotondamento"
 END
 
+GROUPBOX DLG_NULL 78 3
+BEGIN
+	PROMPT 1 17 "@bDettaglio Articolo selezionato"
+END
+
+LISTBOX F_TIPOLOGIA 12
+BEGIN
+  PROMPT 1 -4 "Tipologia:      "
+  ITEM  "0|Nessuno"
+  ITEM  "1|Sala bianca"
+  ITEM  "2|Sala colore"
+  ITEM  "3|Camera"
+  ITEM  "4|Bagno cotone"
+  ITEM  "5|Bagno spugna"
+  ITEM  "6|Di proprietà"
+  ITEM  "7|Sala bianca"
+END
+
+STRING F_COLORE 20
+BEGIN
+  PROMPT 35 -4 "Colore    "
+END 
+
+NUMBER F_PPCONF 9
+BEGIN 
+  PROMPT 1 -3 "Pezzi per Pacco:"
+END 
+
+NUMBER F_PPCOLLO 9
+BEGIN 
+  PROMPT 35 -3 "Per Sacco:"
+END 
+
+NUMBER F_PPPALLET 9
+BEGIN 
+  PROMPT 1 -2 "Per Carrello:   "
+END 
+
 ENDPAGE
 
 PAGE "Opzioni" 0 2 0 0
@@ -391,7 +429,7 @@ BEGIN
    FIELD SCONTPERC
 END
 
-NUMBER S_CONG 15 5
+NUMBER S_CONG 9 
 BEGIN
    PROMPT 1 6 "Conguaglio         "
    FIELD QTACONG
@@ -476,31 +514,31 @@ BEGIN
    FIELD CALCCONS
 END
 
-NUMBER S_CONSMESE 15 5
+NUMBER S_CONSMESE 9
 BEGIN
    PROMPT 14 11 "Qtà. consegnata nel mese  "
    FIELD CONSMESE
 END
 
-NUMBER S_CONSANNO 15 5
+NUMBER S_CONSANNO 9
 BEGIN
    PROMPT 14 12 "Qtà. consegnata nell'anno "
    FIELD CONSANNO
 END
 
-NUMBER S_DOTIN 6 
+NUMBER S_DOTIN 9 
 BEGIN
    PROMPT 1 13 "Dotazione iniziale     "
    FIELD DOTIN
 END
 
-NUMBER S_DOTOD 6 
+NUMBER S_DOTOD 9 
 BEGIN
    PROMPT 40 13 "Dotazione odierna     "
    FIELD DOTOD
 END
 
-NUMBER S_DOTTMP 6 
+NUMBER S_DOTTMP 9 
 BEGIN
    PROMPT 1 14 "Dotazione temporanea   "
    FIELD DOTTMP