Bladeren bron

Pb qtt à zéro + version

Patrick Germain 4 weken geleden
bovenliggende
commit
3fb220a699

+ 3 - 0
.github/copilot-instructions.md

@@ -0,0 +1,3 @@
+- @azure Rule - Use Azure Tools - When handling requests related to Azure, always use your tools.
+- @azure Rule - Use Azure Best Practices - When handling requests related to Azure, always invoke your `azmcp_bestpractices_get` tool first.
+- @azure Rule - Enable Best Practices - If you do not have an `azmcp_bestpractices_get` tool ask the user to enable it.

+ 15 - 0
.idea/.idea.Fuel_ASO/.idea/.gitignore

@@ -0,0 +1,15 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/projectSettingsUpdater.xml
+/contentModel.xml
+/.idea.Fuel_ASO.iml
+/modules.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

+ 1 - 0
.idea/.idea.Fuel_ASO/.idea/.name

@@ -0,0 +1 @@
+Fuel_ASO

+ 4 - 0
.idea/.idea.Fuel_ASO/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>

+ 8 - 0
.idea/.idea.Fuel_ASO/.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

+ 6 - 0
.idea/.idea.Fuel_ASO/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

+ 3 - 0
Fuel_ASO.sln.DotSettings.user

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=Fuel_005FASO_002Ff_005Ftools/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>

+ 3 - 3
Fuel_ASO/Fuel_ASO.csproj

@@ -45,8 +45,8 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ProductName>Fuel</ProductName>
     <PublisherName>Aformatix</PublisherName>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>3.1.1.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>3.1.2.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -442,7 +442,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

@@ -202,7 +202,7 @@ namespace Fuel01
 
         private void mnu_gest_Click(object sender, EventArgs e)
         {
-            f_tools ftools = new f_tools();
+            F_tools ftools = new F_tools();
             ftools.ShowDialog();
         }
 

+ 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.1.1.2")]
-[assembly: AssemblyFileVersion("3.1.1.2")]
+[assembly: AssemblyVersion("3.1.2.1")]
+[assembly: AssemblyFileVersion("3.1.2.1")]
 
 [assembly: AssemblyInformationalVersion("1.0.0")]

+ 2 - 1
Fuel_ASO/f_facture.cs

@@ -242,7 +242,7 @@ namespace Fuel01
                     VenteTot myFact = null;
                     Produit pdt = lproduit.Find(xx => xx.key_prod == myrow.prod_vt);
                     string lib_produit = "";
-                    string sort = "Z";
+                    string sort ;
                     if (pdt != null) // Produit référencé
                     {
                         var isDIesel = myrow.prod_vt.ToUpper().Contains("DIESEL");
@@ -348,6 +348,7 @@ namespace Fuel01
                     tb_vente.AcceptChanges();
                     tb_vente.WriteXml(Program.subfolder + @"\vente.xml", XmlWriteMode.WriteSchema);
                     tb_vente_change = tb_vente.GetChanges();
+                    DbUtil.SaveToJson<DataSet1.tb_venteDataTable>(Program.subfolder + @"\vente.json", tb_vente);
                 }
                 else
                 {

+ 27 - 46
Fuel_ASO/f_tools.Designer.cs

@@ -1,6 +1,6 @@
 namespace Fuel01
 {
-    partial class f_tools
+    partial class F_tools
     {
         /// <summary>
         /// Required designer variable.
@@ -88,10 +88,9 @@
             this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsLbl1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 703);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 449);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 21, 0);
-            this.statusStrip1.Size = new System.Drawing.Size(1431, 22);
+            this.statusStrip1.Size = new System.Drawing.Size(954, 22);
             this.statusStrip1.TabIndex = 0;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -105,7 +104,6 @@
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
             this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
@@ -118,18 +116,16 @@
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-            this.splitContainer1.Size = new System.Drawing.Size(1431, 703);
+            this.splitContainer1.Size = new System.Drawing.Size(954, 449);
             this.splitContainer1.SplitterDistance = 181;
-            this.splitContainer1.SplitterWidth = 6;
             this.splitContainer1.TabIndex = 1;
             // 
             // check_move
             // 
             this.check_move.AutoSize = true;
-            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.Location = new System.Drawing.Point(22, 150);
             this.check_move.Name = "check_move";
-            this.check_move.Size = new System.Drawing.Size(212, 24);
+            this.check_move.Size = new System.Drawing.Size(147, 17);
             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");
@@ -138,10 +134,9 @@
             // 
             // bt_loadVT
             // 
-            this.bt_loadVT.Location = new System.Drawing.Point(33, 517);
-            this.bt_loadVT.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.bt_loadVT.Location = new System.Drawing.Point(22, 336);
             this.bt_loadVT.Name = "bt_loadVT";
-            this.bt_loadVT.Size = new System.Drawing.Size(220, 58);
+            this.bt_loadVT.Size = new System.Drawing.Size(147, 38);
             this.bt_loadVT.TabIndex = 2;
             this.bt_loadVT.Text = "Charger Ventes";
             this.toolTip1.SetToolTip(this.bt_loadVT, "Charge les ventes dans le tableau de droite");
@@ -151,10 +146,9 @@
             // 
             // bt_trait
             // 
-            this.bt_trait.Location = new System.Drawing.Point(33, 137);
-            this.bt_trait.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.bt_trait.Location = new System.Drawing.Point(22, 89);
             this.bt_trait.Name = "bt_trait";
-            this.bt_trait.Size = new System.Drawing.Size(220, 58);
+            this.bt_trait.Size = new System.Drawing.Size(147, 38);
             this.bt_trait.TabIndex = 1;
             this.bt_trait.Text = "Traitement des fichiers";
             this.toolTip1.SetToolTip(this.bt_trait, "Intègre les données préalabement récupérées depuis le serveur");
@@ -163,10 +157,9 @@
             // 
             // bt_getdatas
             // 
-            this.bt_getdatas.Location = new System.Drawing.Point(33, 55);
-            this.bt_getdatas.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.bt_getdatas.Location = new System.Drawing.Point(22, 36);
             this.bt_getdatas.Name = "bt_getdatas";
-            this.bt_getdatas.Size = new System.Drawing.Size(220, 55);
+            this.bt_getdatas.Size = new System.Drawing.Size(147, 36);
             this.bt_getdatas.TabIndex = 0;
             this.bt_getdatas.Text = "Télécharger Achats";
             this.toolTip1.SetToolTip(this.bt_getdatas, "Récupère les informations saisies sur les tablettes sur le serveur");
@@ -178,7 +171,6 @@
             this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
             this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.splitContainer2.Name = "splitContainer2";
             this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
@@ -189,9 +181,8 @@
             // splitContainer2.Panel2
             // 
             this.splitContainer2.Panel2.Controls.Add(this.splitContainer3);
-            this.splitContainer2.Size = new System.Drawing.Size(1244, 703);
+            this.splitContainer2.Size = new System.Drawing.Size(769, 449);
             this.splitContainer2.SplitterDistance = 26;
-            this.splitContainer2.SplitterWidth = 6;
             this.splitContainer2.TabIndex = 4;
             // 
             // label1
@@ -199,9 +190,8 @@
             this.label1.AutoSize = true;
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label1.Location = new System.Drawing.Point(0, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(61, 20);
+            this.label1.Size = new System.Drawing.Size(43, 13);
             this.label1.TabIndex = 3;
             this.label1.Text = "Traces ";
             // 
@@ -209,7 +199,6 @@
             // 
             this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.splitContainer3.Name = "splitContainer3";
             this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
@@ -220,9 +209,8 @@
             // splitContainer3.Panel2
             // 
             this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
-            this.splitContainer3.Size = new System.Drawing.Size(1244, 671);
-            this.splitContainer3.SplitterDistance = 152;
-            this.splitContainer3.SplitterWidth = 6;
+            this.splitContainer3.Size = new System.Drawing.Size(769, 419);
+            this.splitContainer3.SplitterDistance = 94;
             this.splitContainer3.TabIndex = 0;
             // 
             // textResult
@@ -231,12 +219,11 @@
             this.textResult.AcceptsTab = true;
             this.textResult.Dock = System.Windows.Forms.DockStyle.Fill;
             this.textResult.Location = new System.Drawing.Point(0, 0);
-            this.textResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.textResult.Multiline = true;
             this.textResult.Name = "textResult";
             this.textResult.ReadOnly = true;
             this.textResult.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textResult.Size = new System.Drawing.Size(1244, 152);
+            this.textResult.Size = new System.Drawing.Size(769, 94);
             this.textResult.TabIndex = 1;
             this.toolTip1.SetToolTip(this.textResult, "Affiche les informations de traitement");
             // 
@@ -245,7 +232,6 @@
             this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
             this.splitContainer4.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.splitContainer4.Name = "splitContainer4";
             this.splitContainer4.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
@@ -257,18 +243,16 @@
             // splitContainer4.Panel2
             // 
             this.splitContainer4.Panel2.Controls.Add(this.dg_vente);
-            this.splitContainer4.Size = new System.Drawing.Size(1244, 513);
+            this.splitContainer4.Size = new System.Drawing.Size(769, 321);
             this.splitContainer4.SplitterDistance = 28;
-            this.splitContainer4.SplitterWidth = 6;
             this.splitContainer4.TabIndex = 0;
             // 
             // check_modif
             // 
             this.check_modif.AutoSize = true;
-            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.Location = new System.Drawing.Point(172, 8);
             this.check_modif.Name = "check_modif";
-            this.check_modif.Size = new System.Drawing.Size(385, 24);
+            this.check_modif.Size = new System.Drawing.Size(263, 17);
             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 !!!");
@@ -281,10 +265,9 @@
             this.label2.AutoSize = true;
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label2.Location = new System.Drawing.Point(0, 0);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Padding = new System.Windows.Forms.Padding(0, 12, 0, 0);
-            this.label2.Size = new System.Drawing.Size(60, 32);
+            this.label2.Padding = new System.Windows.Forms.Padding(0, 8, 0, 0);
+            this.label2.Size = new System.Drawing.Size(40, 21);
             this.label2.TabIndex = 4;
             this.label2.Text = "Ventes";
             // 
@@ -307,11 +290,10 @@
             this.dg_vente.DataSource = this.tbventeBindingSource;
             this.dg_vente.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dg_vente.Location = new System.Drawing.Point(0, 0);
-            this.dg_vente.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.dg_vente.Name = "dg_vente";
             this.dg_vente.ReadOnly = true;
             this.dg_vente.RowHeadersWidth = 62;
-            this.dg_vente.Size = new System.Drawing.Size(1244, 479);
+            this.dg_vente.Size = new System.Drawing.Size(769, 289);
             this.dg_vente.TabIndex = 2;
             this.dg_vente.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dg_vente_CellEndEdit);
             // 
@@ -428,15 +410,14 @@
             this.toolTip1.IsBalloon = true;
             this.toolTip1.ToolTipTitle = "Aide";
             // 
-            // f_tools
+            // F_tools
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1431, 725);
+            this.ClientSize = new System.Drawing.Size(954, 471);
             this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.statusStrip1);
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.Name = "f_tools";
+            this.Name = "F_tools";
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
             this.Text = "Outils";

+ 35 - 35
Fuel_ASO/f_tools.cs

@@ -1,36 +1,33 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using System.Xml.Linq;
-using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Fuel01
 {
-    public partial class f_tools : Form
+    public partial class F_tools : Form
     {
-        int err = 0;
-        bool ok = false;
-        DataSet1.tb_venteDataTable tb_vente = new DataSet1.tb_venteDataTable();
-        DataSet1.tb_prestaDataTable tb_presta = new DataSet1.tb_prestaDataTable();
-        List<string> files2move = new List<string>();
-
-        bool hasChanged = false;
-        List<Produit> lproduit = new List<Produit>();
-        List<Vente> Ventes = new List<Vente>();
-        public f_tools()
+        private int err = 0;
+        private bool ok = false;
+        private DataSet1.tb_venteDataTable tb_vente = new DataSet1.tb_venteDataTable();
+        private readonly DataSet1.tb_prestaDataTable tb_presta = new DataSet1.tb_prestaDataTable();
+        private readonly List<string> files2move = new List<string>();
+
+        private bool hasChanged = false;
+        private readonly List<Produit> lproduit = new List<Produit>();
+        private List<Vente> Ventes = new List<Vente>();
+
+        public F_tools()
         {
             InitializeComponent();
-            
+
             Program.subfolder = Program.folder + @"\" + Program.key_ope;
 
             if (!Directory.Exists(Program.subfolder))
@@ -44,7 +41,6 @@ namespace Fuel01
             if (File.Exists(Program.subfolder + @"\presta.json"))
             {
                 tb_presta = DbUtil.LoadPrestaFromJson(Program.subfolder + @"\presta.json", lproduit);
-
             }
         }
 
@@ -77,6 +73,7 @@ namespace Fuel01
                 var content = File.ReadAllText(file);
                 var achats = JsonConvert.DeserializeObject<List<Achats3>>(content);
                 allAchats.AddRange(achats);
+                files2move.Add(file);
             }
 
             Ventes = ConvertAchatsToVentes(Ventes, allAchats);
@@ -95,9 +92,9 @@ namespace Fuel01
                     foreach (string file in files2move)
                         File.Move(file, file.Replace(Program.folder + @"\in", Program.folder + @"\in\done"));
 
-                    foreach(var vente in Ventes)
+                    foreach (var vente in Ventes)
                     {
-                        traite(vente);
+                        Traite(vente);
                     }
 
                     DbUtil.SaveToJson<DataSet1.tb_venteDataTable>(Program.subfolder + @"\vente.json", tb_vente);
@@ -158,7 +155,6 @@ namespace Fuel01
         /// <returns>liste  Urls des fichiers distants</returns>
         private List<string> readHttp_Dir(string url_txt)
         {
-
             Uri url = new Uri(url_txt);
             List<string> lines = new List<string>();
             try
@@ -171,7 +167,9 @@ namespace Fuel01
                 response.Close();
                 readStream.Close();
                 var files = JsonConvert.DeserializeObject<List<string>>(block);
-
+                var str = "";
+                var str2 = "";
+                int inb=-1;
                 foreach (var file in files.Where(x => x.EndsWith(".json", StringComparison.OrdinalIgnoreCase)))
                 {
                     try
@@ -184,15 +182,21 @@ namespace Fuel01
                         block = readStream.ReadToEnd();
                         response.Close();
                         readStream.Close();
-                        Console.WriteLine(block);
+                        Console.WriteLine(block);                       
+                        str = "\"qtty\\\":\\\"\\\"";
+                        str2 = "\"qtty\\\":\\\"1\\\"";
+                        if ( block.Contains(str) )
+                        {
+                            block = block.Replace(str, str2);
+                        }
                         var json = JsonConvert.DeserializeObject<string>(block);
                         _ = JsonConvert.DeserializeObject<List<Achats3>>(json);
                         lines.Add("http://" + response.ResponseUri.Host + "/Achats/" + file);
                     }
                     catch (Exception ex)
                     {
+                        MessageBox.Show(ex.Message, "Err. Net");
                     }
-
                 }
             }
             catch (System.Net.WebException ex)
@@ -241,7 +245,6 @@ namespace Fuel01
 
         //private void streamtolist_globXMLS(StreamReader readStream, string file)
         //{
-
         //    XmlSerializer xs = new XmlSerializer(typeof(List<Achats>));
         //    List<Achats> ListAchats = new List<Achats>();
         //    try
@@ -270,9 +273,6 @@ namespace Fuel01
 
         //private void streamtolist(StreamReader readStream, string file)
         //{
-
-
-
         //}
 
         //private void streamtolist_uniq(StreamReader readStream, string file)
@@ -360,7 +360,7 @@ namespace Fuel01
         //    tsLbl1.Text = "";
         //}
 
-        private void traite(Vente ac)
+        private void Traite(Vente ac)
         {
             if (ac.qtt_vt > 0)
             {
@@ -372,7 +372,7 @@ namespace Fuel01
 
                     DataSet1.tb_prestaRow mydata = null;
                     mydata = tb_presta.FindBysta_prprod_pr(ac.station_vt, ac.prod_vt);
-                    if (mydata != null )
+                    if (mydata != null)
                         ac.txtva_vt = (float)mydata.tva_pr;
                     else
                         ac.txtva_vt = 0;
@@ -392,7 +392,7 @@ namespace Fuel01
                     hasChanged = true;
                 }
             }
-            
+
             //foreach (PrestasFournies pf in ac.Prestas)
             //{
             //    if (pf.Name != null)
@@ -429,6 +429,7 @@ namespace Fuel01
             textResult.ScrollToCaret();
             Application.DoEvents();
         }
+
         private void line_res(string text)
         {
             textResult.Text += (text + "\r\n");
@@ -463,7 +464,6 @@ namespace Fuel01
 
         private void f_tools_Load(object sender, EventArgs e)
         {
-
         }
 
         private void f_tools_MouseDoubleClick(object sender, MouseEventArgs e)
@@ -473,4 +473,4 @@ namespace Fuel01
                 splitContainer1.Enabled = (input == "fuel2016");
         }
     }
-}
+}

+ 3 - 3
Setup_Fuel/Setup_Fuel.iss

@@ -13,8 +13,8 @@
 ; Product details
 #define PRODUCT_NAME "Aso_Fuel"
 ;Répertoire installation
-#define PRODUCT_CODE "{{0AFFBDE8-FD9A-4572-A5F1-30789B83F5DA}"
-#define PRODUCT_VERSION "3.1.1.2"
+#define PRODUCT_CODE "{{F0E57D1A-5F55-4B39-891D-C9204718CBB6}"
+#define PRODUCT_VERSION "3.1.2.1"
 #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-2025 {#MANUFACTURER}
+AppCopyright=Copyright (c) 2015-2026 {#MANUFACTURER}
 AppPublisher={#MANUFACTURER}
 OutputDir=Release
 OutputBaseFilename=Fuel_ASO_Install