Bladeren bron

Corrections MAJ

Patrick Germain 8 maanden geleden
bovenliggende
commit
a6961ae167

+ 3 - 3
Fuel_ASO/App.config

@@ -29,10 +29,10 @@
                 <value>http://www.aformatix.com/signalR/srv/</value>
             </setting>
             <setting name="server_adress_datas" serializeAs="String">
-                <value>http://localhost/ASOStationService/achats</value>
+                <value>http://localhost/api/Windows/GetListAchats</value>
             </setting>
             <setting name="server_adress_bin" serializeAs="String">
-                <value>http://www.aformatix.com/ASOstationservice/download/Fuel_ASO_Install.exe</value>
+                <value>http://tdf.axpower.eu/Fuel_ASO_Install.exe</value>
             </setting>
             <setting name="chemin_copie_locale" serializeAs="String">
                 <value>C:\inetpub\wwwroot\ASOStationService\Achats</value>
@@ -41,7 +41,7 @@
                 <value>False</value>
             </setting>
             <setting name="adresse_copie_api" serializeAs="String">
-                <value>http://localhost/ASOStationService/api/FileUpLoad/upLoadFiles</value>
+                <value>http://localhost/api/FileUpload/</value>
             </setting>
         </Fuel01.Properties.Settings>
     </userSettings>

+ 2 - 2
Fuel_ASO/Fuel_ASO.csproj

@@ -46,7 +46,7 @@
     <ProductName>Fuel</ProductName>
     <PublisherName>Aformatix</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.8.10.0</ApplicationVersion>
+    <ApplicationVersion>2.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -429,7 +429,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_StartDate="2018/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_UseUniversalClock="True" BuildVersion_BuildVersioningStyle="None.None.YearDayOfYearStamp.Increment" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_IncrementBeforeBuild="False" BuildVersion_DetectChanges="False" />
+      <UserProperties BuildVersion_DetectChanges="False" BuildVersion_IncrementBeforeBuild="False" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.YearDayOfYearStamp.Increment" BuildVersion_UseUniversalClock="True" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2018/1/1" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 1 - 1
Fuel_ASO/Main.cs

@@ -591,7 +591,7 @@ namespace Fuel01
         private void checkVersion()
         {
             string[] strVersion = AssemblyVersion.Split('.');
-            double version = Convert.ToDouble(strVersion[0]) * 100000 + Convert.ToDouble(strVersion[1]) * 1000 + Convert.ToDouble(strVersion[2]) + Convert.ToDouble(strVersion[3]) / 10000;
+            double version = Convert.ToDouble(strVersion[0]) * 1000 + Convert.ToDouble(strVersion[1]) * 100 + Convert.ToDouble(strVersion[2])*10 + Convert.ToDouble(strVersion[3]) ;
 
             WebRequest request = WebRequest.Create(Properties.Settings.Default.server_adress_bin + ".txt");
             try

+ 3 - 3
Fuel_ASO/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("2AX")]
 [assembly: AssemblyProduct("ASO_Fuel")]
-[assembly: AssemblyCopyright("Copyright ©  2AX - 2015-2020")]
+[assembly: AssemblyCopyright("Copyright ©  2AX - 2015-2025")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.1.1")]
-[assembly: AssemblyFileVersion("1.9.1.1")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
 
 [assembly: AssemblyInformationalVersion("1.8.7")]

+ 3 - 3
Fuel_ASO/f_tools.Designer.cs

@@ -98,7 +98,7 @@
             // tsLbl1
             // 
             this.tsLbl1.Name = "tsLbl1";
-            this.tsLbl1.Size = new System.Drawing.Size(0, 15);
+            this.tsLbl1.Size = new System.Drawing.Size(0, 17);
             // 
             // splitContainer1
             // 
@@ -129,7 +129,7 @@
             this.check_move.Location = new System.Drawing.Point(33, 231);
             this.check_move.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.check_move.Name = "check_move";
-            this.check_move.Size = new System.Drawing.Size(219, 24);
+            this.check_move.Size = new System.Drawing.Size(212, 24);
             this.check_move.TabIndex = 3;
             this.check_move.Text = "Déplacer après traitement";
             this.toolTip1.SetToolTip(this.check_move, "Déplce dans le sous-répertoire in/done les fichiers après traitement");
@@ -268,7 +268,7 @@
             this.check_modif.Location = new System.Drawing.Point(258, 12);
             this.check_modif.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.check_modif.Name = "check_modif";
-            this.check_modif.Size = new System.Drawing.Size(392, 24);
+            this.check_modif.Size = new System.Drawing.Size(385, 24);
             this.check_modif.TabIndex = 5;
             this.check_modif.Text = "Autoriser les modifications des ventes dans la grille";
             this.toolTip1.SetToolTip(this.check_modif, "ATTENTION.... Les modifications faites dans la grille sont dangereuses !!!");

+ 2 - 2
Setup_Fuel/Setup_Fuel.iss

@@ -14,7 +14,7 @@
 #define PRODUCT_NAME "Aso_Fuel"
 ;Répertoire installation
 #define PRODUCT_CODE "{{0AFFBDE8-FD9A-4572-A5F1-30789B83F5DA}"
-#define PRODUCT_VERSION "1.9.1.1"
+#define PRODUCT_VERSION "2.0.0.0"
 #define MANUFACTURER "AAX"
 #define TITLE "Aso Fuel"
 #define MyAppExeName "Fuel_ASO.exe"
@@ -25,7 +25,7 @@ AppVersion={#PRODUCT_VERSION}
 AppId={#PRODUCT_CODE}
 DefaultDirName={pf}\{#MANUFACTURER}\{#PRODUCT_NAME}
 DefaultGroupName={#PRODUCT_NAME}
-AppCopyright=Copyright (c) 2015-2020 {#MANUFACTURER}
+AppCopyright=Copyright (c) 2015-2025 {#MANUFACTURER}
 AppPublisher={#MANUFACTURER}
 OutputDir=Release
 OutputBaseFilename=Fuel_ASO_Install