Quellcode durchsuchen

Corrections 3.1.1.1

Patrick Germain vor 4 Monaten
Ursprung
Commit
b7e41f180b

+ 4 - 4
Fuel_ASO/Fuel_ASO.csproj

@@ -45,8 +45,8 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ProductName>Fuel</ProductName>
     <PublisherName>Aformatix</PublisherName>
-    <ApplicationRevision>3</ApplicationRevision>
-    <ApplicationVersion>2.0.0.%2a</ApplicationVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>3.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -104,7 +104,7 @@
     <ManifestKeyFile>Fuel01_CléTemporaire.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <TargetZone>LocalIntranet</TargetZone>
@@ -442,7 +442,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <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" />
+      <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" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 13 - 1
Fuel_ASO/Program.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Mail;
 using System.Net.Mime;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.IO;
 
 namespace Fuel01
 {
@@ -35,6 +36,17 @@ namespace Fuel01
         {
             debug = (Environment.MachineName == "PCPAT");
 
+            var culture = CultureInfo.GetCultureInfo("en-US");
+
+            // this may fail sometimes: (see Drachenkatze's comment below)
+            // var culture = new CultureInfo("en-US");
+
+            //Culture for any thread
+            CultureInfo.DefaultThreadCurrentCulture = culture;
+
+            //Culture for UI in any thread
+            CultureInfo.DefaultThreadCurrentUICulture = culture;
+
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new Main());

+ 2 - 2
Fuel_ASO/Properties/AssemblyInfo.cs

@@ -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("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.1.1.1")]
+[assembly: AssemblyFileVersion("3.1.1.1")]
 
 [assembly: AssemblyInformationalVersion("1.0.0")]

+ 20 - 11
Fuel_ASO/f_facture.cs

@@ -24,7 +24,7 @@ namespace Fuel01
         DataSet1.tb_stationDataTable tb_station = new DataSet1.tb_stationDataTable();
 
         DataSet1.tb_stationRow current_sta = null;
-        string Id_sta { get; set; } 
+        string Id_sta { get; set; }
 
         List<Produit> lproduit = new List<Produit>();
 
@@ -193,12 +193,12 @@ namespace Fuel01
         }
 
 
-        private static  string makeItCLean(string strExcel, string data)
+        private static string makeItCLean(string strExcel, string data)
         {
             string ret = data;
-            if (strExcel.Length > 0 && strExcel.Substring(0, 1) == "#") 
-            { 
-                    ret = strExcel.Substring(1) + data;
+            if (strExcel.Length > 0 && strExcel.Substring(0, 1) == "#")
+            {
+                ret = strExcel.Substring(1) + data;
             }
             return ret;
         }
@@ -361,18 +361,27 @@ namespace Fuel01
 
         private void vt_qtt_TextChanged(object sender, EventArgs e)
         {
-            this.vt_ttc.DataBindings["Text"].BindingManagerBase.EndCurrentEdit();
+            //this.vt_ttc.DataBindings["Text"].BindingManagerBase.EndCurrentEdit();
             if (vt_ttc.Text == "")
             {
                 vt_ttc.Text = "0";
                 vt_qtt.SelectAll();
             }
+            float ttc = 0;
+            try
+            {
+                ttc = (float)Convert.ToDouble(this.vt_ttc.Text);
+            }
+            catch (Exception ex)
+            {
+                return; 
+            }
             float qtt = 0;
-            float puttc = 0;
+            float puttc = (float)Convert.ToDouble(this.vt_pu.Text);
             float tva = 0;
-            float ttc = 0;
+
             float ht = 0;
-            
+
             qtt = ttc / puttc;
             ht = (qtt * puttc) / (1 + (tva / 100));
 
@@ -382,8 +391,8 @@ namespace Fuel01
             vt_ttc.Refresh();
             vt_ht.Refresh();
 
-            this.vt_qtt.DataBindings["Text"].BindingManagerBase.EndCurrentEdit();
-            this.vt_ht.DataBindings["Text"].BindingManagerBase.EndCurrentEdit();
+            //this.vt_qtt.DataBindings["Text"].BindingManagerBase.EndCurrentEdit();
+            //this.vt_ht.DataBindings["Text"].BindingManagerBase.EndCurrentEdit();
         }
 
         private void vt_qtt_Enter(object sender, EventArgs e)

+ 1 - 1
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 "3.0.0.0"
+#define PRODUCT_VERSION "3.1.1.1"
 #define MANUFACTURER "AAX"
 #define TITLE "Aso Fuel"
 #define MyAppExeName "Fuel_ASO.exe"