Releasing 12.0.1 (OAS: 12.0.2)

actions-user · actions-user · commit 223f91ed8193 · 2026-04-21T21:58:04.000Z
diff --git a/docs/v2/accounting/index.html b/docs/v2/accounting/index.html
@@ -4112,7 +4112,11 @@
     "OrganisationType" : {
       "type" : "string",
       "description" : "Organisation Type",
+<<<<<<< Updated upstream
       "enum" : [ "ACCOUNTING_PRACTICE", "CCORPORATIONLLC", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "INDIVIDUAL", "LLC", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "NOTLLC", "PARTNERSHIP", "PARTNERSHIPLLC", "PERSONAL", "S_CORPORATION", "SCORPORATIONLLC", "SELF_MANAGED_SUPERANNUATION_FUND", "SINGLEMEMBERLLC", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST", "UNSPECIFIED" ]
+=======
+      "enum" : [ "ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "INDIVIDUAL", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST", "PERSONAL", "SINGLEMEMBERLLC", "CCORPORATIONLLC", "PARTNERSHIPLLC", "SCORPORATIONLLC", "LLC", "NOTLLC", "UNSPECIFIED" ]
+>>>>>>> Stashed changes
     },
     "BaseCurrency" : {
       "$ref" : "#/components/schemas/CurrencyCode"
@@ -4189,7 +4193,11 @@
     "OrganisationEntityType" : {
       "type" : "string",
       "description" : "Organisation Entity Type",
+<<<<<<< Updated upstream
       "enum" : [ "ACCOUNTING_PRACTICE", "CCORPORATIONLLC", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "INDIVIDUAL", "LLC", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "NOTLLC", "PARTNERSHIP", "PARTNERSHIPLLC", "PERSONAL", "S_CORPORATION", "SCORPORATIONLLC", "SELF_MANAGED_SUPERANNUATION_FUND", "SINGLEMEMBERLLC", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST", "UNSPECIFIED" ]
+=======
+      "enum" : [ "ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "INDIVIDUAL", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST", "PERSONAL", "SINGLEMEMBERLLC", "CCORPORATIONLLC", "PARTNERSHIPLLC", "SCORPORATIONLLC", "LLC", "NOTLLC", "UNSPECIFIED" ]
+>>>>>>> Stashed changes
     },
     "ShortCode" : {
       "type" : "string",
diff --git a/lib/Api/AccountingApi.php b/lib/Api/AccountingApi.php
@@ -14,7 +14,11 @@
  *
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/AppStoreApi.php b/lib/Api/AppStoreApi.php
@@ -14,7 +14,11 @@
  *
  * These endpoints are for Xero Partners to interact with the App Store Billing platform
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/AssetApi.php b/lib/Api/AssetApi.php
@@ -14,7 +14,11 @@
  *
  * The Assets API exposes fixed asset related functions of the Xero Accounting application and can be used for a variety of purposes such as creating assets, retrieving asset valuations etc.
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/FilesApi.php b/lib/Api/FilesApi.php
@@ -14,7 +14,11 @@
  *
  * These endpoints are specific to Xero Files API
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/FinanceApi.php b/lib/Api/FinanceApi.php
@@ -14,7 +14,11 @@
  *
  * The Finance API is a collection of endpoints which customers can use in the course of a loan application, which may assist lenders to gain the confidence they need to provide capital.
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/IdentityApi.php b/lib/Api/IdentityApi.php
@@ -14,7 +14,11 @@
  *
  * These endpoints are related to managing authentication tokens and identity for Xero API
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/PayrollAuApi.php b/lib/Api/PayrollAuApi.php
@@ -14,7 +14,11 @@
  *
  * This is the Xero Payroll API for orgs in Australia region.
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/PayrollAuV2Api.php b/lib/Api/PayrollAuV2Api.php
@@ -14,7 +14,11 @@
  *
  * This is the Xero Payroll API 2.0 for orgs in Australia region.
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/PayrollNzApi.php b/lib/Api/PayrollNzApi.php
@@ -14,7 +14,11 @@
  *
  * This is the Xero Payroll API for orgs in the NZ region.
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/PayrollUkApi.php b/lib/Api/PayrollUkApi.php
@@ -14,7 +14,11 @@
  *
  * This is the Xero Payroll API for orgs in the UK region.
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Api/ProjectApi.php b/lib/Api/ProjectApi.php
@@ -14,7 +14,11 @@
  *
  * This is the Xero Projects API
  *
+<<<<<<< Updated upstream
  * OpenAPI spec version: 12.0.1
+=======
+ * OpenAPI spec version: 12.0.2
+>>>>>>> Stashed changes
  * Contact: api@xero.com
  * Generated by: https://openapi-generator.tech
  * OpenAPI Generator version: 5.4.0
diff --git a/lib/Configuration.php b/lib/Configuration.php
@@ -696,7 +696,11 @@ public static function toDebugReport()
         $report  = 'PHP SDK (XeroAPI\XeroPHP) Debug Report:' . PHP_EOL;
         $report .= '    OS: ' . php_uname() . PHP_EOL;
         $report .= '    PHP Version: ' . PHP_VERSION . PHP_EOL;
+<<<<<<< Updated upstream
         $report .= '    OpenAPI Spec Version: 12.0.1' . PHP_EOL;
+=======
+        $report .= '    OpenAPI Spec Version: 12.0.2' . PHP_EOL;
+>>>>>>> Stashed changes
         $report .= '    SDK Package Version: 12.0.1' . PHP_EOL;
         $report .= '    Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;
 
diff --git a/lib/Models/Accounting/Organisation.php b/lib/Models/Accounting/Organisation.php
@@ -349,6 +349,16 @@ public function getModelName()
     const ORGANISATION_TYPE_SOLE_TRADER = 'SOLE_TRADER';
     const ORGANISATION_TYPE_SUPERANNUATION_FUND = 'SUPERANNUATION_FUND';
     const ORGANISATION_TYPE_TRUST = 'TRUST';
+<<<<<<< Updated upstream
+=======
+    const ORGANISATION_TYPE_PERSONAL = 'PERSONAL';
+    const ORGANISATION_TYPE_SINGLEMEMBERLLC = 'SINGLEMEMBERLLC';
+    const ORGANISATION_TYPE_CCORPORATIONLLC = 'CCORPORATIONLLC';
+    const ORGANISATION_TYPE_PARTNERSHIPLLC = 'PARTNERSHIPLLC';
+    const ORGANISATION_TYPE_SCORPORATIONLLC = 'SCORPORATIONLLC';
+    const ORGANISATION_TYPE_LLC = 'LLC';
+    const ORGANISATION_TYPE_NOTLLC = 'NOTLLC';
+>>>>>>> Stashed changes
     const ORGANISATION_TYPE_UNSPECIFIED = 'UNSPECIFIED';
     const SALES_TAX_BASIS_PAYMENTS = 'PAYMENTS';
     const SALES_TAX_BASIS_INVOICE = 'INVOICE';
@@ -393,6 +403,16 @@ public function getModelName()
     const ORGANISATION_ENTITY_TYPE_SOLE_TRADER = 'SOLE_TRADER';
     const ORGANISATION_ENTITY_TYPE_SUPERANNUATION_FUND = 'SUPERANNUATION_FUND';
     const ORGANISATION_ENTITY_TYPE_TRUST = 'TRUST';
+<<<<<<< Updated upstream
+=======
+    const ORGANISATION_ENTITY_TYPE_PERSONAL = 'PERSONAL';
+    const ORGANISATION_ENTITY_TYPE_SINGLEMEMBERLLC = 'SINGLEMEMBERLLC';
+    const ORGANISATION_ENTITY_TYPE_CCORPORATIONLLC = 'CCORPORATIONLLC';
+    const ORGANISATION_ENTITY_TYPE_PARTNERSHIPLLC = 'PARTNERSHIPLLC';
+    const ORGANISATION_ENTITY_TYPE_SCORPORATIONLLC = 'SCORPORATIONLLC';
+    const ORGANISATION_ENTITY_TYPE_LLC = 'LLC';
+    const ORGANISATION_ENTITY_TYPE_NOTLLC = 'NOTLLC';
+>>>>>>> Stashed changes
     const ORGANISATION_ENTITY_TYPE_UNSPECIFIED = 'UNSPECIFIED';
     const MODEL_CLASS_DEMO = 'DEMO';
     const MODEL_CLASS_TRIAL = 'TRIAL';
@@ -469,6 +489,16 @@ public function getOrganisationTypeAllowableValues()
             self::ORGANISATION_TYPE_SOLE_TRADER,
             self::ORGANISATION_TYPE_SUPERANNUATION_FUND,
             self::ORGANISATION_TYPE_TRUST,
+<<<<<<< Updated upstream
+=======
+            self::ORGANISATION_TYPE_PERSONAL,
+            self::ORGANISATION_TYPE_SINGLEMEMBERLLC,
+            self::ORGANISATION_TYPE_CCORPORATIONLLC,
+            self::ORGANISATION_TYPE_PARTNERSHIPLLC,
+            self::ORGANISATION_TYPE_SCORPORATIONLLC,
+            self::ORGANISATION_TYPE_LLC,
+            self::ORGANISATION_TYPE_NOTLLC,
+>>>>>>> Stashed changes
             self::ORGANISATION_TYPE_UNSPECIFIED,
         ];
     }
@@ -546,6 +576,16 @@ public function getOrganisationEntityTypeAllowableValues()
             self::ORGANISATION_ENTITY_TYPE_SOLE_TRADER,
             self::ORGANISATION_ENTITY_TYPE_SUPERANNUATION_FUND,
             self::ORGANISATION_ENTITY_TYPE_TRUST,
+<<<<<<< Updated upstream
+=======
+            self::ORGANISATION_ENTITY_TYPE_PERSONAL,
+            self::ORGANISATION_ENTITY_TYPE_SINGLEMEMBERLLC,
+            self::ORGANISATION_ENTITY_TYPE_CCORPORATIONLLC,
+            self::ORGANISATION_ENTITY_TYPE_PARTNERSHIPLLC,
+            self::ORGANISATION_ENTITY_TYPE_SCORPORATIONLLC,
+            self::ORGANISATION_ENTITY_TYPE_LLC,
+            self::ORGANISATION_ENTITY_TYPE_NOTLLC,
+>>>>>>> Stashed changes
             self::ORGANISATION_ENTITY_TYPE_UNSPECIFIED,
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,11 @@`
`14`	`14`	`*`
`15`	`15`	`* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)`
`16`	`16`	`*`
	`17`	`+<<<<<<< Updated upstream`
`17`	`18`	`* OpenAPI spec version: 12.0.1`
	`19`	`+=======`
	`20`	`+ * OpenAPI spec version: 12.0.2`
	`21`	`+>>>>>>> Stashed changes`
`18`	`22`	`* Contact: api@xero.com`
`19`	`23`	`* Generated by: https://openapi-generator.tech`
`20`	`24`	`* OpenAPI Generator version: 5.4.0`