Merge branch 'dev' of https://github.com/angoyd/Visma.Net into dev

ON-IT · Nov 16, 2023 · 2a400e4 · 2a400e4
2 parents 0f7c9d5 + 2281610
commit 2a400e4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Visma.net/Models/Supplier.cs b/Visma.net/Models/Supplier.cs
@@ -68,8 +68,8 @@ public string corporateId
 
         public CreditTerms creditTerms
         {
-            get => Get("creditTermsId", new CreditTerms("30"));
-            set => Set(value);
+            get => Get("creditTermsId", new CreditTerms());
+            set => Set(value, "creditTermsId");
         }
 
         public string currencyId
@@ -88,7 +88,8 @@ public string documentLanguage
 
         [JsonProperty] public JObject extras { get; private set; }
 
-        public SupplierGLAccountDto glAccounts {
+        public SupplierGLAccountDto glAccounts
+        {
             get => Get<SupplierGLAccountDto>();
             set => Set(value);
         }

diff --git a/Visma.net/Visma.net.csproj b/Visma.net/Visma.net.csproj
@@ -5,6 +5,7 @@
         <Copyright>Copyright © ON IT AS 2014 - 2020</Copyright>
         <Copyright>Copyright © ON IT AS 2014 - 2021</Copyright>
         <Version>4.2.1.11</Version>
+        <Version>4.1.0.2</Version>
         <TargetFrameworks>netstandard2.0;net462;net6</TargetFrameworks>
     	<Title>Visma.net</Title>
         <Copyright>Copyright © ON IT AS 2014 - 2022</Copyright>
@@ -29,6 +30,9 @@
         <FileVersion>4.2.1.11</FileVersion>
 		<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
 	</PropertyGroup>
+        <AssemblyVersion>4.0.3.11</AssemblyVersion>
+        <FileVersion>4.0.3.11</FileVersion>
+    </PropertyGroup>
     <ItemGroup>
       <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">

diff --git a/Visma.net/lib/VismaNetApiHelper.cs b/Visma.net/lib/VismaNetApiHelper.cs
@@ -579,6 +579,7 @@ internal static async Task<string> GetTokenOAuth(string clientId, string secret,
                 return data["token"].Value<string>();
             }
         }
+
         public static async Task<VismaConnectToken> GetTokenFromVismaConnect(string clientId, string secret, string tenant_id, string scope = "vismanet_erp_service_api:create vismanet_erp_service_api:delete vismanet_erp_service_api:read vismanet_erp_service_api:update")
         {
             try
-Original file line number
+Diff line change
@@ Expand Up @@
                     return data["token"].Value<string>();
                 }
             }
             public static async Task<VismaConnectToken> GetTokenFromVismaConnect(string clientId, string secret, string tenant_id, string scope = "vismanet_erp_service_api:create vismanet_erp_service_api:delete vismanet_erp_service_api:read vismanet_erp_service_api:update")
             {
                 try
@@ Expand Down @@