diff --git a/src/ca/ca3100.uml b/src/ca/ca3100.uml index 81d0a6aa9..cd092923b 100755 --- a/src/ca/ca3100.uml +++ b/src/ca/ca3100.uml @@ -2,6 +2,7 @@ #include "camask.h" #define ALL_EXPORT +#define REPORT #define CLASS_NAME "ca3100a" TOOLBAR "topbar" 0 0 0 2 diff --git a/src/ca/ca3200.uml b/src/ca/ca3200.uml index 838e15c7b..b56f0989f 100755 --- a/src/ca/ca3200.uml +++ b/src/ca/ca3200.uml @@ -2,6 +2,7 @@ #include "camask.h" #define ALL_EXPORT +#define REPORT #define CLASS_NAME "ca3200a" TOOLBAR "topbar" 0 0 0 2 @@ -13,7 +14,7 @@ TOOLBAR "bottombar" 0 -3 0 1 #include ENDPAGE -PAGE "Selezioni" 0 0 0 2 +PAGE "Selezioni" 0 -3 0 1 GROUPBOX DLG_NULL 78 3 BEGIN diff --git a/src/ca/ca3300.uml b/src/ca/ca3300.uml index 0024eba7b..bf6032c59 100755 --- a/src/ca/ca3300.uml +++ b/src/ca/ca3300.uml @@ -1,6 +1,7 @@ #include "ca3300.h" #define ALL_EXPORT +#define REPORT #define CLASS_NAME "ca3300a" TOOLBAR "topbar" 0 0 0 2 diff --git a/src/ca/ca3600.uml b/src/ca/ca3600.uml index 36f1282f5..77b979ca6 100755 --- a/src/ca/ca3600.uml +++ b/src/ca/ca3600.uml @@ -2,6 +2,7 @@ #include "camask.h" #define ALL_EXPORT +#define REPORT #define CLASS_NAME "ca3600" TOOLBAR "topbar" 0 0 0 2 diff --git a/src/ca/ca3700.uml b/src/ca/ca3700.uml index 4d08ab7d0..3c8180636 100755 --- a/src/ca/ca3700.uml +++ b/src/ca/ca3700.uml @@ -2,6 +2,7 @@ #include "camask.h" #define ALL_EXPORT +#define REPORT #define CLASS_NAME "ca3700" TOOLBAR "topbar" 0 0 0 2 diff --git a/src/ca/ca3800.cpp b/src/ca/ca3800.cpp index 803f5c362..dfb499616 100755 --- a/src/ca/ca3800.cpp +++ b/src/ca/ca3800.cpp @@ -543,4 +543,4 @@ int ca3800(int argc, char* argv[]) // CA_3900 // Gestore maschera ca3900 (Stima ricavi di competenza) -// Creatore del report e dell'applicazione \ No newline at end of file +// Creatore del report e dell'applicazione diff --git a/src/ca/ca3800.uml b/src/ca/ca3800.uml index 26072e6b3..88ac6ae89 100755 --- a/src/ca/ca3800.uml +++ b/src/ca/ca3800.uml @@ -1,6 +1,7 @@ #include "ca3883a.h" #define ALL_EXPORT +#define REPORT #define CLASS_NAME "ca3800a" TOOLBAR "topbar" 0 0 0 2 @@ -246,4 +247,4 @@ END ENDPAGE -ENDMASK \ No newline at end of file +ENDMASK diff --git a/src/ca/ca3801.cpp b/src/ca/ca3801.cpp index f5a7e679d..eebf5cf29 100755 --- a/src/ca/ca3801.cpp +++ b/src/ca/ca3801.cpp @@ -14,8 +14,8 @@ void TCRPA_report::merge_array(TString_array& c, TString_array& t, { while (c.items() > 0) { - TObject* cod = c.remove(0,true); - TObject* tes = t.remove(0,true); + TObject* cod = c.TArray::remove(0,true); + TObject* tes = t.TArray::remove(0,true); codici.TArray::add(cod); testate.TArray::add(tes); } diff --git a/src/ca/ca3883.h b/src/ca/ca3883.h index 0d9b24e43..cc1532740 100755 --- a/src/ca/ca3883.h +++ b/src/ca/ca3883.h @@ -1,11 +1,9 @@ #ifndef __CA3883_H #define __CA3883_H -#include #include #include "../cg/cglib.h" - #include "ca3883a.h" /////////////////////////////////////////////////////////////// diff --git a/src/ca/ca3900.cpp b/src/ca/ca3900.cpp index fb9ba5f78..cab4ef392 100755 --- a/src/ca/ca3900.cpp +++ b/src/ca/ca3900.cpp @@ -108,7 +108,8 @@ protected: virtual bool get_usr_val(const TString& name, TVariant& var) const; public: - virtual const char * get_excel_disabled_field() { return "H0.201|H0.202|H0.203|H0.204|H0.205"; } +// virtual const char * get_excel_header_section() override { return "H1"; } + virtual const char * get_excel_disabled_field() override { return "H0.100|H0.101|H0.201|H0.202|H0.203|H0.204|H0.205"; } void set_filter(const TPrint_stima_ricavi_mask& msk); }; @@ -195,10 +196,9 @@ TTrec * TPrint_stima_ricavi::get_dbase_recdesc(TReport & rep, const TAutomask & void TPrint_stima_ricavi::execute_print(TReport_book & book, TAutomask & mask, TReport & rep, export_type & type) { ((TPrint_stima_ricavi_rep &)rep).set_filter((TPrint_stima_ricavi_mask &)mask); - rep.set_export_sections(type); - book.add(rep); - rep.reset_export_sections(); + book.add(rep, type); } + bool TPrint_stima_ricavi::user_destroy() { safe_delete(_mask); @@ -227,4 +227,4 @@ int ca3900(int argc, char* argv[]) // CA_3900 // Gestore maschera ca3900 (Stima ricavi di competenza) -// Creatore del report e dell'applicazione \ No newline at end of file +// Creatore del report e dell'applicazione diff --git a/src/ca/ca3900.uml b/src/ca/ca3900.uml index c4f9aaa48..6f3c35fd6 100755 --- a/src/ca/ca3900.uml +++ b/src/ca/ca3900.uml @@ -1,6 +1,7 @@ #include "ca3883a.h" #define ALL_EXPORT +#define REPORT #define CLASS_NAME "ca3900" TOOLBAR "topbar" 0 0 0 2 diff --git a/src/ca/ca3900a.rep b/src/ca/ca3900a.rep index 6c86e921c..752e5260c 100755 --- a/src/ca/ca3900a.rep +++ b/src/ca/ca3900a.rep @@ -4,7 +4,6 @@