From 7a75b31554529ba20f7bf402011bc688efc5cb70 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 2 Jun 2011 21:02:39 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

Stampa cartellini Tetractis


git-svn-id: svn://10.65.10.50/branches/R_10_00@22208 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/reprint.cpp | 9 +++++----
 include/tabmod.cpp  | 4 ++--
 ps/pl1048100.cpp    | 2 +-
 ps/pl1048100.rep    | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/reprint.cpp b/include/reprint.cpp
index 866e6d173..b0a9528f4 100755
--- a/include/reprint.cpp
+++ b/include/reprint.cpp
@@ -1993,7 +1993,8 @@ void TBook::join_file(int pps)
       // <page number=%d />
       in_page = str.get_int(1);
       const int sub = ((in_page - 1) % pps);
-      off_page = sub * logical_page_height() / pps;
+//      off_page = sub * logical_page_height() / pps;
+      off_page = sub * page_size().y / pps;
       if (sub == 0)
       {
         out_page = (in_page - 1) / pps + 1;
@@ -2017,10 +2018,10 @@ void TBook::join_file(int pps)
     } else
     if (str.starts_with("</page "))
     {
-      if (out_page % pps == 0)
+      if (in_page % pps == 0)
       {
         str.format("</page number=%d>", out_page);
-        out_page = 0;
+        in_page = 0;
       }
       else 
         continue;
@@ -2028,7 +2029,7 @@ void TBook::join_file(int pps)
     out << str << endl;
   } 
 
-  if (out_page != 0) // Non ho ancora scritto l'ultimo fine pagina
+  if (in_page != 0) // Non ho ancora scritto l'ultimo fine pagina
   {
     str.format("</page number=%d>", out_page);
     out << str << endl;
diff --git a/include/tabmod.cpp b/include/tabmod.cpp
index bcda40de3..3ecb1f190 100755
--- a/include/tabmod.cpp
+++ b/include/tabmod.cpp
@@ -32,8 +32,8 @@ TModule_table::TModule_table(const char* tabname)
 	  if (_module.blank())
 		  _module = appname.left(2);
 
-    if (_customer <= 0L && real::is_natural(appname.mid(3)))
-		  _customer = atol(app.mid(2));
+//    if (_customer <= 0L && real::is_natural(appname.mid(3)))
+//		  _customer = atol(app.mid(2));
   }
   _module.upper();
 }
diff --git a/ps/pl1048100.cpp b/ps/pl1048100.cpp
index b27508709..19e8f5521 100755
--- a/ps/pl1048100.cpp
+++ b/ps/pl1048100.cpp
@@ -850,7 +850,7 @@ bool TCrea_cartellini::set_params(const TMask & m)
 
 bool TCrea_cartellini::set_params()
 {   
-	const TFixed_string arg = argv(3);
+	const TFixed_string arg = argv(2);
   if ((arg[0] != '-' && arg[0] != '/') || (arg[1] != 'i' && arg[1] != 'I'))
     return false;
     
diff --git a/ps/pl1048100.rep b/ps/pl1048100.rep
index af2c32964..19df86db7 100755
--- a/ps/pl1048100.rep
+++ b/ps/pl1048100.rep
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<report libraries="ve1300, pl1048100" name="PL1048100" lpi="6">
+<report libraries="ve1300, pl1048100" page_merge="1" name="pl1048100" lpi="6">
  <description>Cartellini</description>
  <font face="Courier New" size="10" />
  <section type="Head" height="12" pattern="1">
@@ -93,4 +93,4 @@ JOIN 20 INTO TIPOCF==TIPOCF CODCF==CODCF
 JOIN 47 INTO CODART==CODART
 FROM TIPOCONT=#CONT CODICE=#KEY
 TO TIPOCONT=#CONT CODICE=#KEY</sql>
-</report>
\ No newline at end of file
+</report>