From f6ae549c3bdff67bb4fffb436da1f4960cafaa75 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 23 Dec 2011 10:14:40 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : batbsta.msk batbiva.msk Ricompilazione Demo : [ ] Commento : Aggiunti alla tabella stata i codici ISTAT e UNICO Tolta da tabella IVA la distinzione tra beni e servizi git-svn-id: svn://10.65.10.50/branches/R_10_00@22531 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba1700.cpp | 6 ++++++ ba/ba2800.cpp | 20 +++++++++++++++----- ba/ba8301.cpp | 10 +++++++++- ba/batbiva.uml | 2 ++ ba/batbsta.h | 14 ++++++++------ ba/batbsta.uml | 30 +++++++++++++++++++++++------- 6 files changed, 63 insertions(+), 19 deletions(-) diff --git a/ba/ba1700.cpp b/ba/ba1700.cpp index 5717d69f6..09f3c04e1 100755 --- a/ba/ba1700.cpp +++ b/ba/ba1700.cpp @@ -589,6 +589,12 @@ bool TInstaller_mask::autoload() TString& str = modules.row(i); if (str.match("??????a.ini", true)) { + const TString& module = str.left(2); + const int patch = atoi(str.mid(2, 4)); + const int mypatch = ini_get_int(CONFIG_GENERAL, module, "Patch"); + if (patch > 0 && patch < mypatch) + continue; // Non fare il download delle patch inutili + TFilename remote = http_path; remote << str; diff --git a/ba/ba2800.cpp b/ba/ba2800.cpp index 633c13907..cf2cc75ca 100644 --- a/ba/ba2800.cpp +++ b/ba/ba2800.cpp @@ -180,7 +180,12 @@ bool Tdnist_full::save() const } if (done) + { done = dninst.encode(DNINST_TXT); +#ifdef DBG + fcopy(DNINST_TXT, "../setup/dninst.txt"); +#endif + } return done; } @@ -593,9 +598,14 @@ bool Tdnist_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) } } break; - case F_FTP: - if (e == fe_init && o.empty()) - o.set("ftp://guastalla:tk0nmo4q3@www.aga.it/release/v_10.0/program"); + case F_DNINST_ON: + if (e == fe_init) + { + if (field(F_DNINST).empty()) + set(F_DNINST, "ftp://guastalla:tk0nmo4q3@www.aga.it/release/v_10.0/program"); + if (field(F_FTP).empty()) + set(F_FTP, "ftp://attivazioni:viagra@www.aga.it"); + } break; case F_DSN: if (e == fe_button && !o.empty()) @@ -642,7 +652,6 @@ bool Tdnist_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) break; default: break; } - return true; } @@ -680,7 +689,8 @@ protected: bool Tdninst_manager::create() { const word n = dongle().number(); - if (n != 8453 && n != 8517 && n != 8578 && !is_power_station()) + // 8453 = Ilaria; 8517 = Sara; 8578 = Monica + if (n != 8453 && n != 8517 && !is_power_station()) return error_box(TR("Postazione non abilitata")); if (user() != dongle().administrator()) diff --git a/ba/ba8301.cpp b/ba/ba8301.cpp index e3f2b156b..2d15522ca 100755 --- a/ba/ba8301.cpp +++ b/ba/ba8301.cpp @@ -627,7 +627,7 @@ bool TReport_base_mask::on_field_event(TOperable_field& o, TField_event e, long break; case F_PRESCRIPT: case F_POSTSCRIPT: - if (e == fe_close) + if (e == fe_close && !o.empty()) { TReport_script s; s.set(o.get()); @@ -787,6 +787,14 @@ bool TReport_field_mask::on_field_event(TOperable_field& o, TField_event e, long return error_box(TR("Specificare almeno due codici")); } break; + case F_PRESCRIPT: + case F_POSTSCRIPT: + if (e == fe_close && !o.empty()) + { + if (_report.prescript().starts_with(":")) + _report.compile_prescript(); // Compila eventuali nuove word + } + break; case DLG_FINDREC: if (e == fe_button) { diff --git a/ba/batbiva.uml b/ba/batbiva.uml index 55c1d774f..19046d6dd 100755 --- a/ba/batbiva.uml +++ b/ba/batbiva.uml @@ -133,6 +133,7 @@ BEGIN ITEM "5|5 - Imponibile con IVA a Margine" END +/* Reso obsoleto da ultime specifiche Spesometro di Settembre 2011 RADIOBUTTON CHK_SERVIZI 20 BEGIN PROMPT 59 6 "Cessione / Acquisto" @@ -141,6 +142,7 @@ BEGIN FLAGS "Z" FIELD B5 END +*/ STRING FLD_TABIVA_I3 3 BEGIN diff --git a/ba/batbsta.h b/ba/batbsta.h index 41d2bb640..a5506c532 100755 --- a/ba/batbsta.h +++ b/ba/batbsta.h @@ -1,8 +1,10 @@ #define FLD_TABSTA_CODTAB 100 -#define FLD_TABSTA_S0 101 -#define FLD_TABSTA_S7 102 +#define FLD_TABSTA_S0 101 +#define FLD_TABSTA_S7 102 #define FLD_TABSTA_S7_TABVAL_S0 103 -#define FLD_TABSTA_S2 104 -#define DLG_DEL 105 -#define F_BLACKLIST 106 -#define F_SANMARINO 107 +#define FLD_TABSTA_S2 104 +#define DLG_DEL 105 +#define FLD_BLACKLIST 106 +#define FLD_SANMARINO 107 +#define FLD_UNICO 108 +#define FLD_ISTAT 109 diff --git a/ba/batbsta.uml b/ba/batbsta.uml index a8f635e42..f64e0cb65 100755 --- a/ba/batbsta.uml +++ b/ba/batbsta.uml @@ -71,25 +71,41 @@ BEGIN HELP "Valuta corrente dello stato" END -STRING FLD_TABSTA_S2 10 +STRING FLD_TABSTA_S2 20 BEGIN - PROMPT 2 11 "Nazionalita' " + PROMPT 2 11 "Nazionalità " FIELD S2 - HELP "Nazionalita' corrispondente a questo stato" + HELP "Nazionalità corrispondente a questo stato" END -BOOLEAN F_BLACKLIST +BOOLEAN FLD_BLACKLIST BEGIN - PROMPT 2 13 "Paese a fiscalità agevolata" + PROMPT 2 13 "Paese a fiscalità agevolata (Black List)" FIELD B0 END -BOOLEAN F_SANMARINO +BOOLEAN FLD_SANMARINO BEGIN - PROMPT 2 15 "San Marino" + PROMPT 2 14 "San Marino" FIELD B1 END +NUMBER FLD_UNICO 3 +BEGIN + PROMPT 51 13 "Codice UNICO " + FLAGS "Z" + FIELD S8 + HELP "Codice stato da indicare sul modello UNICO e sullo Spesometro. Es. Svizzera=071" +END + +NUMBER FLD_ISTAT 3 +BEGIN + PROMPT 51 14 "Codice ISTAT " + FLAGS "Z" + FIELD S9 + HELP "Codice ISTAT dello stato. Es. Svizzera=241 " +END + ENDPAGE ENDMASK