diff --git a/lv/lv4300.cpp b/lv/lv4300.cpp index cd75ca4ea..3563ec32f 100755 --- a/lv/lv4300.cpp +++ b/lv/lv4300.cpp @@ -27,51 +27,51 @@ #include #include -#define DITTA 0 -#define GRUPPO 1 -#define SPECIE 2 -#define CESPITE 3 -#define CODPADRE 4 -#define CEINCR 5 -#define NPROGR 6 -#define DESCR 7 -#define CEALIQ1 8 -#define PERCAMMANTIC 9 -#define COSTOACQ 10 -#define COSTODAAMM 11 -#define RIVALUTAZIONE 12 -#define RETTIFICHE 13 -#define FONDOAMMORT 14 -#define TOTAMMANTIC 15 -#define RIVALUTAMM 16 -#define CEDIMRIVALUTAMM 17 -#define AMMORTINDEDUCIBILE 18 -#define CREDIMPOSTA 19 -#define VENDCOSTOACQ 20 -#define VENDFDOAMM 21 -#define PLUSREINVEST 22 -#define VALORVEN 23 -#define DATAINIZAMM 24 -#define DATAACCANTONAM 25 -#define DATAALIENENAZIONE 26 -#define PERCDAAMM 27 -#define RIFERFATTVEN 28 -#define RIFERFATTACQ 29 -#define CODFOR 30 -#define CEDITFIL 31 -#define RIFERACQ 32 -#define CODCLI 33 -#define INAMMCOSTOES 34 -#define IMMATERIALI 35 -#define TIPOAMMORT 36 -#define CESSIONE 37 -#define RIFERVEN 38 -#define CEMANRIP 39 -#define PERCAMMSTD 40 -#define NQUOTEANTCALC 41 -#define NUMMOVCESP 42 -#define VENDFDOANT 43 -#define AMMDIPPADRE 44 +#define CGC_DITTA 0 +#define CGC_GRUPPO 1 +#define CGC_SPECIE 2 +#define CGC_CESPITE 3 +#define CGC_CODPADRE 4 +#define CGC_CEINCR 5 +#define CGC_NPROGR 6 +#define CGC_DESCR 7 +#define CGC_CEALIQ1 8 +#define CGC_PERCAMMANTIC 9 +#define CGC_COSTOACQ 10 +#define CGC_COSTODAAMM 11 +#define CGC_RIVALUTAZIONE 12 +#define CGC_RETTIFICHE 13 +#define CGC_FONDOAMMORT 14 +#define CGC_TOTAMMANTIC 15 +#define CGC_RIVALUTAMM 16 +#define CGC_CEDIMRIVALUTAMM 17 +#define CGC_AMMORTINDEDUCIBILE 18 +#define CGC_CREDIMPOSTA 19 +#define CGC_VENDCOSTOACQ 20 +#define CGC_VENDFDOAMM 21 +#define CGC_PLUSREINVEST 22 +#define CGC_VALORVEN 23 +#define CGC_DATAINIZAMM 24 +#define CGC_DATAACCANTONAM 25 +#define CGC_DATAALIENENAZIONE 26 +#define CGC_PERCDAAMM 27 +#define CGC_RIFERFATTVEN 28 +#define CGC_RIFERFATTACQ 29 +#define CGC_CODFOR 30 +#define CGC_CEDITFIL 31 +#define CGC_RIFERACQ 32 +#define CGC_CODCLI 33 +#define CGC_INAMMCOSTOES 34 +#define CGC_IMMATERIALI 35 +#define CGC_TIPOAMMORT 36 +#define CGC_CESSIONE 37 +#define CGC_RIFERVEN 38 +#define CGC_CEMANRIP 39 +#define CGC_PERCAMMSTD 40 +#define CGC_NQUOTEANTCALC 41 +#define CGC_NUMMOVCESP 42 +#define CGC_VENDFDOANT 43 +#define CGC_AMMDIPPADRE 44 /////////////////////////////////////////////////////////// // TAutomask @@ -127,21 +127,13 @@ bool TImporta_cesp_mask::on_field_event(TOperable_field& f, TField_event e, long /////////////////////////////////////// class TImporta_cesp : public TSkeleton_application { - virtual bool check_autorization() const {return false;} - virtual const char * extra_modules() const {return "ve";} - - TImporta_cesp_mask* _msk; - -//protected: - + TImporta_cesp_mask* _msk; public: virtual bool create(); virtual bool destroy(); virtual void main_loop(); void transfer(const TFilename& file); - - TImporta_cesp() {}; }; void TImporta_cesp::transfer(const TFilename& file) @@ -155,12 +147,12 @@ void TImporta_cesp::transfer(const TFilename& file) const TEsercizi_contabili esc; int lastes = esc.last(); - for (bool ok = s.move_first(); ok ; ok = s.move_next()) + for (bool ok = s.move_to(1); ok ; ok = s.move_next()) { if (!pi.addstatus(1)) break; - const long dt = s.get(DITTA).as_int(); + const long dt = s.get(CGC_DITTA).as_int(); if (ditta != dt) continue; @@ -177,16 +169,16 @@ void TImporta_cesp::transfer(const TFilename& file) conf.set("Mode","AUTO"); conf.set_paragraph("139"); // setto il paragrafo cespi - const long codces = s.get(NPROGR).as_int(); + const long codces = s.get(CGC_NPROGR).as_int(); conf.set(CESPI_IDCESPITE, format("%010ld", codces)); - conf.set(CESPI_CODCGR, s.get(GRUPPO).as_string()); - conf.set(CESPI_CODSP, s.get(SPECIE).as_string()); - conf.set(CESPI_CODCAT, s.get(CESPITE).as_string()); - conf.set(CESPI_DESC, s.get(DESCR).as_string()); + conf.set(CESPI_CODCGR, s.get(CGC_GRUPPO).as_string()); + conf.set(CESPI_CODSP, s.get(CGC_SPECIE).as_string()); + conf.set(CESPI_CODCAT, s.get(CGC_CESPITE).as_string()); + conf.set(CESPI_DESC, s.get(CGC_DESCR).as_string()); - conf.set(CESPI_DTFUNZ, s.get(DATAINIZAMM).as_string()); - conf.set(CESPI_DTALIEN, s.get(DATAALIENENAZIONE).as_string()); + conf.set(CESPI_DTFUNZ, s.get(CGC_DATAINIZAMM).as_string()); + conf.set(CESPI_DTALIEN, s.get(CGC_DATAALIENENAZIONE).as_string()); conf.set(CESPI_TPSPEMAN, 1); /* @@ -254,7 +246,7 @@ void TImporta_cesp::transfer(const TFilename& file) */ conf.set_paragraph("143"); // setto il paragrafo del file salce conf.set(SALCE_NUMELE, 1); - conf.set(SALCE_CSTO, s.get(COSTOACQ).as_string()); + conf.set(SALCE_CSTO, s.get(CGC_COSTOACQ).as_string()); /* #define SALCE_IDCESPITE "IDCESPITE" #define SALCE_CODES "CODES" @@ -348,11 +340,9 @@ void TImporta_cesp::transfer(const TFilename& file) } } - bool TImporta_cesp::create() { - _msk = new TImporta_cesp_mask(); - + _msk = new TImporta_cesp_mask(); return TSkeleton_application::create(); } @@ -375,13 +365,9 @@ void TImporta_cesp::main_loop() } } - -TImporta_cesp& app() { return (TImporta_cesp&) main_app(); } - - int lv4300 (int argc, char* argv[]) { TImporta_cesp main_app; - main_app.run(argc, argv, TR("Importazione cespiti")); + main_app.run(argc, argv, TR("Importazione cespiti COGECO")); return true; } \ No newline at end of file diff --git a/lv/lv4300a.uml b/lv/lv4300a.uml index a67c445c9..a5655119d 100755 --- a/lv/lv4300a.uml +++ b/lv/lv4300a.uml @@ -1,19 +1,7 @@ #include "lv4300a.h" TOOLBAR "" 0 0 0 2 - -BUTTON DLG_ELABORA 10 2 -BEGIN - PICTURE BMP_ELABORA - MESSAGE EXIT,K_ENTER - PROMPT -12 -1 "E~labora" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -22 -1 "" -END - +#include "elabar.h" ENDPAGE TOOLBAR "" 0 21 0 2 @@ -26,7 +14,7 @@ END ENDPAGE -PAGE "Importazione cespiti" 0 0 0 -3 +PAGE "Importazione cespiti COGECO" 0 0 0 -3 GROUPBOX DLG_NULL 90 3 BEGIN