git-svn-id: svn://10.65.10.50/branches/R_10_00@22748 c028cbd2-c16b-5b4b-a496-9718f37d4682

setup/dninst.txt

@@ -28,7 +28,7 @@ Owner=Digit Studios
 OEM=0
 MustCall=22-09-2011
 [208]
-Owner=CO.SE.A
+Owner=CO.SE.A scrl
 OEM=1
 [209]
 Owner=Luca Benny
@@ -106,30 +106,21 @@ Owner=DERBY Plus SRL
 OEM=5
 MustCall=20-09-2011
 [701]
-*=25-12-2011
 Owner=Itertec (TS Lazio)
 OEM=7
 MustCall=22-09-2011
 [702]
-*=25-12-2011
 Owner=Itertec (Valentini)
 OEM=7
-MustCall=06-06-2012
 [703]
-*=25-12-2011
 Owner=CIS informatica srl
 OEM=7
-MustCall=06-06-2012
 [704]
-*=25-12-2011
 Owner=Itertec (TS Lazio)
 OEM=7
-MustCall=06-06-2012
 [705]
-*=25-12-2011
 Owner=Itertec (TS Lazio)
 OEM=7
-MustCall=06-06-2012
 [801]
 Owner=Salvatore Durante
 OEM=8
@@ -156,6 +147,7 @@ Owner=ANIVAL
 ve3 -7=31-12-3000
 OEM=0
 [1031]
+*=31-12-2011
 Owner=Alore casa
 OEM=0
 [1045]
@@ -171,7 +163,7 @@ Owner=Frigeri
 OEM=0
 [1080]
 *=31-12-2008
-Owner=COSEA?
+Owner=CO.SE.A?
 OEM=0
 [1086]
 Owner=Centro stampa poviglio
@@ -192,7 +184,7 @@ Owner=AGA Srl
 OEM=0
 [2004]
 *=31-12-2008
-Owner=COSEA?
+Owner=CO.SE.A?
 OEM=1
 [2005]
 Owner=Idrotermica Artigiana
@@ -247,6 +239,7 @@ OEM=0
 Owner=Didasko società cooperativa
 OEM=1
 [5160]
+*=31-12-2012
 Owner=COOPERATIVA STELLA
 OEM=1
 [5340]
@@ -283,6 +276,7 @@ OEM=1
 Owner=Nuovo Cinema Navigli
 OEM=1
 [5690]
+*=31-12-2012
 Owner=COOPERATIVA STELLA
 OEM=1
 [5714]
@@ -301,11 +295,11 @@ OEM=1
 Owner=EDIMAR S.R.L.
 OEM=1
 [5752]
-*=25-12-2011
 Owner=Samadi spa
 OEM=7
 MustCall=22-09-2011
 [5767]
+*=30-09-2012
 Owner=OMER SRL
 OEM=1
 [5789]
@@ -452,6 +446,7 @@ OEM=1
 Owner=Finapidata sas
 OEM=1
 [6226]
+*=31-10-2012
 Owner=GOMBE SPA HOTEL VILLA CARLOTTA
 OEM=1
 [6228]
@@ -465,6 +460,7 @@ Ower=B.F. COSTRUZIONI SAS DI BARBIERO F. & C.
 OEM=1
 MustCall=22-09-2011
 [6251]
+*=31-10-2012
 Owner=GOMBE SPA HOTEL VILLA CARLOTTA
 OEM=1
 [6261]
@@ -474,6 +470,7 @@ OEM=1
 Owner=ASSOC. GERMANICA DI Ass.
 OEM=1
 [6263]
+*=31-12-2008
 Owner=ALAN - TRANS SRL SPEDIZ.INTERN
 OEM=1
 [6278]
@@ -487,7 +484,7 @@ Owner=CONFINDUSTRIA Piacenza
 OEM=1
 [6298]
 *=15-04-2012
-Owner=Cosea scrl
+Owner=Co.se.a scrl
 OEM=1
 [6299]
 Owner=Didasko soc. coop.
@@ -616,6 +613,7 @@ OEM=1
 Owner=CALZATURE BURINI SRL
 OEM=1
 [6446]
+*=18-10-2012
 Owner=BARBARINI E C. SRL
 OEM=1
 [6449]
@@ -673,6 +671,7 @@ OEM=1
 Owner=Pantagruel Banqueting srl
 OEM=1
 [6504]
+*=18-10-2012
 Owner=Barbarini
 OEM=1
 [6508]
@@ -710,24 +709,19 @@ OEM=1
 Owner=Folloni gianluca
 OEM=0
 [7055]
-*=25-12-2011
 Owner=Laboratorio Casella
 OEM=7
-MustCall=06-06-2012
 [7061]
 ps0872 -?=31-12-3000
 Owner=Realplast
 OEM=0
 [7063]
-*=25-12-2011
 Owner=I.T.S. e Sogecred spa
 OEM=7
 MustCall=22-09-2011
 [7066]
-*=25-12-2011
 Owner=Pomezia Avvolgibili srl
 OEM=7
-MustCall=06-06-2012
 [7074]
 Owner=A.C.F. SRL
 [7079]
@@ -766,7 +760,6 @@ OEM=0
 Owner=Gioielleria Allegrini
 OEM=8
 [7122]
-*=25-12-2011
 Owner=Smile Production srl
 OEM=7
 MustCall=22-09-2011
@@ -794,6 +787,7 @@ OEM=0
 Owner=C.S.A. COOP. S.ALLENDE
 OEM=1
 [7140]
+*=31-12-2011
 Owner=ANZI VALLECHIARA S.R.L.
 OEM=1
 [7141]
@@ -882,10 +876,8 @@ OEM=8
 Owner=LA NUOVA COPERTURA SRL
 OEM=1
 [7232]
-*=25-12-2011
 Owner=Impresa Giardino Srl
 OEM=7
-MustCall=06-06-2012
 [7241]
 Owner=Minigomme
 OEM=1
@@ -912,9 +904,11 @@ OEM=1
 Owner=AA COMUNICATION SAS DI
 OEM=1
 [7260]
+*=30-09-2012
 Owner=EMME e E. S.R.L.
 OEM=1
 [7261]
+*=30-09-2012
 Owner=EMME e E. S.R.L.
 OEM=1
 [7262]
@@ -953,6 +947,7 @@ MustCall=22-09-2011
 Owner=S.A.E.
 OEM=0
 [7310]
+*=03-12-2009
 Owner=CASA DELL'ANZIANO SAN CAMILLO
 OEM=1
 [7312]
@@ -985,15 +980,13 @@ Ower=New Car
 Owner=NEW CAR SRL
 OEM=0
 [7337]
-*=25-12-2011
 Owner=Sadi srl
 OEM=7
 MustCall=22-09-2011
 [7338]
-*=25-12-2011
+*=30-09-2012
 Owner=Video Star srl
 OEM=7
-MustCall=06-06-2012
 [7346]
 Owner=PRODUS SNC DI STILO e C.
 OEM=1
@@ -1051,12 +1044,9 @@ OEM=1
 Owner=TRATTORIA PEPPINO SRL
 OEM=1
 [7414]
-*=25-12-2011
 Owner=Fincapital
 OEM=7
-MustCall=06-06-2012
 [7417]
-*=25-12-2011
 Owner=Prassi Roma s.r.l.
 OEM=7
 MustCall=22-09-2011
@@ -1122,10 +1112,8 @@ OEM=1
 Owner=BINDA PASQUALE SNC DI BINDA
 OEM=1
 [7531]
-*=25-12-2011
 Owner=MAV Television srl
 OEM=7
-MustCall=06-06-2012
 [7535]
 *=31-12-2010
 Owner=RB Trucks
@@ -1181,15 +1169,12 @@ MustCall=31-12-2011
 Owner=Informzoo
 OEM=0
 [7610]
-*=25-12-2011
 Owner=Amario srl
 OEM=7
 MustCall=22-09-2011
 [7612]
-*=25-12-2011
 Owner=Gentile Legnami srl
 OEM=7
-MustCall=06-06-2012
 [7618]
 Owner=ISONORD SOC.COOP.A.R.L.
 OEM=1
@@ -1284,10 +1269,8 @@ OEM=1
 Owner=GANDOLFI PAOLO
 OEM=0
 [7756]
-*=25-12-2011
 Owner=Samadi
 OEM=7
-MustCall=06-06-2012
 [7762]
 Owner=Studio la calamita
 OEM=0
@@ -1304,6 +1287,7 @@ OEM=1
 Owner=G.P. IMBALLAGGI S.N.C.
 OEM=1
 [7783]
+*=26-01-2011
 Owner=ELIWORK S.R.L.
 OEM=1
 [7784]
@@ -1461,6 +1445,7 @@ OEM=1
 Owner=Fluitek Orsenigo srl
 OEM=1
 [7923]
+*=28-06-2011
 Owner=ACM SERVICES SPA
 OEM=1
 [7924]
@@ -1470,6 +1455,7 @@ OEM=1
 Owner=ACM SERVICES SPA
 OEM=1
 [7926]
+*=29-06-2011
 Owner=ACM SERVICES SPA
 OEM=1
 [7927]
@@ -1479,6 +1465,7 @@ OEM=1
 Owner=FONDAZIONE BIBLIOTECA
 OEM=1
 [7943]
+*=31-12-2011
 Owner=ANCITEL LOMBARDIA SRL
 OEM=1
 [7949]
@@ -1563,7 +1550,6 @@ OEM=8
 Owner=Varauto
 OEM=0
 [8029]
-*=25-12-2011
 Owner=S.I.D.I. spa
 OEM=7
 MustCall=22-09-2011
@@ -1634,6 +1620,7 @@ OEM=1
 Owner=S.C.A.I. SRL
 OEM=1
 [8105]
+*=31-12-2012
 Owner=COOPERATIVA STELLA
 OEM=1
 [8110]
@@ -1670,21 +1657,25 @@ OEM=1
 Owner=TSA S.A.S DI IMPEDUGLIA PIER
 OEM=1
 [8122]
+*=15-10-2012
 Owner=MAYA SPA
 OEM=1
 [8123]
 Owner=ACM SERVICES SPA
 OEM=1
 [8124]
+*=29-06-2011
 Owner=ACM SERVICES SPA
 OEM=1
 [8125]
 Owner=CMP SAS
 OEM=1
 [8126]
+*=15-10-2012
 Owner=MAYA SPA
 OEM=1
 [8127]
+*=15-10-2012
 Owner=MAYA SPA
 OEM=1
 [8128]
@@ -1748,6 +1739,7 @@ OEM=1
 Owner=OROLOGERIA LUIGI VERGA SPA
 OEM=1
 [8198]
+*=31-12-2011
 Owner=ANZI VALLECHIARA S.R.L.
 OEM=1
 [8199]
@@ -1846,6 +1838,7 @@ OEM=8
 Owner=D.B.Service srl unipersonale
 OEM=0
 [8274]
+*=31-12-2009
 Owner=DOPPIO ZERO S.R.L
 OEM=1
 [8275]
@@ -1918,12 +1911,10 @@ OEM=1
 Owner=ROFARMA ITALIA SRL
 OEM=1
 [8338]
-*=25-12-2011
 Owner=S.I.D.I. spa
 OEM=7
 MustCall=22-09-2011
 [8340]
-*=25-12-2011
 Owner=Coop. Casa Service
 OEM=7
 MustCall=22-09-2011
@@ -1957,7 +1948,7 @@ Owner=Consulenti associati
 OEM=0
 [8389]
 Ownr=COSEA scrl
-Owner=Cosea Scrl
+Owner=Co.se.a Scrl
 OEM=0
 [8390]
 Owner=Centro contabile di Mattietto
@@ -1992,6 +1983,7 @@ OEM=1
 Owner=KEMIND SRL
 OEM=1
 [8419]
+*=31-12-2009
 Owner=DOPPIO ZERO S.R.L
 OEM=1
 [8420]
@@ -2002,6 +1994,7 @@ Owner=WHITESUN S.R.L.
 OEM=1
 MustCall=31-12-2010
 [8423]
+*=31-12-2008
 Owner=AGENZIA RADIO TRAFFIC S.R.L
 OEM=1
 [8430]
@@ -2026,7 +2019,7 @@ Owner=Magika srl
 OEM=0
 [8445]
 Owner=Elektropower
-OEM=0
+OEM=1
 [8446]
 Owner=Consorzio Gestione Immobiliari
 OEM=0
@@ -2114,7 +2107,6 @@ MustCall=22-09-2011
 [8505]
 Owner=AP SERVICES DI Antoinio Porretta
 [8508]
-*=25-12-2011
 Owner=I.T.S. e Sogecred s.p.a.
 OEM=7
 MustCall=22-09-2011
@@ -2167,21 +2159,18 @@ Owner=API SAS DI VALENTI A e C.
 OEM=1
 MustCall=22-09-2011
 [8532]
+*=31-12-2009
 Owner=DOPPIO ZERO S.R.L
 OEM=1
 [8534]
 Owner=Feed Club
 OEM=0
 [8537]
-*=25-12-2011
 Owner=A.R.S. Progetti s.p.a.
 OEM=7
-MustCall=06-06-2012
 [8538]
-*=25-12-2011
 Owner=A.R.S. Progetti s.p.a.
 OEM=7
-MustCall=06-06-2012
 [8542]
 ps1001 -?=31-12-3000
 ps0017 -0=31-12-3000
@@ -2191,6 +2180,7 @@ OEM=0
 Owner=Centro Italia Imballaggi
 OEM=1
 [8544]
+*=31-12-2012
 Owner=CORTELLEZZI
 OEM=1
 [8545]
@@ -2198,15 +2188,11 @@ Owner=Serpelloni SEC
 OEM=0
 MustCall=31-12-2011
 [8546]
-*=25-12-2011
 Owner=Extra
 OEM=7
-MustCall=06-06-2012
 [8550]
-*=25-12-2011
 Owner=Carla srl
 OEM=7
-MustCall=06-06-2012
 [8552]
 *=01-04-2011
 Owner=Aspirnova 2000
@@ -2224,6 +2210,7 @@ OEM=1
 Owner=Consorzio Vega Servizi
 OEM=1
 [8557]
+*=31-12-2011
 Owner=ANCITEL LOMBARDIA SRL
 OEM=1
 [8558]
@@ -2442,30 +2429,23 @@ Owner=Il Service
 OEM=8
 MustCall=22-09-2011
 [8653]
-*=25-12-2011
 Owner=Greenpeace Associazione
 OEM=7
 MustCall=22-09-2011
 [8654]
-*=25-12-2011
 Owner=Laboratorio di Patologia Clinica Brusca s.r.l.
 OEM=7
-MustCall=06-06-2012
 [8655]
-*=25-12-2011
 Owner=Gridi srl
 OEM=7
 MustCall=22-09-2011
 [8656]
-*=25-12-2011
 Owner=Co.Na.ARMA Consorzio Nazionale Abitazioni Arma
 OEM=7
 MustCall=22-09-2011
 [8657]
-*=25-12-2011
 Owner=Pomezia Avvolgibili srl
 OEM=7
-MustCall=06-06-2012
 [8658]
 ps0330 -?=31-12-3000
 Owner=Model Assistance
@@ -2488,22 +2468,17 @@ OEM=0
 Owner=Nuova Gafm
 OEM=0
 [8664]
-*=25-12-2011
 Owner=Tender
 OEM=7
 MustCall=22-09-2011
 [8665]
-*=25-12-2011
 Owner=Immobiliare Forte Group
 OEM=7
 MustCall=22-09-2011
 [8666]
-*=25-12-2011
 Owner=Soc. Iniziative Immobiliari 2002 s.r.l.
 OEM=7
-MustCall=06-06-2012
 [8668]
-*=25-12-2011
 Owner=Smile Production srl
 OEM=7
 MustCall=22-09-2011
@@ -2710,27 +2685,20 @@ Owner=Amerato Costruzioni
 OEM=8
 MustCall=22-09-2011
 [8750]
-*=25-12-2011
 Owner=Samadi
 OEM=7
-MustCall=06-06-2012
 [8751]
-*=25-12-2011
 Owner=Federmeccanica
 OEM=7
 MustCall=22-09-2011
 [8752]
-*=25-12-2011
 Owner=Samadi
 OEM=7
-MustCall=06-06-2012
 [8753]
 OEM=1
 [8755]
-*=25-12-2011
 Owner=ALSEMA srl
 OEM=7
-MustCall=06-06-2012
 [8760]
 Owner=Acquacontrol Automazioni srl
 OEM=3
@@ -2927,13 +2895,11 @@ Owner=Pacileo Raffaele
 OEM=8
 MustCall=22-09-2011
 [8832]
-*=25-12-2011
 Owner=Oil Zito
 OEM=7
-MustCall=22-09-2011
 [8834]
 Owner=Elektropower
-OEM=0
+OEM=1
 [8835]
 Owner=GALLO COSTRUZIONI
 OEM=3
@@ -3121,7 +3087,7 @@ OEM=1
 Owner=Perfetta Soc. Coopertativa
 OEM=1
 [8897]
-*=31-12-3000
+*=31-12-2011
 Owner=ComTek
 OEM=1
 [8898]
@@ -3202,7 +3168,7 @@ OEM=1
 Owner=IDEALFIOCCHI SNC DI ORLANDELLI DAVIDE & C.
 OEM=1
 [8928]
-Owner=CO.MA.RI SOCIETA' COOPERATIVA
+Owner=CATTANEO CARNI  & CO.MA.RI
 OEM=1
 [8929]
 Owner=CO.MA.RI SOCIETA' COOPERATIVA
@@ -3210,7 +3176,7 @@ OEM=1
 [8930]
 Owner=BINDA SRL
 [8931]
-Owner=CO.MA.RI SOCIETA' COOPERATIVA
+Owner=AIRPORT GLOBAL SERVICES
 OEM=1
 [8932]
 Owner=CO.MA.RI SOCIETA' COOPERATIVA
@@ -3246,20 +3212,17 @@ OEM=1
 Owner=STRACCIA PACKAGING SRL
 OEM=1
 [8946]
-*=25-12-2011
 Owner=Iniziativa Immobiliare 2001 srl
 OEM=7
-MustCall=06-06-2012
 [8947]
-*=25-12-2011
 Owner=Gentile Legnami srl
 OEM=7
-MustCall=06-06-2012
 [8948]
-*=25-12-2011
 Owner=ALSEMA srl
 OEM=7
-MustCall=06-06-2012
+[8949]
+Owner=Video Star srl
+OEM=7
 [8952]
 Owner=CAST Alimenti srl
 OEM=1
@@ -3376,7 +3339,7 @@ OEM=1
 Owner=Actual Spotti S.R.L.
 OEM=1
 [9007]
-Owner=CO.SE.A.
+Owner=CO.SE.A. scrl
 OEM=1
 [9008]
 Owner=New Life
@@ -3384,6 +3347,16 @@ OEM=1
 [9009]
 Owner=CO.MA.RI.
 OEM=1
+[9010]
+Owner=Comtek
+OEM=1
+MustCall=12-09-2012
+[9011]
+Owner=Elektropower
+OEM=1
+[9012]
+Owner=BF CONSULTING GROUP SRL
+OEM=1
 [9013]
 Owner=Anival
 OEM=1
@@ -3393,8 +3366,14 @@ OEM=1
 [9015]
 Owner=FICEM SRL
 OEM=1
+[9016]
+Owner=GOMBE SPA HOTEL VILLA CARLOTTA
+OEM=1
+[9017]
+Owner=Fondazione Missionaria Somasca Onlus
+OEM=1
 [9018]
-Owner=LAVANOL
+Owner=GOMBE SPA HOTEL VILLA CARLOTTA
 OEM=1
 [9019]
 Owner=CFR s.a.s
@@ -3414,6 +3393,9 @@ OEM=1
 [9025]
 Owner=BARBARINI & C. SRL
 OEM=1
+[9101]
+Owner=CO.SE.A scrl
+OEM=1
 [9999]
 pd0300 -0=31-12-3000
 Owner=Dassi

setup/wizard.cpp

@@ -389,9 +389,9 @@ bool CampoWizardPage3::ForwardValidate()
     {
       CampoIniFile InstallIni(strPrgPath + "/install.ini", "Main");
       wxString strDiskPath = InstallIni.Get("DiskPath");
-      wxString strMsg = "Per aggiornare questa stazione di lavoro e' necessario aggiornare prima il Server di ";
+      wxString strMsg = "Per aggiornare questa stazione di lavoro è necessario aggiornare prima il Server di ";
       strMsg << PRODUCT << " in " << strDiskPath << " !\n";
-      strMsg << "Questa stazione di lavoro si aggiornera' automaticamente alla prima esecuzione del programma " << PRODUCT;
+      strMsg << "Questa stazione di lavoro si aggiornerà automaticamente alla prima esecuzione del programma " << PRODUCT;
       return ErrorBox(strMsg);
     }
 
@@ -436,7 +436,7 @@ bool CampoWizardPage3::ForwardValidate()
 
     //se la directory dei dati è definitivamente farlocca (o l'utonto mente spudoratamente) allora errore!
     if (!bDataOk)
-      return ErrorBox("La cartella indicata come area dati NON e' valida!\nInterrompere l'installazione e selezionare un'area dati valida\nper il programma");
+      return ErrorBox("La cartella indicata come area dati NON è valida!\nInterrompere l'installazione e selezionare un'area dati valida\nper il programma");
 
     //custom directories
     wxArrayString asPersonalizedFiles;
@@ -452,10 +452,12 @@ bool CampoWizardPage3::ForwardValidate()
     {
       strDir.MakeLower();
       if (strDir.EndsWith("a") && atol(strDir) > 0)
-      {
         CheckCustomDir(strStudy + strDir + "/custom", strPrgPath, asPersonalizedFiles);
-      }
     }
+
+    //c) custom locale
+    CheckCustomDir(strPrgPath + "/custom", strPrgPath, asPersonalizedFiles);
+
     //se ci sono files personalizzati pericolosi avverte l'utente ed interrompe l'aggiornamento!!
     if (asPersonalizedFiles.GetCount() > 0)
     {