From 3e52722b14d808c82fbaccc88e1c84e027b2b037 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 24 Jun 2014 12:40:09 +0000
Subject: [PATCH] =?UTF-8?q?Migliore=20esportabilit=C3=A0=20Excel=20stampe?=
 =?UTF-8?q?=20saldaconto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/branches/R_10_00@22957 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 sc/pec.frm    | 20 ++++++++++----------
 sc/sc2100.cpp | 37 ++++++++++++++++++++++++++++++++++++-
 sc/sc2200.cpp | 10 +++++-----
 3 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/sc/pec.frm b/sc/pec.frm
index 4a0aa1049..7a0e884f9 100755
--- a/sc/pec.frm
+++ b/sc/pec.frm
@@ -50,14 +50,14 @@ SECTION HEADER ODD 12
   BEGIN
     KEY "Codice cliente/fornitore"
     PROMPT 2 2 ""
-    FIELD CODCF
+    FIELD 20.CODCF
   END
 
   STRINGA 4
   BEGIN
     KEY "Ragione sociale"
     PROMPT 8 2 ""
-    FIELD RAGSOC
+    FIELD 20.RAGSOC
   END
 
   STRINGA 5
@@ -66,7 +66,7 @@ SECTION HEADER ODD 12
     PROMPT 2 3 ""
     FLAGS "H"
     MESSAGE COPY,7
-    FIELD INDCF
+    FIELD 20.INDCF
   END
 
   STRINGA 6
@@ -75,7 +75,7 @@ SECTION HEADER ODD 12
     PROMPT 52 3 ""
     FLAGS "H"
     MESSAGE APPEND,7
-    FIELD CIVCF
+    FIELD 20.CIVCF
   END
 
   STRINGA 7
@@ -88,14 +88,14 @@ SECTION HEADER ODD 12
   BEGIN
     KEY "C.A.P."
     PROMPT 2 4 ""
-    FIELD CAPCF
+    FIELD 20.CAPCF
   END
   
   STRINGA 9
   BEGIN
     KEY "Localita'"
     PROMPT 26 4 ""
-    FIELD LOCALITACF
+    FIELD 20.LOCALITACF
   END
   
   STRINGA 10
@@ -128,7 +128,7 @@ SECTION HEADER ODD 12
     PROMPT 2 6 "Telefono "
     FLAGS "H"
     MESSAGE COPY,15
-    FIELD PTEL
+    FIELD 20.PTEL
   END
   
   STRINGA 14
@@ -137,13 +137,13 @@ SECTION HEADER ODD 12
     PROMPT 24 6 "/ "
     FLAGS "H"
     MESSAGE APPEND,15
-    FIELD TEL
+    FIELD 20.TEL
   END
   
   STRINGA 15
   BEGIN
-  KEY "Telefono completo"
-  PROMPT 2 6 "Telefono "
+    KEY "Telefono completo"
+    PROMPT 2 6 "Telefono "
   END
   
   STRINGA 101
diff --git a/sc/sc2100.cpp b/sc/sc2100.cpp
index bbbde0e7e..593ceddad 100755
--- a/sc/sc2100.cpp
+++ b/sc/sc2100.cpp
@@ -1323,7 +1323,42 @@ void TEC_form::init_header(const TMask& m)
     if (!rform.empty())
       fi.set(rform.get("TESTO"));
   }  
-  
+
+  // Sistema campi che si riferiscono a CLIFO in una stampa per Conto
+  if (relation()->log2ind(LF_CLIFO) < 0)
+  {
+    for (word i = 0; i < head.fields(); i++)
+    {
+      TForm_item& fi = head.field(i);
+      if (fi.fields() > 0 && strcmp(fi.class_name(), "STRINGA") == 0)
+      {
+        for (int f = 0; f < fi.fields(); f++)
+        {
+          TFieldref& fr = ((TForm_string&)fi).field(f);
+          if (fr.id() == "13")
+          {
+            fi.disable();
+          } else
+          if (fr.id() == "20")
+          {
+            if (fr.name() == CLI_RAGSOC)
+            {
+              fr.set_file(LF_PCON);
+              fr.set_name(PCN_DESCR);
+            } else
+            if (fr.name() == CLI_CODCF)
+            {
+              fr.set_file(LF_PCON);
+              fr.set_name(PCN_SOTTOCONTO);
+            }
+            else
+              fi.disable();
+          }
+        }
+      }
+    }
+  }
+
   TPrint_section& fink = section('G');
   if (fink.fields() > 0) 
     fink.update();                 // Setta il backgroud di stampa
diff --git a/sc/sc2200.cpp b/sc/sc2200.cpp
index 733e65f4c..1eaaa659f 100755
--- a/sc/sc2200.cpp
+++ b/sc/sc2200.cpp
@@ -1223,7 +1223,7 @@ void TStampaScadenzario::print_header()
     TString rw(201);
     TString s1,s2;
     
-    set_header (soh++, "Ditta : %ld %s@148gData@153g%s  @190gPag. @#",
+    set_header (soh++, "%6ld@9g%s@148gData@153g%s  @190gPag. @#",
                firm,  (const char *)s,  (const char *)data);
 
     if (_tipost==fornitori)   
@@ -1260,7 +1260,7 @@ void TStampaScadenzario::print_header()
    case altri:   // Piano dei conti
    {
     TString rw(201);
-    set_header (soh++, FR("Ditta : %ld %s@152gData@157g%s  @190gPag. @#"),
+    set_header (soh++, FR("%6ld@9g%s@152gData@157g%s  @190gPag. @#"),
                firm,  (const char *)s,  (const char *)data);
     set_header(soh++,FR("@79g** SCADENZARIO **"));
     set_header (soh++,FR("@66gPer il periodo dal %s al %s"),(const char*)datai,(const char*)dataf);
@@ -1317,9 +1317,9 @@ void TStampaScadenzario::set_page_clifo(int nriga)
   set_row(nriga,"@180g#15t",&_altri);     // Altri tipi di pagamento
 	set_row(nriga,"@198g@1s",FLD(LF_SCADENZE,SCAD_BLOCCATA));
 	nriga++;
-  set_row(nriga,"@31g#t",&_datadoc);
-  set_row(nriga,"@40g#t",&_numdoc);
-  set_row(nriga,"@49g#-5t",&_protiva);
+  set_row(nriga,"@30g#t",&_datadoc);
+  set_row(nriga,"@38g#8t",&_numdoc);
+  set_row(nriga,"@47g#-5t",&_protiva);
 }
 
 void TStampaScadenzario::set_page_pcon(int nriga)