Skip to content

Commit

Permalink
Merge pull request #46 from avadev/18.1.2
Browse files Browse the repository at this point in the history
Updated DotNet SDK to 18.1.2
  • Loading branch information
ted-spence-avalara authored Jan 26, 2018
2 parents 3a60269 + 5f40651 commit d643c72
Show file tree
Hide file tree
Showing 41 changed files with 2,237 additions and 155 deletions.
4 changes: 2 additions & 2 deletions GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("17.12.0.147")]
[assembly: AssemblyFileVersion("17.12.0.147")]
[assembly: AssemblyVersion("18.1.2.161")]
[assembly: AssemblyFileVersion("18.1.2.161")]
1,082 changes: 1,014 additions & 68 deletions src/AvaTaxApi.cs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/Avalara.AvaTax.net20.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
<Compile Include="models\CommunicationsTSPairModel.cs" />
<Compile Include="models\CompanyAddress.cs" />
<Compile Include="models\CompanyConfigurationModel.cs" />
<Compile Include="models\CompanyDistanceThresholdModel.cs" />
<Compile Include="models\CompanyInitializationModel.cs" />
<Compile Include="models\CompanyModel.cs" />
<Compile Include="models\ContactModel.cs" />
Expand Down Expand Up @@ -196,11 +197,13 @@
<Compile Include="models\FilingsCheckupModel.cs" />
<Compile Include="models\FilingsCheckupSuggestedFormModel.cs" />
<Compile Include="models\FilingStatusChangeModel.cs" />
<Compile Include="models\FormMasterModel.cs" />
<Compile Include="models\FreeTrialRequestModel.cs" />
<Compile Include="models\FundingConfigurationModel.cs" />
<Compile Include="models\FundingESignMethodReturn.cs" />
<Compile Include="models\FundingInitiateModel.cs" />
<Compile Include="models\FundingStatusModel.cs" />
<Compile Include="models\HsCodeModel.cs" />
<Compile Include="models\IsoCountryModel.cs" />
<Compile Include="models\IsoLocalizedName.cs" />
<Compile Include="models\IsoRegionModel.cs" />
Expand Down Expand Up @@ -247,6 +250,7 @@
<Compile Include="models\PingResultModel.cs" />
<Compile Include="models\PointOfSaleDataRequestModel.cs" />
<Compile Include="models\PoNumberModel.cs" />
<Compile Include="models\PostalCodeModel.cs" />
<Compile Include="models\RateModel.cs" />
<Compile Include="models\RateTypeModel.cs" />
<Compile Include="models\RebuildFilingsModel.cs" />
Expand Down Expand Up @@ -285,6 +289,7 @@
<Compile Include="models\TransactionLocationTypeModel.cs" />
<Compile Include="models\TransactionModel.cs" />
<Compile Include="models\TransactionSummary.cs" />
<Compile Include="models\UomModel.cs" />
<Compile Include="models\UPCModel.cs" />
<Compile Include="models\UserEntitlementModel.cs" />
<Compile Include="models\UserModel.cs" />
Expand Down
5 changes: 5 additions & 0 deletions src/Avalara.AvaTax.net45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
<Compile Include="models\CommunicationsTSPairModel.cs" />
<Compile Include="models\CompanyAddress.cs" />
<Compile Include="models\CompanyConfigurationModel.cs" />
<Compile Include="models\CompanyDistanceThresholdModel.cs" />
<Compile Include="models\CompanyInitializationModel.cs" />
<Compile Include="models\CompanyModel.cs" />
<Compile Include="models\ContactModel.cs" />
Expand Down Expand Up @@ -201,11 +202,13 @@
<Compile Include="models\FilingsCheckupModel.cs" />
<Compile Include="models\FilingsCheckupSuggestedFormModel.cs" />
<Compile Include="models\FilingStatusChangeModel.cs" />
<Compile Include="models\FormMasterModel.cs" />
<Compile Include="models\FreeTrialRequestModel.cs" />
<Compile Include="models\FundingConfigurationModel.cs" />
<Compile Include="models\FundingESignMethodReturn.cs" />
<Compile Include="models\FundingInitiateModel.cs" />
<Compile Include="models\FundingStatusModel.cs" />
<Compile Include="models\HsCodeModel.cs" />
<Compile Include="models\IsoCountryModel.cs" />
<Compile Include="models\IsoLocalizedName.cs" />
<Compile Include="models\IsoRegionModel.cs" />
Expand Down Expand Up @@ -252,6 +255,7 @@
<Compile Include="models\PingResultModel.cs" />
<Compile Include="models\PointOfSaleDataRequestModel.cs" />
<Compile Include="models\PoNumberModel.cs" />
<Compile Include="models\PostalCodeModel.cs" />
<Compile Include="models\RateModel.cs" />
<Compile Include="models\RateTypeModel.cs" />
<Compile Include="models\RebuildFilingsModel.cs" />
Expand Down Expand Up @@ -290,6 +294,7 @@
<Compile Include="models\TransactionLocationTypeModel.cs" />
<Compile Include="models\TransactionModel.cs" />
<Compile Include="models\TransactionSummary.cs" />
<Compile Include="models\UomModel.cs" />
<Compile Include="models\UPCModel.cs" />
<Compile Include="models\UserEntitlementModel.cs" />
<Compile Include="models\UserModel.cs" />
Expand Down
4 changes: 2 additions & 2 deletions src/Avalara.AvaTax.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Avalara.AvaTax</id>
<version>17.12.0.147</version>
<version>18.1.2.161</version>
<title>Avalara AvaTax SDK</title>
<description>Add world-class tax estimation and calculation to your project with Avalara's AvaTax suite of APIs and services.</description>
<authors>Ted Spence, Zhenya Frolov</authors>
<authors>Ted Spence, Zhenya Frolov, Greg Hester</authors>
<language>en-US</language>
<projectUrl>https://developer.avalara.com</projectUrl>
<iconUrl>https://developer.avalara.com/public/images/favicon/A-Check-RGB.png</iconUrl>
Expand Down
42 changes: 41 additions & 1 deletion src/enums/ErrorCodeId.cs
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,36 @@ public enum ErrorCodeId
/// </summary>
CompanyAccountAndParentAccountMismatch,

/// <summary>
///
/// </summary>
InvalidFileContentType,

/// <summary>
///
/// </summary>
InvalidItemAttributeName,

/// <summary>
///
/// </summary>
EcmsDisabled,

/// <summary>
///
/// </summary>
UnknownConjunctionError,

/// <summary>
///
/// </summary>
NoLinesDiscounted,

/// <summary>
///
/// </summary>
FailedToDelete,

/// <summary>
/// Batch errors
/// </summary>
Expand Down Expand Up @@ -838,7 +868,7 @@ public enum ErrorCodeId
/// <summary>
///
/// </summary>
NullRefundPercentageAndLines,
RefundLinesRequired,

/// <summary>
///
Expand Down Expand Up @@ -1000,6 +1030,11 @@ public enum ErrorCodeId
/// </summary>
InvalidCoverLetterTitle,

/// <summary>
///
/// </summary>
AccountNotProvisioned,

/// <summary>
/// Multi document error codes
/// </summary>
Expand Down Expand Up @@ -1090,5 +1125,10 @@ public enum ErrorCodeId
/// </summary>
WorksheetException,

/// <summary>
/// LandedCost Exception
/// </summary>
MissingSystemId,

}
}
5 changes: 5 additions & 0 deletions src/enums/ServiceTypeId.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,10 @@ public enum ServiceTypeId
/// </summary>
AvaBottle,

/// <summary>
/// MRSComplianceManager
/// </summary>
MRSComplianceManager,

}
}
5 changes: 5 additions & 0 deletions src/enums/TaxType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ public enum TaxType
/// </summary>
EWaste,

/// <summary>
/// LandedCost tax type
/// </summary>
LandedCost,

/// <summary>
/// Consumer Use Tax
/// </summary>
Expand Down
3 changes: 0 additions & 3 deletions src/models/AdjustMultiDocumentModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*
* @author Ted Spence
* @author Zhenya Frolov
<<<<<<< HEAD
=======
* @author Greg Hester
>>>>>>> 5772f82e9b5d7d2aa37973d9dec53f2633b41978
*/

namespace Avalara.AvaTax.RestClient
Expand Down
3 changes: 0 additions & 3 deletions src/models/AuditMultiDocumentModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*
* @author Ted Spence
* @author Zhenya Frolov
<<<<<<< HEAD
=======
* @author Greg Hester
>>>>>>> 5772f82e9b5d7d2aa37973d9dec53f2633b41978
*/

namespace Avalara.AvaTax.RestClient
Expand Down
3 changes: 0 additions & 3 deletions src/models/CommitMultiDocumentModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*
* @author Ted Spence
* @author Zhenya Frolov
<<<<<<< HEAD
=======
* @author Greg Hester
>>>>>>> 5772f82e9b5d7d2aa37973d9dec53f2633b41978
*/

namespace Avalara.AvaTax.RestClient
Expand Down
114 changes: 114 additions & 0 deletions src/models/CompanyDistanceThresholdModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
using System;
using System.Collections.Generic;
using Newtonsoft.Json;

/*
* AvaTax API Client Library
*
* (c) 2004-2017 Avalara, Inc.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*
* @author Ted Spence
* @author Zhenya Frolov
* @author Greg Hester
*/

namespace Avalara.AvaTax.RestClient
{
/// <summary>
/// A company-distance-threshold model indicates the distance between a company
/// and the taxing borders of various countries. Distance thresholds are necessary
/// to correctly calculate some value-added taxes.
///
/// Distance thresholds only apply to sales of goods in certain countries. A distance threshold
/// is applied for each ship-from/ship-to combination of countries. The threshold amount is defined by
/// the ship-to country.
///
/// Generally, if you have exceeded a distance threshold for taxes between a pair of countries, your tax calculation
/// will be determined to be the rate in the destination country. If you have not exceeded the threshold,
/// your tax calculation will be determined to be the rate in the origin country.
///
/// The amount of a threshold is not tracked or managed in AvaTax, but the decision of your tax compliance department
/// as to whether you have exceeded this threshold is maintained in this object.
///
/// By default, you are considered to have exceeded tax thresholds. If you wish to change this default, you can create
/// a company-distance-threshold object to select the correct behavior for this origin/destination tax calculation process.
/// </summary>
public class CompanyDistanceThresholdModel
{
/// <summary>
/// A unique ID number representing this distance threshold object.
/// </summary>
public Int64? id { get; set; }

/// <summary>
/// The ID number of the company that defined this distance threshold.
/// </summary>
public Int32? companyId { get; set; }

/// <summary>
/// The origin country for this threshold.
///
/// This field supports many different country identifiers:
/// * Two character ISO 3166 codes
/// * Three character ISO 3166 codes
/// * Fully spelled out names of the country in ISO supported languages
/// * Common alternative spellings for many countries
///
/// For a full list of all supported codes and names, please see the Definitions API `ListCountries`.
/// </summary>
public String originCountry { get; set; }

/// <summary>
/// The destination country for this threshold.
///
/// This field supports many different country identifiers:
/// * Two character ISO 3166 codes
/// * Three character ISO 3166 codes
/// * Fully spelled out names of the country in ISO supported languages
/// * Common alternative spellings for many countries
///
/// For a full list of all supported codes and names, please see the Definitions API `ListCountries`.
/// </summary>
public String destinationCountry { get; set; }

/// <summary>
/// For distance threshold values that change over time, this is the earliest date for which this distance
/// threshold is valid. If null, this distance threshold is valid for all dates earlier than the `endDate` field.
/// </summary>
public DateTime? effDate { get; set; }

/// <summary>
/// For distance threshold values that change over time, this is the latest date for which this distance
/// threshold is valid. If null, this distance threshold is valid for all dates later than the `effDate` field.
/// </summary>
public DateTime? endDate { get; set; }

/// <summary>
/// True if your tax professional has determined that the value-added tax distance threshold is exceeded for this pair of countries.
///
/// If you set this value to `false`, your value added taxes will be calculated using the origin country. Otherwise, value
/// added taxes will be calculated on the destination country.
/// </summary>
public Boolean? thresholdExceeded { get; set; }

/// <summary>
/// Indicates the distance threshold type.
///
/// This value can be either `Sale` or `Purchase`.
/// </summary>
public String type { get; set; }


/// <summary>
/// Convert this object to a JSON string of itself
/// </summary>
/// <returns>A JSON string of this object</returns>
public override string ToString()
{
return JsonConvert.SerializeObject(this, new JsonSerializerSettings() { Formatting = Formatting.Indented });
}
}
}
10 changes: 10 additions & 0 deletions src/models/CompanyModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,16 @@ public class CompanyModel
/// </summary>
public List<EcmsModel> exemptCerts { get; set; }

/// <summary>
/// The unique identifier of the mini-one-stop-shop used for Value Added Tax (VAT) processing.
/// </summary>
public String mossId { get; set; }

/// <summary>
/// The country code of the mini-one-stop-shop used for Value Added Tax (VAT) processing.
/// </summary>
public String mossCountry { get; set; }


/// <summary>
/// Convert this object to a JSON string of itself
Expand Down
13 changes: 9 additions & 4 deletions src/models/CreateMultiDocumentModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*
* @author Ted Spence
* @author Zhenya Frolov
<<<<<<< HEAD
=======
* @author Greg Hester
>>>>>>> 5772f82e9b5d7d2aa37973d9dec53f2633b41978
*/

namespace Avalara.AvaTax.RestClient
Expand Down Expand Up @@ -213,7 +210,15 @@ public class CreateMultiDocumentModel
public String businessIdentificationNo { get; set; }

/// <summary>
/// Specifies if the Transaction has the seller as IsSellerImporterOfRecord.
/// Specifies if the transaction should have value-added and cross-border taxes calculated with the seller as the importer of record.
///
/// Some taxes only apply if the seller is the importer of record for a product. In cases where companies are working together to
/// ship products, there may be mutual agreement as to which company is the entity designated as importer of record. The importer
/// of record will then be the company designated to pay taxes marked as being obligated to the importer of record.
///
/// Set this value to `true` to consider your company as the importer of record and collect these taxes.
///
/// This value may also be set at the Nexus level. See `NexusModel` for more information.
/// </summary>
public Boolean? isSellerImporterOfRecord { get; set; }

Expand Down
10 changes: 9 additions & 1 deletion src/models/CreateTransactionModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,15 @@ public class CreateTransactionModel
public String businessIdentificationNo { get; set; }

/// <summary>
/// Specifies if the Transaction has the seller as IsSellerImporterOfRecord.
/// Specifies if the transaction should have value-added and cross-border taxes calculated with the seller as the importer of record.
///
/// Some taxes only apply if the seller is the importer of record for a product. In cases where companies are working together to
/// ship products, there may be mutual agreement as to which company is the entity designated as importer of record. The importer
/// of record will then be the company designated to pay taxes marked as being obligated to the importer of record.
///
/// Set this value to `true` to consider your company as the importer of record and collect these taxes.
///
/// This value may also be set at the Nexus level. See `NexusModel` for more information.
/// </summary>
public Boolean? isSellerImporterOfRecord { get; set; }

Expand Down
Loading

0 comments on commit d643c72

Please sign in to comment.