From 6f3fe9dbc947ae22ffce3b394726f09585516bbf Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 27 Oct 2009 15:30:03 +0000
Subject: [PATCH] Patch level         :10.0 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :stampa del fatturato quasi in
 dirittura

git-svn-id: svn://10.65.10.50/trunk@19525 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/ve3900a.rep | 95 +++++++++++++++++++++++++++-----------------------
 ve/ve3900a.uml |  8 +++++
 2 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/ve/ve3900a.rep b/ve/ve3900a.rep
index 9607ed823..fbd586517 100755
--- a/ve/ve3900a.rep
+++ b/ve/ve3900a.rep
@@ -52,10 +52,10 @@ MESSAGE RESET,B1</prescript>
   <field x="14" y="1.75" type="Testo" align="center" width="10" height="0.75" pattern="1" text="Data">
    <font italic="1" face="Arial" size="8" />
   </field>
-  <field x="26" y="1.75" type="Testo" align="right" width="10" height="0.75" pattern="1" text="Totale Merce">
+  <field x="27" y="1.75" type="Testo" align="right" width="10" height="0.75" pattern="1" text="Totale Merce">
    <font italic="1" face="Arial" size="8" />
   </field>
-  <field x="39" y="1.75" type="Testo" align="right" width="8" height="0.75" pattern="1" text="Prestazioni">
+  <field x="38" y="1.75" type="Testo" align="right" width="8" height="0.75" pattern="1" text="Prestazioni">
    <font italic="1" face="Arial" size="8" />
   </field>
   <field x="47" y="1.75" type="Testo" align="right" width="8" height="0.75" pattern="1" text="Spese">
@@ -64,13 +64,13 @@ MESSAGE RESET,B1</prescript>
   <field x="56" y="1.75" type="Testo" align="right" width="10" height="0.75" pattern="1" text="Imponibile">
    <font italic="1" face="Arial" size="8" />
   </field>
+  <field x="67" y="1.75" type="Testo" align="right" width="10" height="0.75" pattern="1" text="Tot. Documento">
+   <font italic="1" face="Arial" size="8" />
+  </field>
   <field x="24.25" y="1.8" type="Testo" width="2" height="0.75" pattern="1" text="St">
    <font italic="1" face="Arial" size="8" />
   </field>
-  <field x="67.37" y="1.81" type="Testo" align="right" width="12" height="0.75" pattern="1" text="Tot. Documento">
-   <font italic="1" face="Arial" size="8" />
-  </field>
-  <field border="1" x="1" y="2.75" type="Linea" width="86" height="0" pattern="1" />
+  <field border="1" x="1" y="2.75" type="Linea" width="78" height="0" pattern="1" />
   <field x="8" y="0.5" type="Stringa" width="7" id="101" pattern="1">
    <source>CODCF</source>
   </field>
@@ -82,64 +82,71 @@ MESSAGE RESET,B1</prescript>
  <section type="Body" level="1" height="1">
   <font face="Arial" size="8" />
   <postscript description="B1 POSTSCRIPT">MESSAGE RESET,B1</postscript>
-  <field x="25" type="Stringa" width="1" pattern="1">
-   <source>STATO</source>
-  </field>
-  <field x="93" type="Stringa" hidden="1" width="4" pattern="1">
-   <source>CODNUM</source>
-  </field>
   <field x="2" type="Stringa" width="4" id="50" pattern="1">
    <source>TIPODOC</source>
-   <prescript description="B1.50 PRESCRIPT">MESSAGE TABLEREAD,%TPD,CODTAB=#50,67=B7</prescript>
+   <prescript description="B1.50 PRESCRIPT">MESSAGE TABLEREAD,%TIP,#50,52=B7</prescript>
   </field>
-  <field x="81" type="Stringa" hidden="1" width="4" id="55" pattern="1">
+  <field x="78" type="Stringa" hidden="1" link="ANNO" width="4" id="51" pattern="1">
    <source>ANNO</source>
   </field>
-  <field x="6" type="Numero" align="right" link="NDOC" width="7" id="60" pattern="1">
+  <field x="82.5" type="Stringa" hidden="1" align="right" width="3" id="52" pattern="1">
+   <prescript description="B1.52 PRESCRIPT">#THIS @
+"X" = IF
+-1
+ELSE
+1
+THEN
+#53 !</prescript>
+  </field>
+  <field x="86" type="Numero" hidden="1" align="right" width="3" id="53" pattern="1" />
+  <field x="90" type="Stringa" hidden="1" link="CODNUM" width="4" id="54" pattern="1">
+   <source>CODNUM</source>
+  </field>
+  <field x="95" type="Stringa" hidden="1" link="PROVV" width="1" id="55" pattern="1">
+   <source>PROVV</source>
+  </field>
+  <field x="6" type="Numero" align="right" link="NDOC" width="7" id="56" pattern="1">
    <source>NDOC</source>
   </field>
-  <field x="14" type="Data" width="10" id="65" pattern="1">
+  <field x="14" type="Data" width="10" id="57" pattern="1">
    <source>DATADOC</source>
   </field>
-  <field x="85.5" type="Array" hidden="1" align="right" width="3" id="67" pattern="1">
-   <list>
-    <li Value="+1" Code=" ">1 68 !</li>
-    <li Value="-1" Code="X">-1 68 !</li>
-   </list>
+  <field x="25" type="Stringa" width="1" id="58" pattern="1">
+   <source>STATO</source>
   </field>
-  <field x="89" type="Numero" hidden="1" align="right" width="3" id="68" pattern="1" />
   <field x="27" type="Valuta" align="right" width="10" id="100" pattern="1" hide_zero="1" text="###.###.###,@@">
-   <prescript description="B1.100 PRESCRIPT">#68 @
+   <prescript description="B1.100 PRESCRIPT">#53 @
 "33.TOTMER" @
 * .</prescript>
    <postscript description="B1.100 POSTSCRIPT">MESSAGE ADD,F2.100|ADD,F1.100</postscript>
   </field>
   <field x="38" type="Valuta" align="right" width="8" id="110" pattern="1" hide_zero="1" text="###.###.###,@@">
-   <prescript description="B1.110 PRESCRIPT">#68 @
+   <prescript description="B1.110 PRESCRIPT">#53 @
 "33.TOTPRE" @
 * .</prescript>
    <postscript description="B1.110 POSTSCRIPT">MESSAGE ADD,F2.110|ADD,F1.110</postscript>
   </field>
   <field x="47" type="Valuta" align="right" width="8" id="120" pattern="1" hide_zero="1" text="###.###.###,@@">
-   <prescript description="B1.120 PRESCRIPT">#68 @
+   <prescript description="B1.120 PRESCRIPT">#53 @
 "33.SPESE" @
 * .
 </prescript>
    <postscript description="B1.120 POSTSCRIPT">MESSAGE ADD,F2.120|ADD,F1.120</postscript>
   </field>
   <field x="56" type="Valuta" align="right" width="10" id="130" pattern="1" hide_zero="1" text="###.###.###,@@">
-   <prescript description="B1.130 PRESCRIPT">#68 @
-"33.IMPOSTE" @
+   <prescript description="B1.130 PRESCRIPT">#53 @
+"33.IMPONIBILI" @
 * .
 </prescript>
    <postscript description="B1.130 POSTSCRIPT">MESSAGE ADD,F2.130|ADD,F1.130</postscript>
   </field>
-  <field x="67" type="Valuta" align="right" width="12" id="140" pattern="1" text="###.###.###,@@">
-   <source>#68*TOTDOC</source>
-   <prescript description="B1.140 PRESCRIPT">#68 @
+  <field x="67" type="Valuta" align="right" width="10" id="140" pattern="1" text="###.###.###,@@">
+   <source>""</source>
+   <prescript description="B1.140 PRESCRIPT">#53 @
 "33.TOTDOC" @
 * .
 </prescript>
+   <postscript description="B1.140 POSTSCRIPT">MESSAGE ADD,F2.140|ADD,F1.140</postscript>
   </field>
  </section>
  <section type="Foot">
@@ -154,32 +161,32 @@ MESSAGE RESET,B1</prescript>
  </section>
  <section type="Foot" level="1">
   <font italic="1" face="Arial" bold="1" size="8" />
-  <field border="2" y="0.5" type="Linea" width="92" height="0" pattern="1" />
-  <field x="7" y="1" type="Testo" width="18" pattern="1" text="TOTALE GENERALE" />
-  <field x="27" y="1" type="Valuta" align="right" width="12" id="100" pattern="1" hide_zero="1" text="###.###.###,@@">
+  <field border="3" y="0.5" type="Linea" width="84" height="0" pattern="1" />
+  <field x="7" y="1.5" type="Testo" width="18" pattern="1" text="TOTALE GENERALE" />
+  <field x="27" y="1.5" type="Valuta" align="right" width="10" id="100" pattern="1" hide_zero="1" text="###.###.###,@@">
    <font face="Arial" bold="1" size="8" />
   </field>
-  <field x="40" y="1" type="Valuta" align="right" width="8" id="110" pattern="1" hide_zero="1" text="###.###.###,@@">
+  <field x="38" y="1.5" type="Valuta" align="right" width="8" id="110" pattern="1" hide_zero="1" text="###.###.###,@@">
    <font face="Arial" bold="1" size="8" />
   </field>
-  <field x="49" y="1" type="Valuta" align="right" width="12" id="120" pattern="1" hide_zero="1" text="###.###.###,@@">
+  <field x="47" y="1.5" type="Valuta" align="right" width="8" id="120" pattern="1" hide_zero="1" text="###.###.###,@@">
    <font face="Arial" bold="1" size="8" />
   </field>
-  <field x="62" y="1" type="Valuta" align="right" width="8" id="130" pattern="1" hide_zero="1" text="###.###.###,@@">
+  <field x="56" y="1.5" type="Valuta" align="right" width="10" id="130" pattern="1" hide_zero="1" text="###.###.###,@@">
    <font face="Arial" bold="1" size="8" />
   </field>
-  <field x="71" y="1" type="Valuta" align="right" width="12" id="140" pattern="1" hide_zero="1" text="###.###.###,@@">
+  <field x="67" y="1.5" type="Valuta" align="right" width="10" id="140" pattern="1" hide_zero="1" text="###.###.###,@@">
    <font face="Arial" bold="1" size="8" />
   </field>
  </section>
  <section type="Foot" level="2" height="3">
-  <field border="1" y="0.25" type="Rettangolo" shade_offset="50" width="92" height="1.5" />
-  <field x="4.5" y="0.5" type="Testo" width="14" pattern="1" text="Totale Cliente" />
-  <field x="27" y="0.5" type="Valuta" align="right" width="12" id="100" pattern="1" hide_zero="1" text="###.###.###,@@" />
-  <field x="40" y="0.5" type="Valuta" align="right" width="8" id="110" pattern="1" hide_zero="1" text="###.###.###,@@" />
-  <field x="49" y="0.5" type="Valuta" align="right" width="12" id="120" pattern="1" hide_zero="1" text="###.###.###,@@" />
-  <field x="62" y="0.5" type="Valuta" align="right" width="8" id="130" pattern="1" hide_zero="1" text="###.###.###,@@" />
-  <field x="71" y="0.5" type="Valuta" align="right" width="12" id="140" pattern="1" hide_zero="1" text="###.###.###,@@" />
+  <field border="1" x="1" y="0.25" type="Rettangolo" shade_offset="50" width="84" height="1.5" />
+  <field x="5.5" y="0.5" type="Testo" width="14" pattern="1" text="Totale Cliente" />
+  <field x="27" y="0.5" type="Valuta" align="right" width="10" id="100" pattern="1" hide_zero="1" text="###.###.###,@@" />
+  <field x="38" y="0.5" type="Valuta" align="right" width="8" id="110" pattern="1" hide_zero="1" text="###.###.###,@@" />
+  <field x="47" y="0.5" type="Valuta" align="right" width="8" id="120" pattern="1" hide_zero="1" text="###.###.###,@@" />
+  <field x="56" y="0.5" type="Valuta" align="right" width="10" id="130" pattern="1" hide_zero="1" text="###.###.###,@@" />
+  <field x="67" y="0.5" type="Valuta" align="right" width="10" id="140" pattern="1" hide_zero="1" text="###.###.###,@@" />
  </section>
  <sql>USE DOC  KEY 3 
 SELECT (BETWEEN(STATO,#DASTATO,#ASTATO))&#26;&#26;(BETWEEN(TIPODOC,#TIPODOC,#TIPODOC))&#26;&#26;(BETWEEN(CODCF,#DACLIFO,#ACLIFO))
diff --git a/ve/ve3900a.uml b/ve/ve3900a.uml
index e58214752..28ccc6def 100755
--- a/ve/ve3900a.uml
+++ b/ve/ve3900a.uml
@@ -5,9 +5,17 @@ TOOLBAR "Topbar" 0 0 0 2
 BUTTON DLG_PREVIEW 2 2
 BEGIN
   PROMPT 1 1 "~Anteprima"
+  MESSAGE EXIT,65
   PICTURE TOOL_PREVIEW
 END
 
+BUTTON DLG_PDF 2 2
+BEGIN
+  PROMPT 2 1 "~Pdf"
+  MESSAGE EXIT,80
+  PICTURE TOOL_PDF
+END
+
 #include <printbar.h>
 
 ENDPAGE