From cbddbdbc647abea211e11b3114eca1710d117e8a Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 26 Jan 2018 10:51:17 +0000
Subject: [PATCH] Patch level         : 12.0 514 Files correlati     : tf
 Commento            : - Davide ha sistemato il report, adesso mostra i totali
 giusti - Corretti campi DB

git-svn-id: svn://10.65.10.50/branches/R_10_00@24302 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/tf/tf0100.cpp      |  2 +-
 src/tf/tff.ini         |  2 +-
 src/tf/tftotivaliq.rep | 30 +++++++++++++++---------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/tf/tf0100.cpp b/src/tf/tf0100.cpp
index facee1bea..7fd5d8641 100644
--- a/src/tf/tf0100.cpp
+++ b/src/tf/tf0100.cpp
@@ -1366,7 +1366,7 @@ bool TTrFa_app::tff0700(TSheet_field& sheet)
 			// Campi di controllo
 			tff0700f.set("P7_CLIFOR",					header);
 			tff0700f.set("P7_NRODOC",					ndoc);
-			tff0700f.set("P7_DATADOC",				toDate(strarr->get(_datadoc)));
+			tff0700f.set("P7_DTADOC",				toDate(strarr->get(_datadoc)));
 
 
 			ok = tff0700f.insert();
diff --git a/src/tf/tff.ini b/src/tf/tff.ini
index 66edda7d5..d0d581456 100644
--- a/src/tf/tff.ini
+++ b/src/tf/tff.ini
@@ -128,7 +128,7 @@ P7_PROTOCOLLO		= CHAR(18)
 P7_POSIZIONE		= NUMERIC(7,0)
 P7_CLIFOR			= CHAR(20)
 P7_NRODOC			= CHAR(20)
-P7_DATADOC			= DATE
+P7_DTADOC			= DATE
 
 
 INDEX_1 = P7_KEYPRGINVIO,P7_KEYHEADERFATT,P7_KEYBODYFATT
diff --git a/src/tf/tftotivaliq.rep b/src/tf/tftotivaliq.rep
index ee9fcd714..af7e80aff 100644
--- a/src/tf/tftotivaliq.rep
+++ b/src/tf/tftotivaliq.rep
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<report name="tftotivaliq" orientation="2" lpi="6">
+<report libraries="VE1300" name="tftotivaliq" orientation="2" lpi="6">
  <description>Totale iva per aliquota</description>
  <font face="Arial Narrow" size="8" />
  <section type="Head" pattern="1">
@@ -497,7 +497,7 @@ THEN
    <source>#601+#602+#603+#604+#605+#606</source>
   </field>
  </section>
- <section type="Foot" level="2" pattern="1">
+ <section type="Foot" level="2" hidden="1" pattern="1">
   <prescript description="F2 PRESCRIPT">MESSAGE HIDE,20@</prescript>
   <field border="1" x="23" type="Linea" height="2" pattern="1" />
   <field border="1" x="44" type="Linea" height="2" pattern="1" />
@@ -600,7 +600,7 @@ THEN
    <source>#601+#602+#603+#604+#605+#606</source>
   </field>
  </section>
- <section type="Foot" level="3" hidden="1" pattern="1">
+ <section type="Foot" level="3" pattern="1">
   <field border="1" x="23" type="Linea" height="2" pattern="1" />
   <field border="1" x="44" type="Linea" height="2" pattern="1" />
   <field border="1" x="65" type="Linea" height="2" pattern="1" />
@@ -635,24 +635,24 @@ THEN
   <field x="128.5" type="Valuta" align="right" width="10" id="112" pattern="1" text="###.###.###,@@">
    <prescript description="F3.112 PRESCRIPT">MESSAGE ADD,F1.106</prescript>
   </field>
-  <field x="75.5" type="Valuta" align="right" width="10" id="203" pattern="1" text="###.###.###,@@">
-   <prescript>MESSAGE ADD,F1.203</prescript>
-  </field>
-  <field x="96.5" type="Valuta" align="right" width="10" id="204" pattern="1" text="###.###.###,@@">
-   <prescript>MESSAGE ADD,F1.204</prescript>
-  </field>
-  <field x="117.5" type="Valuta" align="right" width="10" id="205" pattern="1" text="###.###.###,@@">
-   <prescript>MESSAGE ADD,F1.205</prescript>
-  </field>
-  <field x="138.5" type="Valuta" align="right" width="10" id="206" pattern="1" text="###.###.###,@@">
-   <prescript>MESSAGE ADD,F1.206</prescript>
-  </field>
   <field x="33.5" type="Valuta" align="right" width="10" id="207" pattern="1" text="###.###.###,@@">
    <prescript description="F3.207 PRESCRIPT">MESSAGE ADD,F1.201</prescript>
   </field>
   <field x="54.5" type="Valuta" align="right" width="10" id="208" pattern="1" text="###.###.###,@@">
    <prescript description="F3.208 PRESCRIPT">MESSAGE ADD,F1.202</prescript>
   </field>
+  <field x="75.5" type="Valuta" align="right" width="10" id="209" pattern="1" text="###.###.###,@@">
+   <prescript description="F3.209 PRESCRIPT">MESSAGE ADD,F1.203</prescript>
+  </field>
+  <field x="96.5" type="Valuta" align="right" width="10" id="210" pattern="1" text="###.###.###,@@">
+   <prescript description="F3.210 PRESCRIPT">MESSAGE ADD,F1.204</prescript>
+  </field>
+  <field x="117.5" type="Valuta" align="right" width="10" id="211" pattern="1" text="###.###.###,@@">
+   <prescript description="F3.211 PRESCRIPT">MESSAGE ADD,F1.205</prescript>
+  </field>
+  <field x="138.5" type="Valuta" align="right" width="10" id="212" pattern="1" text="###.###.###,@@">
+   <prescript description="F3.212 PRESCRIPT">MESSAGE ADD,F1.206</prescript>
+  </field>
   <field x="23.5" y="1" type="Valuta" align="right" bg_color="#DADADA" txt_color="#FF0000" width="10" id="507" pattern="1" text="###.###.###,@@">
    <prescript description="F3.507 PRESCRIPT">MESSAGE ADD,F1.501</prescript>
   </field>