From 4f034aa7f55ab2ec9cf8f978f765e85b3b4170a8 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 17 May 2005 16:34:19 +0000
Subject: [PATCH] Patch level         :2.2 102 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :stampa mastrini e movimenti in
 stato di avanzamento

git-svn-id: svn://10.65.10.50/trunk@13112 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca3200.cpp  | 18 ++++++++++++++----
 ca/ca3300.cpp  |  4 ++--
 ca/ca3300a.uml |  6 +++---
 ca/pconana.h   |  9 +++++++++
 4 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100755 ca/pconana.h

diff --git a/ca/ca3200.cpp b/ca/ca3200.cpp
index 0bf31270d..08a8e1387 100755
--- a/ca/ca3200.cpp
+++ b/ca/ca3200.cpp
@@ -152,6 +152,17 @@ TPrint_mastrini_ca_mask::TPrint_mastrini_ca_mask()
 }
 
 
+////////////////////////////////////////////////////////
+//	REPORT
+////////////////////////////////////////////////////////
+class TPrint_mastrini_ca_rep : public TAnal_report
+{
+/*protected:
+	virtual	bool get_usr_val(const TString& name, TVariant& var) const;
+	void calcola_saldo_iniziale();*/
+};
+
+
 ////////////////////////////////////////////////////////
 //	APPLICAZIONE
 ////////////////////////////////////////////////////////
@@ -195,14 +206,13 @@ void TPrint_mastrini_ca::main_loop()
 		TString path = _mask->get(F_REPORT);
 		if (path.empty())
 			path = "ca3200a";
+		TPrint_mastrini_ca_rep rep;
+		rep.load(path);
 
 		FOR_EACH_SHEET_ROW(sheet, r, row)
 		{
-			TAnal_report rep;
-			rep.load(path);
-
 			TString query;
-			query << "USE RMOVANA";
+			query << "USE RMOVANA\nJOIN PCONANA INTO CODCONTO==CODCONTO";
 			rep.set_recordset(query);
 
 			rep.mask2report(*_mask);
diff --git a/ca/ca3300.cpp b/ca/ca3300.cpp
index 2545ed526..bece561d2 100755
--- a/ca/ca3300.cpp
+++ b/ca/ca3300.cpp
@@ -136,8 +136,8 @@ TPrint_bilancio_ca_mask::TPrint_bilancio_ca_mask()
 
 	const int logicnum = use_pdcc ? LF_PCON : LF_PCONANA;
 
-	const int nfields = ca_create_fields(*this, 0, logicnum, 2, 9, F_CDC1_INI, F_DES1_INI, 0x0, "#DACONTO");
-	ca_create_fields(*this, 0, logicnum, 2, 15, F_CDC1_FIN, F_DES1_FIN, 0x0, "#ACONTO");
+	const int nfields = ca_create_fields(*this, 0, logicnum, 2, 10, F_CDC1_INI, F_DES1_INI, 0x0, "#DACONTO");
+	ca_create_fields(*this, 0, logicnum, 2, 16, F_CDC1_FIN, F_DES1_FIN, 0x0, "#ACONTO");
 
 	for (int i = 0; i < nfields; i++)
 	{
diff --git a/ca/ca3300a.uml b/ca/ca3300a.uml
index 5e5762ffe..76d219899 100755
--- a/ca/ca3300a.uml
+++ b/ca/ca3300a.uml
@@ -132,17 +132,17 @@ END
 
 GROUPBOX DLG_NULL 78 6
 BEGIN
-  PROMPT 0 8 "@bDa:"
+  PROMPT 0 9 "@bDa:"
 END
 
 GROUPBOX DLG_NULL 78 6
 BEGIN
-  PROMPT 0 14 "@bA:"
+  PROMPT 0 15 "@bA:"
 END
 
 STRING F_REPORT 256 64
 BEGIN
-  PROMPT 1 20 "Report "
+  PROMPT 1 21 "Report "
 END
 
 ENDPAGE
diff --git a/ca/pconana.h b/ca/pconana.h
new file mode 100755
index 000000000..e8b9bc4f0
--- /dev/null
+++ b/ca/pconana.h
@@ -0,0 +1,9 @@
+#ifndef __PCONANA_H
+#define __PCONANA_H
+
+#define PCONANA_CODCONTO    "CODCONTO"
+#define PCONANA_DESCR				"DESCR"
+#define PCONANA_SEZSALDI		"SEZSALDI"
+#define PCONANA_SOSPESO			"SOSPESO"
+
+#endif