diff --git a/ef/SiaggSE/ConnectionDefault b/ef/SiaggSE/ConnectionDefault new file mode 100644 index 000000000..262ff061e --- /dev/null +++ b/ef/SiaggSE/ConnectionDefault @@ -0,0 +1,12 @@ +#Connection Default Properties +#Mon May 30 17:43:31 CEST 2005 +database.user= +database.password= +database.name= +database.type=sqllite +database.url=jdbc\:sqlite\:f\:\\clienti\\DINAMICA\\SEPA\\SEPA00100.db +classForName=org.sqlite.JDBC +path.SEPA.BON=f\:\\clienti\\DINAMICA\\SEPA\\BON +path.SEPA.BON.log=f\:\\clienti\\DINAMICA\\SEPA\\BON +path.SEPA.RID=f\:\\clienti\\DINAMICA\\SEPA\\RID +path.SEPA.RID.log=f\:\\clienti\\DINAMICA\\SEPA\\RID diff --git a/ef/SiaggSE/classes/CreaXMLSCTMain.class b/ef/SiaggSE/classes/CreaXMLSCTMain.class new file mode 100644 index 000000000..d52dc9503 Binary files /dev/null and b/ef/SiaggSE/classes/CreaXMLSCTMain.class differ diff --git a/ef/SiaggSE/classes/CreaXMLSDDMain.class b/ef/SiaggSE/classes/CreaXMLSDDMain.class new file mode 100644 index 000000000..8ef9db008 Binary files /dev/null and b/ef/SiaggSE/classes/CreaXMLSDDMain.class differ diff --git a/ef/SiaggSE/classes/CreaXMLSEPA.class b/ef/SiaggSE/classes/CreaXMLSEPA.class new file mode 100644 index 000000000..625b00e78 Binary files /dev/null and b/ef/SiaggSE/classes/CreaXMLSEPA.class differ diff --git a/ef/SiaggSE/classes/GetConnectionBUS.class b/ef/SiaggSE/classes/GetConnectionBUS.class new file mode 100644 index 000000000..896b5e91e Binary files /dev/null and b/ef/SiaggSE/classes/GetConnectionBUS.class differ diff --git a/ef/SiaggSE/classes/VarieBUS.class b/ef/SiaggSE/classes/VarieBUS.class new file mode 100644 index 000000000..6f7b29157 Binary files /dev/null and b/ef/SiaggSE/classes/VarieBUS.class differ diff --git a/ef/SiaggSE/lancioSCTxx.bat b/ef/SiaggSE/lancioSCTxx.bat new file mode 100644 index 000000000..d8ecb6d30 --- /dev/null +++ b/ef/SiaggSE/lancioSCTxx.bat @@ -0,0 +1 @@ +javaw -classpath .\classes;.\sqlite-jdbc4-3.8.2-SNAPSHOT.jar CreaXMLSCTMain %1 diff --git a/ef/SiaggSE/lancioSDDxx.bat b/ef/SiaggSE/lancioSDDxx.bat new file mode 100644 index 000000000..963f422a1 --- /dev/null +++ b/ef/SiaggSE/lancioSDDxx.bat @@ -0,0 +1 @@ +javaw -classpath .\classes;.\sqlite-jdbc4-3.8.2-SNAPSHOT.jar CreaXMLSDDMain %1 diff --git a/ef/SiaggSE/sqlite-jdbc4-3.8.2-SNAPSHOT.jar b/ef/SiaggSE/sqlite-jdbc4-3.8.2-SNAPSHOT.jar new file mode 100644 index 000000000..cd8309061 Binary files /dev/null and b/ef/SiaggSE/sqlite-jdbc4-3.8.2-SNAPSHOT.jar differ diff --git a/ef/ef0101.h b/ef/ef0101.h index 6b264d034..4abfc9f86 100755 --- a/ef/ef0101.h +++ b/ef/ef0101.h @@ -14,8 +14,8 @@ //////////////////////////////////////////////////////////// class TEffetto:public TRectype { - TRecord_array _righe;// righe dell'effetto - TRecord_array _cess;// cessionari dell'effetto + TRecord_array _righe; // righe dell'effetto + TRecord_array _cess; // cessionari dell'effetto protected: // ritorna la prossima chiave diff --git a/ef/ef0500.cpp b/ef/ef0500.cpp index 84f7f9ada..2316605a3 100755 --- a/ef/ef0500.cpp +++ b/ef/ef0500.cpp @@ -315,7 +315,7 @@ void TEmissione::floppy() //scandisco tutti i record di un effetto FOR_EACH_ARRAY_ROW(keys, i, rec) record(*rec);//emetto il record - if (!pi.add_status(1)) + if (!pi.add_status()) break; } footer_ef(); //chiusura flusso effetti @@ -345,7 +345,7 @@ void TEmissione::floppy() } } - if (!pi.add_status(1)) + if (!pi.add_status()) break; } } @@ -373,8 +373,7 @@ void TEmissione::save_data_emis() effetto.put(EFF_NUMEMISS, numero); effetto.put(EFF_DATAEMISS, data_emis); effetto.put(EFF_DATARIBA, data_emis); - bool cond = TRUE; - effetto.put(EFF_DISRIBAEST, cond); + effetto.put(EFF_DISRIBAEST, true); effetto.rewrite(effetti); } @@ -769,7 +768,7 @@ bool TRiba_form::validate(TForm_item &cf, TToken_string &s) } valore = cf.get(); cf.put_paragraph(valore); - return (TRUE); + return true; } else if (code == "_CLI") @@ -819,7 +818,7 @@ bool TRiba_form::validate(TForm_item &cf, TToken_string &s) valore = rel->curr(pick_normal ? LF_CLIFO : LF_INDSP).get(pick_normal ? CLI_CAPCF : IND_CAP); } cf.put_paragraph(valore); - return (TRUE); + return true; } return TForm::validate(cf, s); } @@ -903,17 +902,6 @@ bool TDistinta_form::validate(TForm_item &cf, TToken_string &s) cf.set(valore); } else if (in == "CFPI") - { - valore = _firmrel->curr(LF_ANAG).get("PAIV"); - valore.trim(); - if (valore.empty()) - { - valore = _firmrel->curr(LF_ANAG).get("COFI"); - valore.trim(); - } - cf.set(valore); - } else - if (in == "CFPI") { valore = _firmrel->curr(LF_ANAG).get("PAIV"); valore.trim(); @@ -1041,15 +1029,15 @@ char TRiba_file::tipo_incasso(const TRectype& eff) const const char* TRiba_file::tipo_sequenza(const TRectype& eff) const { const char* seq = "RCUR"; - const TRectype& mandato = cache().get("&MAN", eff.get(EFF_MANDATO)); - if (!mandato.empty()) - seq = mandato.get("S6"); + const TString& mandato = cache().get("&MAN", eff.get(EFF_MANDATO), "S6"); + if (mandato.full()) + seq = mandato; return seq; } TDate TRiba_file::data_mandato(const TRectype& eff) const { - TDate dm = cache().get("&MAN", eff.get(EFF_MANDATO), "D0"); + const TDate dm = cache().get("&MAN", eff.get(EFF_MANDATO), "D0"); return dm; } @@ -1238,12 +1226,9 @@ void TRiba_file::validate(TCursor& cur,TRecord_text &rec, TToken_string &s, TStr else if (in=="CFPI") { valore = clifo_1.get("PAIV"); - valore.trim(); - if (valore.empty()) - { + if (valore.blank()) valore = clifo_1.get("COFI"); - valore.trim(); - } + valore.trim(); } else CHECKS (TRUE,"Sotto-Macro _DEBITORE non definita",(const char *)in); @@ -1375,7 +1360,8 @@ void TRiba_file::validate(TCursor& cur,TRecord_text &rec, TToken_string &s, TStr else if (code == "_CREDITORID") { valore = cur.curr(-403).get("S4"); - } else if (code == "_CODMON") + } + else if (code == "_CODMON") { valore.format("%c", _codice_moneta); // Fisso 'E' } diff --git a/ef/efmenu.men b/ef/efmenu.men index f85f8b69b..38fa96bf3 100755 --- a/ef/efmenu.men +++ b/ef/efmenu.men @@ -12,4 +12,5 @@ Item_06 = "Stampe di controllo", "ef0 -5", "F" Item_07 = "Configurazione modulo", "ef0 -8", "F" Item_08 = "Disposizioni incassi/pagamenti", "ef0 -9", "F" Item_09 = "Mandati RID", "ef0 -1 &MAN", "F" +Item_10 = "Generazione file SEPA", "ef1 -0", "F"