From cf0c93e6ca8be9894559b57f51b02c1069f3f975 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 21 Jan 2009 16:14:56 +0000
Subject: [PATCH] Patch level         :CD 210 Files correlati     :ba8
 Ricompilazione Demo : [ ] Commento            : sistemato problema del modulo
 in stampa tabelle che non cominciano con BA

git-svn-id: svn://10.65.10.50/trunk@18071 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba8500.cpp  |  8 ++++++++
 ba/ba8500a.uml | 40 ++++++++++++++++++++++------------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/ba/ba8500.cpp b/ba/ba8500.cpp
index 99f5386cd..dec2dc063 100755
--- a/ba/ba8500.cpp
+++ b/ba/ba8500.cpp
@@ -4,6 +4,7 @@
 #include <execp.h>
 #include <prefix.h>
 #include <reprint.h>
+#include <tabutil.h>
 
 #include "ba8400.h"
 #include "ba8500.h"
@@ -165,6 +166,13 @@ void TKlarkKent_app::main_loop()
     FOR_EACH_ARRAY_ROW(arr, r, row)
     {  
       TFilename report_name = *row;
+      // Controlla se trattasi di tabella comune o di ditta
+      if (report_name[0] == '%' || report_name.len() == 3)
+      {
+        TTable tab(report_name);
+        report_name = tab.module();
+        report_name << "st" << row->right(3);
+      }
       report_name.ext("rep");
       if (row->blank() || !report_name.custom_path()) 
       {
diff --git a/ba/ba8500a.uml b/ba/ba8500a.uml
index b8b4ab7f8..45396c435 100755
--- a/ba/ba8500a.uml
+++ b/ba/ba8500a.uml
@@ -1,5 +1,27 @@
 #include "ba8400.h"
 
+TOOLBAR "topbar" 0 0 0 2
+BUTTON DLG_PRINT 2 2
+BEGIN
+  PROMPT 1 1 "Stampa"
+  PICTURE BMP_PRINT
+END
+
+BUTTON DLG_SETPRINT 2 2
+BEGIN
+  PROMPT 1 1 "Imposta"
+  PICTURE BMP_SETPRINT
+END
+
+BUTTON DLG_EDIT 2 2
+BEGIN
+  PROMPT 1 1 "~Edit"
+  PICTURE BMP_EDIT
+END
+
+#include <helpbar.h>
+ENDPAGE
+
 PAGE "Stampa Report" -1 -1 62 5
 
 STRING F_REPORT 256 50
@@ -20,24 +42,6 @@ BEGIN
   FLAGS "D"
 END
 
-BUTTON DLG_PRINT 10 2
-BEGIN
-  PROMPT -13 -1 "~Stampa"
-  PICTURE BMP_PRINT
-  FLAGS "D"
-END
-
-BUTTON DLG_EDIT 10 2
-BEGIN
-  PROMPT -23 -1 "~Edit"
-  PICTURE BMP_EDIT
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -33 -1 ""
-END
-
 ENDPAGE
 
 ENDMASK