diff --git a/ba/ba1103.cpp b/ba/ba1103.cpp index e46333457..01da79f1f 100755 --- a/ba/ba1103.cpp +++ b/ba/ba1103.cpp @@ -236,15 +236,15 @@ bool send_campo_xml() bool ok = save_campo_xml(); if (ok && (xvt_net_get_status() & 0x4) != 0) { - TSocketClient aga; - CONNID id = aga.QueryConnection("21", "85.18.53.183"); + TSocketClient sirio; + CONNID id = sirio.QueryConnection("21", "85.18.53.183"); if (id > 0) { TFilename local, remote; build_xml_filename(local, false); build_xml_filename(remote, true); - ok = aga.FtpSendFile(id, remote, local, "attivazioni", "viagra"); - aga.RemoveConnection(id); + ok = sirio.FtpSendFile(id, remote, local, "attivazioni", "viagra"); + sirio.RemoveConnection(id); } } return ok; diff --git a/ba/ba1700.cpp b/ba/ba1700.cpp index 4c036670b..d69ad3ce2 100755 --- a/ba/ba1700.cpp +++ b/ba/ba1700.cpp @@ -32,8 +32,16 @@ /////////////////////////////////////////////////////// // Metodi di utility /////////////////////////////////////////////////////// -HIDDEN const TString& http_default_path() -{ return get_oem_info("Web", "http://85.18.53.183/release110/");} + +HIDDEN const TString& http_default_path() +{ + int y,r,t,p; + main_app().get_version_info(y, r, t, p); + TString& site = get_tmp_string(); + site.format("http://85.18.53.183/release%02d0/", r); + return site; +} + HIDDEN int compare_version(const char* v1, int p1, const char* v2, int p2) { @@ -1882,7 +1890,7 @@ TInstaller_mask::TInstaller_mask() autoload(); else //senno' cerca su internet se trova un path internet completo e la connessione funzionante { - if (_station_type != 3 && webpath.find("aga.it") > 0) + if (_station_type != 3 && webpath.find("//") > 0) { set(F_TYPE, "1", 0x1); autoload(); diff --git a/ba/ba4.cpp b/ba/ba4.cpp index b1fdf3045..18124099b 100755 --- a/ba/ba4.cpp +++ b/ba/ba4.cpp @@ -7,21 +7,14 @@ int main(int argc,char** argv) const int r = (argc > 1) ? argv[1][1]-'0' : 0; switch (r) { - case 1: - ba4200(argc,argv) ; break; //Anagrafica persone fisiche e giuridiche - case 2: - ba4300(argc,argv) ; break; //Ditte - case 3: - ba4400(argc,argv) ; break; - case 4: - ba4500(argc,argv) ; break; - case 5: - ba4600(argc,argv) ; break; - default: - ba4100(argc,argv) ; break; //Tabella Comuni - break; + case 1: ba4200(argc,argv); break; // Persone Fisiche e Giuridiche + case 2: ba4300(argc,argv); break; // Ditte + case 3: ba4400(argc,argv); break; // Unità Locali + case 4: ba4500(argc,argv); break; // Attività + case 5: ba4600(argc,argv); break; // Soci + case 6: ba4700(argc,argv); break; // Contatti + default: ba4100(argc,argv); break; // Comuni } - exit(0); return 0; } diff --git a/ba/ba4.h b/ba/ba4.h index c66c2b425..6553a10ba 100755 --- a/ba/ba4.h +++ b/ba/ba4.h @@ -7,5 +7,6 @@ int ba4300(int argc, char* argv[]); int ba4400(int argc, char* argv[]); int ba4500(int argc, char* argv[]); int ba4600(int argc, char* argv[]); +int ba4700(int argc, char* argv[]); #endif diff --git a/ba/ba4700.cpp b/ba/ba4700.cpp new file mode 100644 index 000000000..3443489d5 --- /dev/null +++ b/ba/ba4700.cpp @@ -0,0 +1,39 @@ +#include + +#include "ba4.h" +#include "ba4700a.h" + +class TContact_application : public TRelation_application +{ + TMask* _msk; + TRelation* _rel; + +protected: + virtual bool user_create() ; + virtual bool user_destroy() ; + virtual TMask* get_mask(int mode) { return _msk;} + virtual TRelation* get_relation() const { return _rel;} + +public: +}; + +bool TContact_application::user_create() +{ + _rel = new TRelation(LF_CONTACT) ; + _msk = new TMask("ba4700a") ; + return true; +} + +bool TContact_application::user_destroy() +{ + delete _msk; + delete _rel; + return true; +} + +int ba4700(int argc, char* argv[]) +{ + TContact_application a; + a.run(argc, argv, TR("Contatti")); + return 0; +} diff --git a/ba/ba4700a.h b/ba/ba4700a.h new file mode 100644 index 000000000..0624c140d --- /dev/null +++ b/ba/ba4700a.h @@ -0,0 +1,7 @@ +#define F_CONTACT 101 +#define F_COGNOME 102 +#define F_NOME 103 + +#define F_TIPOCF 111 +#define F_CODCF 112 +#define F_RAGSOC 113 diff --git a/ba/ba4700a.uml b/ba/ba4700a.uml new file mode 100644 index 000000000..8c8be809a --- /dev/null +++ b/ba/ba4700a.uml @@ -0,0 +1,90 @@ +#include "ba4700a.h" + +TOOLBAR "" 0 0 0 2 +#include +ENDPAGE + +PAGE "Contatti" -1 -1 77 20 + +GROUPBOX DLG_NULL 76 5 +BEGIN + PROMPT 1 0 "@bCodici" +END + +NUMBER F_CONTACT 6 +BEGIN + PROMPT 2 1 "Cod." + USE LF_CONTACT + INPUT CONTACT F_CONTACT + DISPLAY "Codice" CONTACT + DISPLAY "Cognome@50" COGNOME + DISPLAY "Nome@50" NOME + DISPLAY "Alternativo@20" CODALT + OUTPUT F_CONTACT CONTACT + CHECKTYPE FORCED + FIELD CONTACT + KEY 1 3 +END + +STRING F_COGNOME 50 +BEGIN + PROMPT 16 1 "Cognome " + USE LF_CONTACT KEY 2 + INPUT COGNOME F_COGNOME + INPUT NOME F_NOME + DISPLAY "Cognome@50" COGNOME + DISPLAY "Nome@50" NOME + DISPLAY "Codice" CONTACT + DISPLAY "Alternativo@20" CODALT + OUTPUT F_CONTACT CONTACT + CHECKTYPE REQUIRED + FIELD COGNOME + KEY 2 +END + +STRING F_NOME 50 +BEGIN + PROMPT 16 2 "Nome " + COPY ALL F_COGNOME + CHECKTYPE REQUIRED + FIELD NOME + KEY 2 +END + +LIST F_TIPOCF 1 10 +BEGIN + PROMPT 2 3 "" + ITEM "C|Cliente" + ITEM "F|Fornitore" + KEY 3 +END + +NUMBER F_CODCF 6 +BEGIN + PROMPT 15 3 "" + USE LF_CLIFO + INPUT TIPOCF F_TIPOCF + DISPLAY "Codice" CODCF + DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Cod. Alt.@15" RICALT + DISPLAY "Codice Fiscale@16" COFI + DISPLAY "Partita IVA@15" PAIV + OUTPUT F_CODCF CODCF + CHECKTYPE NORMAL + KEY 3 +END + +STRING F_RAGSOC 50 +BEGIN + PROMPT 24 3 "" + USE LF_CLIFO KEY 2 + DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Cod. Alt.@15" RICALT + DISPLAY "Codice" CODCF + DISPLAY "Codice Fiscale@16" COFI + DISPLAY "Partita IVA@15" PAIV + COPY OUTPUT F_CODCF + CHECKTYPE NORMAL +END + +ENDMASK diff --git a/ba/bainst00.cpp b/ba/bainst00.cpp index f844a65f9..ce45539c5 100755 --- a/ba/bainst00.cpp +++ b/ba/bainst00.cpp @@ -92,7 +92,7 @@ bool TInstall_BA::comuni_to_load() const comuni.put(COM_COM, "M314"); //se il comune M314 non c'è -> il file dei comuni è da aggiornare const int err = comuni.read(); - return err != NOERR; + return err != NOERR; } bool TInstall_BA::something_to_load() const diff --git a/ba/bainst46.uml b/ba/bainst46.uml index 424128405..89ae87d03 100644 --- a/ba/bainst46.uml +++ b/ba/bainst46.uml @@ -4,7 +4,7 @@ PAGE "Installazione HA" -1 -1 78 8 BOOL F_DEFAULTSDATA BEGIN - PROMPT 2 2 "Caricare le tabelle del modulo Hardy caffe'" + PROMPT 2 2 "Caricare le tabelle del modulo Caffè Hardy" END BUTTON DLG_OK 10 2 diff --git a/ba/f170.dir b/ba/f170.dir new file mode 100644 index 000000000..23a83678a --- /dev/null +++ b/ba/f170.dir @@ -0,0 +1,3 @@ +170 +0 +$contact|0|0|598|0|Contatti||| diff --git a/ba/f170.trr b/ba/f170.trr new file mode 100644 index 000000000..72cdbeef9 --- /dev/null +++ b/ba/f170.trr @@ -0,0 +1,33 @@ +170 +26 +CONTACT|3|6|0|Codice Contatto +TITOLO|1|20|0|Titolo +NOME|1|50|0|Nome +COGNOME|1|50|0|Cognome +CODALT|1|20|0|Nome alternativo +TIPOCF|1|1|0|Tipo Cliente/Fornitore (opzionale) +CODCF|3|6|0|Codice cliente (opzionale) +QUALIFICA|1|20|0|Qualifica +MAIL|1|30|0|Mail Ufficio +MAIL2|1|30|0|Mail personale +NUMTEL|1|30|0|Telefono Ufficio +NUMCEL|1|30|0|Cellulare Ufficio +NUMTEL2|1|30|0|Telefono Casa +NUMCEL2|1|30|0|Cellulare personale +NUMFAX|1|30|0|Fax Ufficio +NUMFAX2|1|30|0|Fax casa +INDIR|1|50|0|Indirizzo Ufficio +STATO|1|3|0|Stato Ufficio +CODCOM|1|4|0|Comune Ufficio +CAP|1|5|0|CAP +LOCALITA|1|30|0|Località Ufficio +INDIR2|1|50|0|Indirizzo Casa +STATO2|1|3|0|Stato Casa +CODCOM2|1|4|0|Comune Casa +CAP2|1|5|0|CAP casa +LOCALITA2|1|30|0|Località Casa +4 +CONTACT| +COGNOME+NOME|X +TIPOCF+CODCF+CONTACT| +CODALT|X