From bf5275bc9eeecaa7c6f29f6ab081e86bdbefa381 Mon Sep 17 00:00:00 2001
From: rajitgill <rajitgill@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 5 Sep 2008 08:54:08 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@17166 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/f169.dir    |  2 +-
 lv/f169.trr    |  5 +----
 lv/lv0400a.uml |  4 ++--
 lv/lvcondv.h   | 19 ++++++++++---------
 lv/lvrcondv.h  | 30 ++++++++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100755 lv/lvrcondv.h

diff --git a/lv/f169.dir b/lv/f169.dir
index 9732e9760..bf05ed092 100755
--- a/lv/f169.dir
+++ b/lv/f169.dir
@@ -1,3 +1,3 @@
 169
 0
-$lvrcondv|0|0|272|0|Righe del contratto|||
+$lvrcondv|0|0|226|0|Righe del contratto|||
diff --git a/lv/f169.trr b/lv/f169.trr
index 72a329de7..f5d471b2b 100755
--- a/lv/f169.trr
+++ b/lv/f169.trr
@@ -1,5 +1,5 @@
 169
-28
+25
 CODCF|3|6|0|Codice cliente
 CODCONT|3|6|0|Codice contratto
 CODART|1|20|0|Codice articolo
@@ -8,13 +8,10 @@ PREZRIN|4|18|3|Prezzo di rinnovo
 QTACONG|4|15|5|Quantità conguaglio
 SCONTPERC|4|6|2|Percentuale di sconto
 DOTIN|4|15|5|Dotazione iniziale
-DOTOD|4|15|5|Dotazione odierna
 DOTTMP|4|15|5|Dotazione temporanea
 PRZDTTMP|4|18|3|Prezzo Dotazione temporanea
 INDTTMP|5|8|0|Inizio Dotazione temporanea
 FIDTTMP|5|8|0|Fine Dotazione temporanea
-CONSMESE|4|15|5|Consegnato nel mese,qta consegnata da fatturare nel prossimo periodo di fatturazione
-CONSANNO|4|15|5|Consegnato anno
 UM|1|2|0|Unità di misura
 PREZDAN|4|18|3|Prezzo danneggiati
 TIPOFORF|2|1|0|Tipo forfait
diff --git a/lv/lv0400a.uml b/lv/lv0400a.uml
index 81c6874d1..bdcfc9240 100755
--- a/lv/lv0400a.uml
+++ b/lv/lv0400a.uml
@@ -154,13 +154,13 @@ END
 
 NUMBER F_CONSMESE 9
 BEGIN
-   PROMPT 1 -4 "Consegnato mese   "
+   PROMPT 1 -4 "Qtà. consegnata nel mese "
    FLAGS "D"
 END
 
 NUMBER F_CONSANNO 9
 BEGIN
-   PROMPT 30 -4 "Consegnato anno "
+   PROMPT 38 -4 "Qtà. consegnata nell' anno "
    FLAGS "D"
 END
 
diff --git a/lv/lvcondv.h b/lv/lvcondv.h
index 9f42f24d4..f5bdc3d0a 100755
--- a/lv/lvcondv.h
+++ b/lv/lvcondv.h
@@ -1,7 +1,7 @@
 #ifndef __LVCONDV_H
 #define __LVCONDV_H
 
-#define LVCONDV_CODCONT		    "CODCONT"
+#define LVCONDV_CODCONT       "CODCONT"
 #define LVCONDV_STATUS        "STATUS"
 #define LVCONDV_CODCF         "CODCF"
 #define LVCONDV_DATAIN        "DATAIN"
@@ -25,21 +25,22 @@
 #define LVCONDV_TIPOIMB       "TIPOIMB"
 #define LVCONDV_SSCONS        "SSCONS"
 #define LVCONDV_TIPOSTPRZ     "TIPOSTPRZ"
-#define LVCONDV_DTLASTFATT    "DTLASTFATT"
-#define LVCONDV_ATTFATTNODT   "ATTFATTNODT"
-#define LVCONDV_RIFBOLLEFATT  "RIFBOLLEFATT"
+#define LVCONDV_CAUSMAG       "CAUSMAG"
+#define LVCONDV_DTLASTFAT     "DTLASTFAT"
+#define LVCONDV_ATTFATNODT    "ATTFATNODT"
+#define LVCONDV_RIFBOLFAT     "RIFBOLFAT"
 #define LVCONDV_STDICITURA    "STDICITURA"
 #define LVCONDV_PROFORME      "PROFORME"
 #define LVCONDV_CICLAGGIO     "CICLAGGIO"
 #define LVCONDV_STETIMATI     "STETIMATI"
-#define LVCONDV_STETITC       "STETITC"
-#define LVCONDV_STDDTPTC      "STDDTPTC"
-#define LVCONDV_IMPMINFATT    "IMPMINFATT"
+#define LVCONDV_STETITS       "STETITS"
+#define LVCONDV_STDDTPTS      "STDDTPTS"
+#define LVCONDV_IMPMINFAT     "IMPMINFAT"
 #define LVCONDV_PERCNOCONT    "PERCNOCONT"
-#define LVCONDV_PERCTOLLPES   "PERCTOLLPES"
+#define LVCONDV_PERCTOLPES    "PERCTOLPES"
 #define LVCONDV_NUMUT         "NUMUT"
 #define LVCONDV_NUMETI        "MUNETI"
-#define LVCONDV_RITAUTDTTMP   "RITAUTDTTMP"
+#define LVCONDV_RITAUDTTMP    "RITAUDTTMP"
 #define LVCONDV_DTFIXDDT      "DTFIXDDT"
 #define LVCONDV_COMMENTI      "COMMENTI"
 
diff --git a/lv/lvrcondv.h b/lv/lvrcondv.h
new file mode 100755
index 000000000..e531ac94a
--- /dev/null
+++ b/lv/lvrcondv.h
@@ -0,0 +1,30 @@
+#ifndef __LVRCONDV_H
+#define __LVRCONDV_H
+
+#define LVRCONDV_CODCF      "CODCF"     
+#define LVRCONDV_CODCONT    "CODCONT"   
+#define LVRCONDV_CODART     "CODART"  
+#define LVRCONDV_DESCR      "DESCR"  
+#define LVRCONDV_UM         "UM"  
+#define LVRCONDV_CONG       "CONG" 
+#define LVRCONDV_PREZZOST   "PREZZOST"  
+#define LVRCONDV_PREZZORN   "PREZZORN"  
+#define LVRCONDV_IMPFISART  "IMPFISART"  
+#define LVRCONDV_SCONTO     "SCONTO"  
+#define LVRCONDV_DOTIN      "DOTIN"  
+#define LVRCONDV_DOTTMP     "DOTTMP"  
+#define LVRCONDV_PRZDTTMP   "PRZDTTMP"  
+#define LVRCONDV_INDTTMP    "INDTTMP"  
+#define LVRCONDV_FIDTTMP    "FIDTTMP"  
+#define LVRCONDV_PREZDAN    "PREZDAN"  
+#define LVRCONDV_VALCONV    "VALCONV" 
+#define LVRCONDV_ARTBLOC    "ARTBLOC"  
+#define LVRCONDV_CALCCONS   "CALCCONS"  
+#define LVRCONDV_TIPOFORF   "TIPOFORF"  
+#define LVRCONDV_FORFPERCL  "FORFPERCL"  
+#define LVRCONDV_CAUSMAG    "CAUSMAG"  
+#define LVRCONDV_TIPONOL    "TIPONOL"  
+#define LVRCONDV_FATTKG     "FATTKG"  
+#define LVRCONDV_ARROT      "ARROT"  
+
+#endif
\ No newline at end of file