From 78d820ed3ab255c4259e17d66e7bc853173a7172 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Fri, 3 Mar 2017 15:55:27 +0000 Subject: [PATCH] Patch level : 12.0 360 Files correlati : cg4.exe Corretta la stampa dei registri riepilogativo, stampava l'intestazione anche quando non doveva. git-svn-id: svn://10.65.10.50/branches/R_10_00@23677 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/cg/cg4300.cpp | 2 +- src/cg/cg7401.h | 174 +++++++++++++++++++++++----------------------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/cg/cg4300.cpp b/src/cg/cg4300.cpp index b7c5e9b49..942e75310 100755 --- a/src/cg/cg4300.cpp +++ b/src/cg/cg4300.cpp @@ -169,7 +169,7 @@ bool TLiquidazione_app::user_create() // R = solo ricalcolo per registri: aggiorna solo progressivi PRM e PRP. Non fa niente altro ne write_liq() ne pim, ne stampe... // V = stampa ed ev. ricalcolo per visualizzazione // s o l minuscoli = registro bollato - _isregis = (toupper(rcl == 'L') || toupper(rcl == 'S')); // stampa per registri + _isregis = ((toupper(rcl) == 'L') || (toupper(rcl) == 'S')); // stampa per registri _isfinal = (rcl == 'l' || rcl == 's'); // se l minuscolo, definitivo calc |= toupper(rcl) != 'S'; printdate = subj.get(4); diff --git a/src/cg/cg7401.h b/src/cg/cg7401.h index e30715fd4..49fc463d2 100644 --- a/src/cg/cg7401.h +++ b/src/cg/cg7401.h @@ -1,93 +1,93 @@ -// Programma per la stampa del quadri IVA - -#include -#include -#include -#include -#include -#include - -#include - -class TQuadro_IVA_mask : public TAutomask -{ - int _year; - long _last_row_ditte; - long _last_row_reports; - TArray _reports; - -protected: - void build_ditte_sheet(); - void build_report_sheet(); - -public: - const int get_year() const { return _year; } - void restart_ditte() { _last_row_ditte = -1;} - void restart_reports() { _last_row_reports = -1;} - long get_ditta(); - TProgram_report * get_report(); - TProgram_report & get_report(const int code) const { return (TProgram_report &) _reports[code];} - TISAM_recordset * get_recset(const int code) const { return (TISAM_recordset *)((TProgram_report &) _reports[code - 1]).recordset();} - virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); - - TQuadro_IVA_mask(const char * mask_name); - ~TQuadro_IVA_mask() {} -}; - -class TQuadro_IVA_recordset : public TISAM_recordset -{ - TAssoc_array _values; - TAssoc_array _types; +// Programma per la stampa del quadri IVA + +#include +#include +#include +#include +#include +#include + +#include + +class TQuadro_IVA_mask : public TAutomask +{ + int _year; + long _last_row_ditte; + long _last_row_reports; + TArray _reports; + +protected: + void build_ditte_sheet(); + void build_report_sheet(); + +public: + const int get_year() const { return _year; } + void restart_ditte() { _last_row_ditte = -1;} + void restart_reports() { _last_row_reports = -1;} + long get_ditta(); + TProgram_report * get_report(); + TProgram_report & get_report(const int code) const { return (TProgram_report &) _reports[code];} + TISAM_recordset * get_recset(const int code) const { return (TISAM_recordset *)((TProgram_report &) _reports[code - 1]).recordset();} + virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); + + TQuadro_IVA_mask(const char * mask_name); + ~TQuadro_IVA_mask() {} +}; + +class TQuadro_IVA_recordset : public TISAM_recordset +{ + TAssoc_array _values; + TAssoc_array _types; TQuadro_IVA_mask * _mask; int _year; - -protected: - void add_value(const char *s, real value); - void set_bool(const char *s, bool on = false); - virtual void load() pure; - virtual const TVariant& get(const char* column_name) const; - void clear() { _values.destroy(); _types.destroy(); } + +protected: + void add_value(const char *s, real value); + void set_bool(const char *s, bool on = false); + virtual void load() pure; + virtual const TVariant& get(const char* column_name) const; + void clear() { _values.destroy(); _types.destroy(); } const real evaluate_recordset(const int code, const int year, const char * field, const char * expr = NULL); const real evaluate_recordset_imponibile(const int code, const int year, const char * expr = NULL) { return evaluate_recordset(code, year, RMI_IMPONIBILE, expr); } const real evaluate_recordset_imposta(const int code, const int year, const char * expr = NULL) { return evaluate_recordset(code, year, RMI_IMPOSTA, expr); } - -public: - TQuadro_IVA_recordset(TQuadro_IVA_mask * mask, const char* use, const int year) : TISAM_recordset(use), _mask(mask), _year(year) { } - TQuadro_IVA_recordset(const TQuadro_IVA_recordset * recset); - TQuadro_IVA_recordset(const TQuadro_IVA_recordset & recset); - int year() { return _year; } - virtual ~TQuadro_IVA_recordset() {} -}; - -class TQuadro_IVA_report : public TProgram_report -{ -protected: - -public: - TQuadro_IVA_report(const char * report_name); -}; - -class TQuadro_IVA_app : public TSkeleton_application -{ - TQuadro_IVA_mask * _mask; - TFilename _name; - const TString20 _print_title; - -protected: - virtual bool create(); - virtual void print(); - virtual void main_loop(); - virtual char last_quadro_report() const { return 'a';} - -public: - virtual TQuadro_IVA_recordset * app_recordset(const char* use, const int year) pure; - virtual void load_sheet(TSheet_field & sf) {} - virtual bool firm_change_enabled() const { return false; } - TQuadro_IVA_mask * mask() const { return _mask; } - - TQuadro_IVA_app(const char * print_title, const char * name) - : _print_title(print_title), _name(name) {} - virtual ~TQuadro_IVA_app() {} -}; - + +public: + TQuadro_IVA_recordset(TQuadro_IVA_mask * mask, const char* use, const int year) : TISAM_recordset(use), _mask(mask), _year(year) { } + TQuadro_IVA_recordset(const TQuadro_IVA_recordset * recset); + TQuadro_IVA_recordset(const TQuadro_IVA_recordset & recset); + int year() { return _year; } + virtual ~TQuadro_IVA_recordset() {} +}; + +class TQuadro_IVA_report : public TProgram_report +{ +protected: + +public: + TQuadro_IVA_report(const char * report_name); +}; + +class TQuadro_IVA_app : public TSkeleton_application +{ + TQuadro_IVA_mask * _mask; + TFilename _name; + const TString20 _print_title; + +protected: + virtual bool create(); + virtual void print(); + virtual void main_loop(); + virtual char last_quadro_report() const { return 'a';} + +public: + virtual TQuadro_IVA_recordset * app_recordset(const char* use, const int year) pure; + virtual void load_sheet(TSheet_field & sf) {} + virtual bool firm_change_enabled() const { return false; } + TQuadro_IVA_mask * mask() const { return _mask; } + + TQuadro_IVA_app(const char * print_title, const char * name) + : _print_title(print_title), _name(name) {} + virtual ~TQuadro_IVA_app() {} +}; + TQuadro_IVA_app & app(); \ No newline at end of file