From 437192a27440c696ff576127cb6740b3b5ff23f2 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Sat, 2 Apr 2005 22:36:27 +0000
Subject: [PATCH] Patch level         : 2.2 68 Files correlati     :  ca1.exe
 Ricompilazione Demo : [ ] Commento            :

Aggiornamento della stampe anagrafiche

sono cambiati i files !!!


git-svn-id: svn://10.65.10.50/trunk@12900 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca1400.cpp                  | 2 +-
 ca/{ca1400.rep => ca1400a.rep} | 2 +-
 ca/ca1400a.uml                 | 2 +-
 ca/ca1500.cpp                  | 2 +-
 ca/{ca1500.rep => ca1500a.rep} | 2 +-
 ca/ca1500a.uml                 | 2 +-
 ca/ca1600.cpp                  | 2 +-
 ca/{ca1600.rep => ca1600a.rep} | 2 +-
 ca/ca1600a.uml                 | 2 +-
 ca/ca1700.cpp                  | 2 +-
 ca/{ca1700.rep => ca1700a.rep} | 2 +-
 ca/ca1700a.uml                 | 2 +-
 ca/calib02.h                   | 1 +
 13 files changed, 13 insertions(+), 12 deletions(-)
 rename ca/{ca1400.rep => ca1400a.rep} (97%)
 rename ca/{ca1500.rep => ca1500a.rep} (97%)
 rename ca/{ca1600.rep => ca1600a.rep} (96%)
 rename ca/{ca1700.rep => ca1700a.rep} (97%)

diff --git a/ca/ca1400.cpp b/ca/ca1400.cpp
index f744860ae..5856b363a 100755
--- a/ca/ca1400.cpp
+++ b/ca/ca1400.cpp
@@ -72,7 +72,7 @@ void TPrint_pdc::main_loop()
 
 		path = m.get(F_REPORT);
 		if (path.empty())
-			path = "ca1400";
+			path = "ca1400a";
     rep.load(path);
 		rep.mask2report(m);
 		book.add(rep);
diff --git a/ca/ca1400.rep b/ca/ca1400a.rep
similarity index 97%
rename from ca/ca1400.rep
rename to ca/ca1400a.rep
index b19f5684c..315ad9cc1 100755
--- a/ca/ca1400.rep
+++ b/ca/ca1400a.rep
@@ -1,5 +1,5 @@
 
-<report libraries="ca1100, ca1400" name="ca1400" lpi="6">
+<report libraries="ca1100, ca1400a" name="ca1400a" lpi="6">
  <description>Stampa piano dei conti di analitica</description>
  <font face="Courier New" size="10" />
  <section type="Head" height="8">
diff --git a/ca/ca1400a.uml b/ca/ca1400a.uml
index 5e2ac202e..c03cb1f67 100755
--- a/ca/ca1400a.uml
+++ b/ca/ca1400a.uml
@@ -15,7 +15,7 @@ END
 STRING F_REPORT 20
 BEGIN
    PROMPT 2 14 "Tipo di stampa  "
-	 RSELECT "ca1400"
+	 RSELECT "ca1400a"
 	 CHECKTYPE NORMAL
 END
 
diff --git a/ca/ca1500.cpp b/ca/ca1500.cpp
index a18e5f452..23a417743 100755
--- a/ca/ca1500.cpp
+++ b/ca/ca1500.cpp
@@ -62,7 +62,7 @@ void TPrint_cdc::main_loop()
 
 		path = m.get(F_REPORT);
 		if (path.empty())
-			path = "ca1500";
+			path = "ca1500a";
 
 		rep.load(path);
 		rep.mask2report(m);
diff --git a/ca/ca1500.rep b/ca/ca1500a.rep
similarity index 97%
rename from ca/ca1500.rep
rename to ca/ca1500a.rep
index 0a2f7de19..3bb94f314 100755
--- a/ca/ca1500.rep
+++ b/ca/ca1500a.rep
@@ -1,5 +1,5 @@
 
-<report libraries="ca1100,ca1500" name="ca1500" lpi="6">
+<report libraries="ca1100,ca1500a" name="ca1500a" lpi="6">
  <description>Stampa centri di costo di analitica</description>
  <font face="Courier New" size="10" />
  <section type="Head" height="8">
diff --git a/ca/ca1500a.uml b/ca/ca1500a.uml
index 98425faf2..1fe16bb98 100755
--- a/ca/ca1500a.uml
+++ b/ca/ca1500a.uml
@@ -15,7 +15,7 @@ END
 STRING F_REPORT 20
 BEGIN
    PROMPT 2 14 "Tipo di stampa  "
-	 RSELECT "ca1500"
+	 RSELECT "ca1500a"
 	 CHECKTYPE NORMAL
 END
 
diff --git a/ca/ca1600.cpp b/ca/ca1600.cpp
index 6cef50a3c..2ea288f7d 100755
--- a/ca/ca1600.cpp
+++ b/ca/ca1600.cpp
@@ -60,7 +60,7 @@ void TPrint_cms::main_loop()
 
 		path = m.get(F_REPORT);
 		if (path.empty())
-			path = "ca1600";
+			path = "ca1600a";
 
     rep.load(path);
 		rep.mask2report(m);
diff --git a/ca/ca1600.rep b/ca/ca1600a.rep
similarity index 96%
rename from ca/ca1600.rep
rename to ca/ca1600a.rep
index 555ff598f..bd3968d7e 100755
--- a/ca/ca1600.rep
+++ b/ca/ca1600a.rep
@@ -1,5 +1,5 @@
 
-<report libraries="ca1100,ca1600" name="ca1600" lpi="6">
+<report libraries="ca1100,ca1600a" name="ca1600a" lpi="6">
  <description>Stampa commesse di analitica</description>
  <font face="Courier New" size="10" />
  <section type="Head" height="8">
diff --git a/ca/ca1600a.uml b/ca/ca1600a.uml
index b1e212ea5..c3a35d6a2 100755
--- a/ca/ca1600a.uml
+++ b/ca/ca1600a.uml
@@ -15,7 +15,7 @@ END
 STRING F_REPORT 20
 BEGIN
    PROMPT 2 14 "Tipo di stampa  "
-	 RSELECT "ca1600"
+	 RSELECT "ca1600a"
 	 CHECKTYPE NORMAL
 END
 
diff --git a/ca/ca1700.cpp b/ca/ca1700.cpp
index aa9ae5b89..903ca528b 100755
--- a/ca/ca1700.cpp
+++ b/ca/ca1700.cpp
@@ -71,7 +71,7 @@ void TPrint_fasi::main_loop()
 
 		path = m.get(F_REPORT);
 		if (path.empty())
-			path = "ca1700";
+			path = "ca1700a";
 
 		rep.load(path);
 		rep.mask2report(m);
diff --git a/ca/ca1700.rep b/ca/ca1700a.rep
similarity index 97%
rename from ca/ca1700.rep
rename to ca/ca1700a.rep
index e254b9ed4..adceda7f7 100755
--- a/ca/ca1700.rep
+++ b/ca/ca1700a.rep
@@ -1,5 +1,5 @@
 
-<report libraries="ca1100,ca1700" name="ca1700" lpi="6">
+<report libraries="ca1100,ca1700a" name="ca1700a" lpi="6">
  <description>Stampa fasi di analitica</description>
  <font face="Courier New" size="10" />
  <section type="Head" height="8">
diff --git a/ca/ca1700a.uml b/ca/ca1700a.uml
index c0692efc7..4cc6e7f1e 100755
--- a/ca/ca1700a.uml
+++ b/ca/ca1700a.uml
@@ -15,7 +15,7 @@ END
 STRING F_REPORT 20
 BEGIN
   PROMPT 2 16 "Tipo di stampa  "
-	RSELECT "ca1700"
+	RSELECT "ca1700a"
 	CHECKTYPE NORMAL
 END
 
diff --git a/ca/calib02.h b/ca/calib02.h
index d6a33c29a..76a419052 100755
--- a/ca/calib02.h
+++ b/ca/calib02.h
@@ -16,6 +16,7 @@ class TAnal_report : public TReport
 protected:  // protected is safer
   virtual size_t get_usr_words(TString_array& words) const;
   virtual bool execute_usr_word(unsigned int opcode, TVariant_stack& stack);
+  virtual bool use_mask() { return false;}
 
   void msg_format(int logicnum, TVariant_stack& stack);
   void msg_format_costo         (TVariant_stack& stack);