Merge pull request #227 from intuit/IPP-19195N

Minorversion 65 changes
intuit · May 18, 2022 · f0dfe8b · f0dfe8b
2 parents b6b2783 + 2d92732
commit f0dfe8b
Show file tree

Hide file tree

Showing 12 changed files with 174 additions and 13 deletions.
diff --git a/IPPDotNetDevKitCSV3/Code/Directory.Build.props b/IPPDotNetDevKitCSV3/Code/Directory.Build.props
@@ -14,8 +14,8 @@
     <PackageIcon>$(MSBuildThisFileDirectory)logo.png</PackageIcon>
     <OutputPath>$(SolutionDir)artifacts\bin</OutputPath>
     <Copyright>Copyright © 2020 Intuit, Inc.</Copyright>
-    <AssemblyVersion>14.6.3.0</AssemblyVersion>
-    <FileVersion>14.6.3.0</FileVersion>
+    <AssemblyVersion>14.6.3.1</AssemblyVersion>
+    <FileVersion>14.6.3.1</FileVersion>
     <Company>Intuit</Company>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -36,6 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core/AppSettings.json b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core/AppSettings.json
@@ -73,7 +73,7 @@
     },
 
     "MinorVersion": {
-      "Qbo": "63"
+      "Qbo": "65"
     }
   },
   "WebhooksService": {

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core/Properties/Resources.resx b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core/Properties/Resources.resx
@@ -178,7 +178,7 @@
     <value>Please specify a valid directory path.</value>
   </data>
   <data name="DefaultMinorVersionValue" xml:space="preserve">
-    <value>63</value>
+    <value>65</value>
   </data>
   <data name="ArgumentCannotBeGreaterThanBaseline" xml:space="preserve">
     <value>The specified argument {0} cannot be greater than its ceiling value of {1}.</value>

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Nupkg/Intuit.Ipp.Nupkg.csproj b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Nupkg/Intuit.Ipp.Nupkg.csproj
@@ -9,18 +9,19 @@
     <PackageId>IppDotNetSdkForQuickBooksApiV3</PackageId>
     <AssemblyName>IppDotNetSdkForQuickBooksApiV3</AssemblyName>
     <DocumentationFile>$(BaseOutputPath)$(AssemblyName).xml</DocumentationFile>
-    <MainVersion>14.6.3.0</MainVersion>
+    <MainVersion>14.6.3.1</MainVersion>
     <PackageVersionSuffix>pre</PackageVersionSuffix>
     <Version>$(MainVersion)-$(PackageVersionSuffix)</Version>
     <Version>$(MainVersion)</Version>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
-    <NoBuild>true</NoBuild>
+    <!--<NoBuild>true</NoBuild>-->
     <IncludeBuildOutput>true</IncludeBuildOutput>
     <AutoGenerateBindingRedirects>False</AutoGenerateBindingRedirects>
     <Description>The IPP .NET SDK for QuickBooks V3 is a set of .NET classes that make it easier to call QuickBooks APIs. This is the .Net Standard 2.0 version of the .Net SDK</Description>
     <Authors>Intuit</Authors>
     <RepositoryUrl>https://github.com/intuit/QuickBooks-V3-DotNET-SDK</RepositoryUrl>
+	<PackageIcon>logo.png</PackageIcon>  
     <PackageProjectUrl>https://developer.intuit.com/app/developer/qbo/docs/develop/sdks-and-samples-collections/net</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/intuit/QuickBooks-V3-DotNET-SDK/blob/master/License.md</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
@@ -54,7 +55,7 @@
     <ProjectReference Include="..\Intuit.Ipp.Exception\Intuit.Ipp.Exception.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.GlobalTaxService\Intuit.Ipp.GlobalTaxService.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all"/>
+    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.QueryFilter\Intuit.Ipp.QueryFilter.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.ReportService\Intuit.Ipp.ReportService.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.Retry\Intuit.Ipp.Retry.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
@@ -139,11 +140,16 @@
   </ItemGroup>
 
   <ItemGroup>
+	  <None Include="images\logo.png" Pack="true" PackagePath="\" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="images\" />
+  </ItemGroup>
+
   <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
     <ItemGroup>
       <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Utility/Common/CoreConstants.cs b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Utility/Common/CoreConstants.cs
@@ -250,7 +250,7 @@ public static class CoreConstants
         /// <summary>
         /// The Request source header value.
         /// </summary>
-        public const string REQUESTSOURCEHEADER = "V3DotNetSDK14.6.3.0";
+        public const string REQUESTSOURCEHEADER = "V3DotNetSDK14.6.3.1";
 
         /// <summary>
         /// multipart/form-data format

diff --git a/IPPDotNetDevKitCSV3/Code/IppDotNetDevKitCSV3.sln b/IPPDotNetDevKitCSV3/Code/IppDotNetDevKitCSV3.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.645
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "Security", "{D65F7456-F8DB-4EC0-8C03-C22961C80649}"
 EndProject
@@ -54,6 +54,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
 		Local.testsettings = Local.testsettings
+		logo.png = logo.png
 		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
 	EndProjectSection
 EndProject

diff --git a/IPPDotNetDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.Data/Directory.Build.props b/IPPDotNetDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.Data/Directory.Build.props
@@ -11,7 +11,6 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xml</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <NoLogo>true</NoLogo>
     <PackageOutputPath>$(SolutionDir)artifacts\nupkg</PackageOutputPath>
-    <PackageIcon>$(MSBuildThisFileDirectory)logo.png</PackageIcon>
     <OutputPath>$(SolutionDir)artifacts\bin</OutputPath>
     <Copyright>Copyright © 2020 Intuit, Inc.</Copyright>
     <AssemblyVersion>14.6.3.0</AssemblyVersion>

diff --git a/IPPDotNetDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema-Backup/Finance.xsd b/IPPDotNetDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema-Backup/Finance.xsd
@@ -214,6 +214,7 @@
 			<xs:enumeration value="SalesOrderItemLineDetail" />
 			<xs:enumeration value="TDSLineDetail" />
 			<xs:enumeration value="ReimburseLineDetail" />
+			<xs:enumeration value="ItemAdjustmentLineDetail" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="AccountTypeEnum">
@@ -6404,6 +6405,15 @@
 						</xs:documentation>
 					</xs:annotation>
 				</xs:element>
+				<xs:element name="ItemAdjustmentLineDetail" type="ItemAdjustmentLineDetail">
+					<xs:annotation>
+						<xs:documentation>
+							Product: QBO
+							Description: Item adjustment line type for the
+							transaction.
+						</xs:documentation>
+					</xs:annotation>
+				</xs:element>
 			</xs:choice>
 			<xs:element name="CustomField" type="CustomField"
 						minOccurs="0" maxOccurs="unbounded">
@@ -7020,6 +7030,21 @@
 							</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="DeferredRevenue" type="xs:boolean"
+						minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+								Product: QBO
+								Description: Use the DeferredRevenue property to indicate that the goods/services sold 
+								have not yet been delivered to the customer, and therefore not appropriate for the 
+								accounting engine to book as Revenue for accounting. The most typical example would be 
+								inventory items that have not yet been shipped. The accounting engine will credit a 
+								liability account instead of revenue account. Later a follow on transaction must be 
+								entered when the sale is fulfilled, and then the accounting engine will debit the 
+								liability account and credit the revenue account.
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
 					<xs:element name="SalesItemLineDetailEx" type="IntuitAnyType"
 								minOccurs="0">
 						<xs:annotation>
@@ -9728,6 +9753,115 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
+	<xs:complexType name="ItemAdjustmentLineDetail">
+		<xs:annotation>
+			<xs:documentation>
+				Product: QBO
+				Description: Contains the line details of an inventory adjustment transaction.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="ItemRef" type="ReferenceType"
+			            minOccurs="1" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>
+						Product: QBO
+						Description: Reference to an inventory item.
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SalesPrice" type="xs:decimal"
+						minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+						Product: QBO
+						Description: Specifies the Sales Price (per item) for which the items being disbursed were sold.
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:choice minOccurs="1" maxOccurs="1">
+				<xs:element name="QtyDiff" type="xs:decimal"
+				            minOccurs="0">
+					<xs:annotation>
+					    <xs:documentation>
+							Product: QBO
+							Description: Difference in quantity
+							it will have negative value for reducing quantity
+							positive value for increasing quantity.
+					    </xs:documentation>
+				    </xs:annotation>
+			    </xs:element>
+				<xs:element name="NewQty" type="xs:decimal"
+				            minOccurs="0">
+					<xs:annotation>
+					    <xs:documentation>
+							Product: QBO
+							Description: New quantity as of provided
+							transaction date.
+					    </xs:documentation>
+				    </xs:annotation>
+			    </xs:element>
+			</xs:choice>
+			<xs:element name="ClassRef" type="ReferenceType"
+						minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>
+						Product: QBO
+						Description: Class Reference
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="InventoryAdjustment">
+		<xs:annotation>
+			<xs:documentation>
+				Product: QBO
+				Description: The Inventory Adjustment request element
+			</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="Transaction">
+				<xs:sequence>
+					<xs:element name="ShippingAdjustment" type="xs:boolean"
+						minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+								Product: QBO
+								Description: When this property is set to true, the "Inventory Adjustment" is treated 
+								as a notice-of-shipment or packing slip. This will cause the accounting engine to book 
+								the revenue from the sale of the items. When this property is set, the SalesPrice property 
+								must be provided. In order for correct accounting to occur SalesPrice (per item) amount 
+								must match the sales amount on the sales transaction - but no validation of this occurs 
+								within the accounting engine.
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AdjustAccountRef" type="ReferenceType"
+					            minOccurs="1" maxOccurs="1">
+						<xs:annotation>
+							<xs:documentation>
+								Product: QBO
+								Description: Reference to the
+								Inventory Adjustment account used to adjust inventory.
+								This is an expense or opening balance equity account.
+								The inventory asset account is used from item's definition.
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CustomerRef" type="ReferenceType"
+						        minOccurs="0" maxOccurs="1">
+				       <xs:annotation>
+					       <xs:documentation>
+							   Product: QBO
+							   Description: Customer Reference
+					       </xs:documentation>
+				       </xs:annotation>
+			        </xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 	<xs:complexType name="Item">
 		<xs:annotation>
 			<xs:documentation>
@@ -11809,6 +11943,13 @@
 							</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="CostRate" type="xs:decimal" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Hourly cost rate of the employee or vendor for this
+								time activity.
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
 					<xs:element name="Hours" type="xs:int" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>Hours worked.</xs:documentation>

diff --git a/...etDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema-Backup/IntuitBaseTypes.xsd b/...etDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema-Backup/IntuitBaseTypes.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schema.intuit.com/finance/v3"
 	targetNamespace="http://schema.intuit.com/finance/v3" elementFormDefault="qualified"
 	attributeFormDefault="unqualified">

diff --git a/...tDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema-Backup/IntuitNamesTypes.xsd b/...tDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema-Backup/IntuitNamesTypes.xsd
@@ -1042,6 +1042,12 @@
 							</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="CostRate" type="xs:decimal" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Hourly cost rate of the Employee. QBO only. QBD Unsupporetd field.
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1184,6 +1190,12 @@
 							<xs:documentation>Internal use only: extension place holder for Employee.</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="CostRate" type="xs:decimal" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Hourly cost rate of the Employee. QBO only. QBD Unsupporetd field.
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>

diff --git a/...KitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema-Backup/IntuitRestServiceDef.xsd b/...KitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema-Backup/IntuitRestServiceDef.xsd
@@ -56,6 +56,7 @@
     <xs:element name="Department" type="Department" substitutionGroup="IntuitObject"/>
     <xs:element name="Bill" type="Bill" substitutionGroup="IntuitObject"/>
     <xs:element name="Attachable" type="Attachable" substitutionGroup="IntuitObject"/>
+    <xs:element name="InventoryAdjustment" type="InventoryAdjustment" substitutionGroup="IntuitObject"/>
     <xs:element name="BooleanTypeCustomFieldDefinition" type="BooleanTypeCustomFieldDefinition"
         substitutionGroup="IntuitObject"/>
     <xs:element name="CustomFieldDefinition" type="CustomFieldDefinition"

diff --git a/IPPDotNetDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema/IntuitBaseTypes.xsd b/IPPDotNetDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.XsdExtension/Schema/IntuitBaseTypes.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schema.intuit.com/finance/v3"
 	targetNamespace="http://schema.intuit.com/finance/v3" elementFormDefault="qualified"
 	attributeFormDefault="unqualified">