From fbd1ada076dfc8130a2f60192e544347de789c6c Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 21 Apr 1999 12:25:37 +0000 Subject: [PATCH] Patch level : xx.282 Files correlati : Ricompilazione Demo : [ ] Commento : Riportata la versione 01.05 patch 282 git-svn-id: svn://10.65.10.50/trunk@8067 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- mg/mg0.url | 4 ++-- mg/mg1.url | 4 ++-- mg/mg1100.cpp | 3 +-- mg/mg1400.cpp | 13 ++++++++++++- mg/mg2.url | 4 ++-- mg/mg3.url | 4 ++-- mg/mg4.url | 4 ++-- mg/mg4300.cpp | 13 ++++++------- 8 files changed, 29 insertions(+), 20 deletions(-) diff --git a/mg/mg0.url b/mg/mg0.url index cc9a90ccd..be5531063 100755 --- a/mg/mg0.url +++ b/mg/mg0.url @@ -1,5 +1,5 @@ -#define APPNAME campo -#define QAPPNAME "campo" +#define APPNAME eurocamp +#define QAPPNAME "eurocampo" #define QFIRMNAME "A.G.A. Informatica Srl" #include diff --git a/mg/mg1.url b/mg/mg1.url index cc9a90ccd..be5531063 100755 --- a/mg/mg1.url +++ b/mg/mg1.url @@ -1,5 +1,5 @@ -#define APPNAME campo -#define QAPPNAME "campo" +#define APPNAME eurocamp +#define QAPPNAME "eurocampo" #define QFIRMNAME "A.G.A. Informatica Srl" #include diff --git a/mg/mg1100.cpp b/mg/mg1100.cpp index a9aea4b4d..59d9dc284 100755 --- a/mg/mg1100.cpp +++ b/mg/mg1100.cpp @@ -116,7 +116,6 @@ TMask_movmag::TMask_movmag(TCodgiac_livelli *l_m,TMov_mag * m_m) TMask_movmag::~TMask_movmag() { - delete curr_art; } // item varies from 1 to items() @@ -425,7 +424,7 @@ bool TMask_movmag::add_explrows(int r) const char tipo_costo = cau.get("S11")[0]; const int livello = cau.get_int("I0"); distinta.set_root(sheet.cell(r,sheet.cid2index(F_CODART))); - distinta.explode(boom, FALSE, 0, livello, "A"); + distinta.explode(boom, FALSE, RAGGR_EXP_NONE, livello, "A"); for (int newrow=0; newrow < boom.items() ; newrow++) { TRiga_esplosione & riga_esp=(TRiga_esplosione & )(boom[newrow]); diff --git a/mg/mg1400.cpp b/mg/mg1400.cpp index cd549ecc2..9f3c36d2b 100755 --- a/mg/mg1400.cpp +++ b/mg/mg1400.cpp @@ -148,6 +148,14 @@ bool TMask_openclose::handle_what(TMask_field &fld, KEY k) common_handler(fld); return TRUE; } + +bool TMask_openclose::handle_val(TMask_field &fld, KEY k) +{ + if (fld.to_check(k)) + common_handler(fld); + return TRUE; +} + // Corrispondenza elementi di _movimenti: #define CAUS_A_RIMIN 0 // movimento con causale di rimanenze iniziali #define CAUS_A_INCL 1 // " " " In conto lav. @@ -162,6 +170,9 @@ bool TMask_openclose::handle_what(TMask_field &fld, KEY k) // CAUS_A_QTA e CAUS_A_VAL vengono utilizzate solo se la chiusura è definitiva e la // valorizzazione impostata è FIFO/LIFO + + + class TApp_openclose : public TSkeleton_application { TLocalisamfile *_anamag, @@ -181,7 +192,7 @@ class TApp_openclose : public TSkeleton_application TDate _date_to_open; action _what; bool _valorizza_comp; - TTipo_valorizz _calctype,_stotype; // Stotype sta per sto-cazzo: valorizzazione per lo storico + TTipo_valorizz _calctype,_stotype; protected: virtual bool create(); diff --git a/mg/mg2.url b/mg/mg2.url index cc9a90ccd..be5531063 100755 --- a/mg/mg2.url +++ b/mg/mg2.url @@ -1,5 +1,5 @@ -#define APPNAME campo -#define QAPPNAME "campo" +#define APPNAME eurocamp +#define QAPPNAME "eurocampo" #define QFIRMNAME "A.G.A. Informatica Srl" #include diff --git a/mg/mg3.url b/mg/mg3.url index edcf837eb..7caa303c3 100755 --- a/mg/mg3.url +++ b/mg/mg3.url @@ -1,5 +1,5 @@ -#define APPNAME campo -#define QAPPNAME "campo" +#define APPNAME eurocamp +#define QAPPNAME "eurocampo" #define QFIRMNAME "A.G.A. Informatica Srl" #include diff --git a/mg/mg4.url b/mg/mg4.url index edcf837eb..7caa303c3 100755 --- a/mg/mg4.url +++ b/mg/mg4.url @@ -1,5 +1,5 @@ -#define APPNAME campo -#define QAPPNAME "campo" +#define APPNAME eurocamp +#define QAPPNAME "eurocampo" #define QFIRMNAME "A.G.A. Informatica Srl" #include diff --git a/mg/mg4300.cpp b/mg/mg4300.cpp index 54d701114..9c1c8b582 100755 --- a/mg/mg4300.cpp +++ b/mg/mg4300.cpp @@ -17,12 +17,12 @@ class TRegistro_giornalemag : public TRegistro_std { public: int freq_stampa() const { return get_int("I3"); } - bool raggruppato() const { return get_int("B1"); } - bool ragg_mag() const { return get_int("B2"); } - bool ragg_giac() const { return get_int("B3"); } - bool ragg_clafis() const { return get_int("B4"); } - bool ragg_grpfis() const { return get_int("B5"); } - bool ragg_caus() const { return get_int("B6"); } + bool raggruppato() const { return get_bool("B1"); } + bool ragg_mag() const { return get_bool("B2"); } + bool ragg_giac() const { return get_bool("B3"); } + bool ragg_clafis() const { return get_bool("B4"); } + bool ragg_grpfis() const { return get_bool("B5"); } + bool ragg_caus() const { return get_bool("B6"); } int last_numreg() const { return get_int("I4"); } void set_last_numreg(long n) { put("I4",n); } @@ -500,7 +500,6 @@ bool TStampa_giornalemag::create() bool TStampa_giornalemag::destroy() { - delete _files; delete _mask; return TRUE; }