diff --git a/docs/v4/accounting/index.html b/docs/v4/accounting/index.html index 9667a9f0..1e870210 100644 --- a/docs/v4/accounting/index.html +++ b/docs/v4/accounting/index.html @@ -6335,7 +6335,7 @@ SDK: - VSN: 8.3.0 + VSN: 9.0.0 Methods createAccount diff --git a/docs/v4/appstore/index.html b/docs/v4/appstore/index.html index 3f39be5d..24581e69 100644 --- a/docs/v4/appstore/index.html +++ b/docs/v4/appstore/index.html @@ -1237,7 +1237,7 @@ SDK: - VSN: 8.3.0 + VSN: 9.0.0 Methods getSubscription diff --git a/docs/v4/assets/index.html b/docs/v4/assets/index.html index d22ba9b3..f5faef5f 100644 --- a/docs/v4/assets/index.html +++ b/docs/v4/assets/index.html @@ -1388,7 +1388,7 @@ SDK: - VSN: 8.3.0 + VSN: 9.0.0 Methods createAsset diff --git a/docs/v4/files/index.html b/docs/v4/files/index.html index 5628e22c..d452c474 100644 --- a/docs/v4/files/index.html +++ b/docs/v4/files/index.html @@ -1144,7 +1144,7 @@ SDK: - VSN: 8.3.0 + VSN: 9.0.0 Methods createFileAssociation diff --git a/docs/v4/finance/index.html b/docs/v4/finance/index.html index 47852a39..2daa4920 100644 --- a/docs/v4/finance/index.html +++ b/docs/v4/finance/index.html @@ -1515,7 +1515,7 @@ }, "importSourceType" : { "type" : "string", - "description" : "Looking at the most recent bank statement, this field indicates the source of the data (direct bank feed, indirect bank feed, file upload, or manual keying)." + "description" : "Looking at the most recent bank statement, this field indicates the source of the data (direct bank feed, file upload, or manual keying)." } }, "additionalProperties" : false, @@ -1531,13 +1531,6 @@ "format" : "double", "x-is-money" : true }, - "indirectBankFeed" : { - "type" : "number", - "description" : "No longer in use.", - "format" : "double", - "deprecated" : true, - "x-is-money" : true - }, "fileUpload" : { "type" : "number", "description" : "Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data.", @@ -1556,13 +1549,6 @@ "format" : "double", "x-is-money" : true }, - "indirectBankFeedPos" : { - "type" : "number", - "description" : "No longer in use.", - "format" : "double", - "deprecated" : true, - "x-is-money" : true - }, "fileUploadPos" : { "type" : "number", "description" : "Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data. Only positive transactions are included.", @@ -1581,13 +1567,6 @@ "format" : "double", "x-is-money" : true }, - "indirectBankFeedNeg" : { - "type" : "number", - "description" : "No longer in use.", - "format" : "double", - "deprecated" : true, - "x-is-money" : true - }, "fileUploadNeg" : { "type" : "number", "description" : "Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data. Only negative transactions are included.", @@ -2733,7 +2712,7 @@ SDK: - VSN: 8.3.0 + VSN: 9.0.0 Methods getAccountingActivityAccountUsage diff --git a/docs/v4/payroll-au/index.html b/docs/v4/payroll-au/index.html index f588e5d2..2bf1cd4e 100644 --- a/docs/v4/payroll-au/index.html +++ b/docs/v4/payroll-au/index.html @@ -3411,7 +3411,7 @@ SDK: - VSN: 8.3.0 + VSN: 9.0.0 Methods approveLeaveApplication diff --git a/docs/v4/payroll-nz/index.html b/docs/v4/payroll-nz/index.html index c5906753..6f53f52a 100644 --- a/docs/v4/payroll-nz/index.html +++ b/docs/v4/payroll-nz/index.html @@ -1682,14 +1682,28 @@ }, "sickLeaveHoursToAccrueAnnually" : { "type" : "number", - "description" : "Number of hours accrued annually for sick leave. Multiply the number of days they're entitled to by the hours worked per day", + "description" : "Deprecated use SickLeaveToAccrueAnnually", "format" : "double", "example" : 100.5, "x-is-money" : true }, "sickLeaveMaximumHoursToAccrue" : { "type" : "number", - "description" : "Maximum number of hours accrued annually for sick leave. Multiply the maximum days they can accrue by the hours worked per day", + "description" : "Deprecated use SickLeaveMaximumToAccrue", + "format" : "double", + "example" : 200.5, + "x-is-money" : true + }, + "SickLeaveToAccrueAnnually" : { + "type" : "number", + "description" : "Number of units accrued annually for sick leave. The type of units is determined by the property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type", + "format" : "double", + "example" : 100.5, + "x-is-money" : true + }, + "SickLeaveMaximumToAccrue" : { + "type" : "number", + "description" : "Maximum number of units accrued annually for sick leave. The type of units is determined by the property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type", "format" : "double", "example" : 200.5, "x-is-money" : true @@ -1708,7 +1722,14 @@ }, "SickLeaveAnniversaryDate" : { "type" : "string", - "description" : "If Sick Leave Schedule of Accrual is \"OnAnniversaryDate\", this is the date when entitled to Sick Leave", + "description" : "If Sick Leave Schedule of Accrual is \"OnAnniversaryDate\", this is the date when entitled to Sick Leave. When null the Employee's start date is used as the anniversary date", + "format" : "date", + "example" : "2020-01-19", + "x-is-date" : true + }, + "AnnualLeaveAnniversaryDate" : { + "type" : "string", + "description" : "The first date the employee will accrue Annual Leave. When null the Employee's start date is used as the anniversary date", "format" : "date", "example" : "2020-01-19", "x-is-date" : true @@ -1748,22 +1769,36 @@ }, "hoursAccruedAnnually" : { "type" : "number", - "description" : "The number of hours accrued for the leave annually. This is 0 when the scheduleOfAccrual chosen is \"OnHourWorked\"", + "description" : "Deprecated use UnitsAccruedAnnually", "format" : "double", "x-is-money" : true }, + "UnitsAccruedAnnually" : { + "type" : "number", + "description" : "The number of units accrued for the leave annually. This is 0 when the ScheduleOfAccrual chosen is \"NoAccruals\"", + "format" : "double", + "x-is-money" : true + }, + "typeOfUnitsToAccrue" : { + "type" : "string", + "description" : "The type of units accrued for the leave annually" + }, "maximumToAccrue" : { "type" : "number", - "description" : "The maximum number of hours that can be accrued for the leave", + "description" : "The maximum number of units that can be accrued for the leave", "format" : "double", "x-is-money" : true }, "openingBalance" : { "type" : "number", - "description" : "The initial number of hours assigned when the leave was added to the employee", + "description" : "The initial number of units assigned when the leave was added to the employee", "format" : "double", "x-is-money" : true }, + "openingBalanceTypeOfUnits" : { + "type" : "string", + "description" : "The type of units for the opening balance" + }, "rateAccruedHourly" : { "type" : "number", "description" : "The number of hours added to the leave balance for every hour worked by the employee. This is normally 0, unless the scheduleOfAccrual chosen is \"OnHourWorked\"", @@ -2607,10 +2642,23 @@ "format" : "double", "x-is-money" : true }, + "numberOfUnitsTaken" : { + "type" : "number", + "description" : "The number of units taken for the leave", + "format" : "double" + }, + "typeOfUnits" : { + "type" : "string", + "description" : "The type of units paid for the leave" + }, + "typeOfUnitsTaken" : { + "type" : "string", + "description" : "The type of units taken for the leave" + }, "periodStatus" : { "type" : "string", - "description" : "Period Status", - "enum" : [ "Approved", "Completed" ] + "description" : "Status of leave", + "enum" : [ "Approved", "Completed", "Estimated" ] } }, "description" : "" @@ -2665,6 +2713,14 @@ "isActive" : { "type" : "boolean", "description" : "Shows whether the leave type is active or not" + }, + "typeOfUnits" : { + "type" : "string", + "description" : "The type of units to be paid for the leave type" + }, + "typeOfUnitsToAccrue" : { + "type" : "string", + "description" : "The type of units to be accrued for the leave type" } }, "description" : "" @@ -4027,7 +4083,7 @@ SDK: - VSN: 8.3.0 + VSN: 9.0.0 Methods approveTimesheet diff --git a/docs/v4/payroll-uk/index.html b/docs/v4/payroll-uk/index.html index e55f2b57..a3f6c869 100644 --- a/docs/v4/payroll-uk/index.html +++ b/docs/v4/payroll-uk/index.html @@ -3513,7 +3513,7 @@ SDK: - VSN: 8.3.0 + VSN: 9.0.0 Methods approveTimesheet diff --git a/pom.xml b/pom.xml index 73939d89..1f066dcd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ xero-java jar xero-java - 8.3.0 + 9.0.0 https://github.com/XeroAPI/Xero-Java This is the official Java SDK for Xero API diff --git a/src/main/java/com/xero/api/client/AccountingApi.java b/src/main/java/com/xero/api/client/AccountingApi.java index bb016a1d..de10ff27 100644 --- a/src/main/java/com/xero/api/client/AccountingApi.java +++ b/src/main/java/com/xero/api/client/AccountingApi.java @@ -2,7 +2,7 @@ * Xero Accounting API * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -102,7 +102,7 @@ public class AccountingApi { private ApiClient apiClient; private static AccountingApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(AccountingApi.class); /** AccountingApi */ diff --git a/src/main/java/com/xero/api/client/AppStoreApi.java b/src/main/java/com/xero/api/client/AppStoreApi.java index 8b7cc13a..f51fb272 100644 --- a/src/main/java/com/xero/api/client/AppStoreApi.java +++ b/src/main/java/com/xero/api/client/AppStoreApi.java @@ -2,7 +2,7 @@ * Xero AppStore API * These endpoints are for Xero Partners to interact with the App Store Billing platform * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -46,7 +46,7 @@ public class AppStoreApi { private ApiClient apiClient; private static AppStoreApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(AppStoreApi.class); /** AppStoreApi */ diff --git a/src/main/java/com/xero/api/client/AssetApi.java b/src/main/java/com/xero/api/client/AssetApi.java index 02501798..ccff451b 100644 --- a/src/main/java/com/xero/api/client/AssetApi.java +++ b/src/main/java/com/xero/api/client/AssetApi.java @@ -2,7 +2,7 @@ * Xero Assets API * 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. * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -49,7 +49,7 @@ public class AssetApi { private ApiClient apiClient; private static AssetApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(AssetApi.class); /** AssetApi */ diff --git a/src/main/java/com/xero/api/client/BankFeedsApi.java b/src/main/java/com/xero/api/client/BankFeedsApi.java index 452d5331..f19f9bfc 100644 --- a/src/main/java/com/xero/api/client/BankFeedsApi.java +++ b/src/main/java/com/xero/api/client/BankFeedsApi.java @@ -2,7 +2,7 @@ * Xero Bank Feeds API * The Bank Feeds API is a closed API that is only available to financial institutions that have an established financial services partnership with Xero. If you're an existing financial services partner that wants access, contact your local Partner Manager. If you're a financial institution who wants to provide bank feeds to your business customers, contact us to become a financial services partner. * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -48,7 +48,7 @@ public class BankFeedsApi { private ApiClient apiClient; private static BankFeedsApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(BankFeedsApi.class); /** BankFeedsApi */ diff --git a/src/main/java/com/xero/api/client/FilesApi.java b/src/main/java/com/xero/api/client/FilesApi.java index 3027d1d0..4a59e3f8 100644 --- a/src/main/java/com/xero/api/client/FilesApi.java +++ b/src/main/java/com/xero/api/client/FilesApi.java @@ -2,7 +2,7 @@ * Xero Files API * These endpoints are specific to Xero Files API * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -54,7 +54,7 @@ public class FilesApi { private ApiClient apiClient; private static FilesApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(FilesApi.class); /** FilesApi */ diff --git a/src/main/java/com/xero/api/client/FinanceApi.java b/src/main/java/com/xero/api/client/FinanceApi.java index 3c2571ee..f65c797e 100644 --- a/src/main/java/com/xero/api/client/FinanceApi.java +++ b/src/main/java/com/xero/api/client/FinanceApi.java @@ -2,7 +2,7 @@ * Xero Finance API * 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. * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -53,7 +53,7 @@ public class FinanceApi { private ApiClient apiClient; private static FinanceApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(FinanceApi.class); /** FinanceApi */ diff --git a/src/main/java/com/xero/api/client/IdentityApi.java b/src/main/java/com/xero/api/client/IdentityApi.java index 7225b8b0..51799ac5 100644 --- a/src/main/java/com/xero/api/client/IdentityApi.java +++ b/src/main/java/com/xero/api/client/IdentityApi.java @@ -2,7 +2,7 @@ * Xero OAuth 2 Identity Service API * These endpoints are related to managing authentication tokens and identity for Xero API * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -45,7 +45,7 @@ public class IdentityApi { private ApiClient apiClient; private static IdentityApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(IdentityApi.class); /** IdentityApi */ diff --git a/src/main/java/com/xero/api/client/PayrollAuApi.java b/src/main/java/com/xero/api/client/PayrollAuApi.java index c796d4fa..1eaf3568 100644 --- a/src/main/java/com/xero/api/client/PayrollAuApi.java +++ b/src/main/java/com/xero/api/client/PayrollAuApi.java @@ -2,7 +2,7 @@ * Xero Payroll AU API * This is the Xero Payroll API for orgs in Australia region. * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -65,7 +65,7 @@ public class PayrollAuApi { private ApiClient apiClient; private static PayrollAuApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(PayrollAuApi.class); /** PayrollAuApi */ diff --git a/src/main/java/com/xero/api/client/PayrollNzApi.java b/src/main/java/com/xero/api/client/PayrollNzApi.java index fd92d0bc..6960a0aa 100644 --- a/src/main/java/com/xero/api/client/PayrollNzApi.java +++ b/src/main/java/com/xero/api/client/PayrollNzApi.java @@ -2,7 +2,7 @@ * Xero Payroll NZ * This is the Xero Payroll API for orgs in the NZ region. * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -109,7 +109,7 @@ public class PayrollNzApi { private ApiClient apiClient; private static PayrollNzApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(PayrollNzApi.class); /** PayrollNzApi */ diff --git a/src/main/java/com/xero/api/client/PayrollUkApi.java b/src/main/java/com/xero/api/client/PayrollUkApi.java index c71e0615..13aae603 100644 --- a/src/main/java/com/xero/api/client/PayrollUkApi.java +++ b/src/main/java/com/xero/api/client/PayrollUkApi.java @@ -2,7 +2,7 @@ * Xero Payroll UK * This is the Xero Payroll API for orgs in the UK region. * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -106,7 +106,7 @@ public class PayrollUkApi { private ApiClient apiClient; private static PayrollUkApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(PayrollUkApi.class); /** PayrollUkApi */ diff --git a/src/main/java/com/xero/api/client/ProjectApi.java b/src/main/java/com/xero/api/client/ProjectApi.java index 708ad9be..8041f280 100644 --- a/src/main/java/com/xero/api/client/ProjectApi.java +++ b/src/main/java/com/xero/api/client/ProjectApi.java @@ -2,7 +2,7 @@ * Xero Projects API * This is the Xero Projects API * - * The version of the OpenAPI document: 6.3.0 + * The version of the OpenAPI document: 7.0.0 * Contact: api@xero.com * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -57,7 +57,7 @@ public class ProjectApi { private ApiClient apiClient; private static ProjectApi instance = null; private String userAgent = "Default"; - private String version = "8.3.0"; + private String version = "9.0.0"; static final Logger logger = LoggerFactory.getLogger(ProjectApi.class); /** ProjectApi */ diff --git a/src/main/java/com/xero/models/finance/CurrentStatementResponse.java b/src/main/java/com/xero/models/finance/CurrentStatementResponse.java index 8c05f747..83c9cfdf 100644 --- a/src/main/java/com/xero/models/finance/CurrentStatementResponse.java +++ b/src/main/java/com/xero/models/finance/CurrentStatementResponse.java @@ -263,7 +263,7 @@ public void setImportedDateTimeUtc(OffsetDateTime importedDateTimeUtc) { /** * Looking at the most recent bank statement, this field indicates the source of the data (direct - * bank feed, indirect bank feed, file upload, or manual keying). + * bank feed, file upload, or manual keying). * * @param importSourceType String * @return CurrentStatementResponse @@ -275,17 +275,17 @@ public CurrentStatementResponse importSourceType(String importSourceType) { /** * Looking at the most recent bank statement, this field indicates the source of the data (direct - * bank feed, indirect bank feed, file upload, or manual keying). + * bank feed, file upload, or manual keying). * * @return importSourceType */ @ApiModelProperty( value = "Looking at the most recent bank statement, this field indicates the source of the data" - + " (direct bank feed, indirect bank feed, file upload, or manual keying).") + + " (direct bank feed, file upload, or manual keying).") /** * Looking at the most recent bank statement, this field indicates the source of the data (direct - * bank feed, indirect bank feed, file upload, or manual keying). + * bank feed, file upload, or manual keying). * * @return importSourceType String */ @@ -295,7 +295,7 @@ public String getImportSourceType() { /** * Looking at the most recent bank statement, this field indicates the source of the data (direct - * bank feed, indirect bank feed, file upload, or manual keying). + * bank feed, file upload, or manual keying). * * @param importSourceType String */ diff --git a/src/main/java/com/xero/models/finance/DataSourceResponse.java b/src/main/java/com/xero/models/finance/DataSourceResponse.java index 89ab19ef..ee713e9a 100644 --- a/src/main/java/com/xero/models/finance/DataSourceResponse.java +++ b/src/main/java/com/xero/models/finance/DataSourceResponse.java @@ -23,9 +23,6 @@ public class DataSourceResponse { @JsonProperty("directBankFeed") private Double directBankFeed; - @JsonProperty("indirectBankFeed") - private Double indirectBankFeed; - @JsonProperty("fileUpload") private Double fileUpload; @@ -35,9 +32,6 @@ public class DataSourceResponse { @JsonProperty("directBankFeedPos") private Double directBankFeedPos; - @JsonProperty("indirectBankFeedPos") - private Double indirectBankFeedPos; - @JsonProperty("fileUploadPos") private Double fileUploadPos; @@ -47,9 +41,6 @@ public class DataSourceResponse { @JsonProperty("directBankFeedNeg") private Double directBankFeedNeg; - @JsonProperty("indirectBankFeedNeg") - private Double indirectBankFeedNeg; - @JsonProperty("fileUploadNeg") private Double fileUploadNeg; @@ -112,41 +103,6 @@ public void setDirectBankFeed(Double directBankFeed) { this.directBankFeed = directBankFeed; } - /** - * No longer in use. - * - * @param indirectBankFeed Double - * @return DataSourceResponse - */ - public DataSourceResponse indirectBankFeed(Double indirectBankFeed) { - this.indirectBankFeed = indirectBankFeed; - return this; - } - - /** - * No longer in use. - * - * @return indirectBankFeed - */ - @ApiModelProperty(value = "No longer in use.") - /** - * No longer in use. - * - * @return indirectBankFeed Double - */ - public Double getIndirectBankFeed() { - return indirectBankFeed; - } - - /** - * No longer in use. - * - * @param indirectBankFeed Double - */ - public void setIndirectBankFeed(Double indirectBankFeed) { - this.indirectBankFeed = indirectBankFeed; - } - /** * Sum of the amounts of all statement lines where the source of the data was a file manually * uploaded in to Xero. This gives an indication on the certainty of correctness of the data. @@ -285,41 +241,6 @@ public void setDirectBankFeedPos(Double directBankFeedPos) { this.directBankFeedPos = directBankFeedPos; } - /** - * No longer in use. - * - * @param indirectBankFeedPos Double - * @return DataSourceResponse - */ - public DataSourceResponse indirectBankFeedPos(Double indirectBankFeedPos) { - this.indirectBankFeedPos = indirectBankFeedPos; - return this; - } - - /** - * No longer in use. - * - * @return indirectBankFeedPos - */ - @ApiModelProperty(value = "No longer in use.") - /** - * No longer in use. - * - * @return indirectBankFeedPos Double - */ - public Double getIndirectBankFeedPos() { - return indirectBankFeedPos; - } - - /** - * No longer in use. - * - * @param indirectBankFeedPos Double - */ - public void setIndirectBankFeedPos(Double indirectBankFeedPos) { - this.indirectBankFeedPos = indirectBankFeedPos; - } - /** * Sum of the amounts of all statement lines where the source of the data was a file manually * uploaded in to Xero. This gives an indication on the certainty of correctness of the data. Only @@ -466,41 +387,6 @@ public void setDirectBankFeedNeg(Double directBankFeedNeg) { this.directBankFeedNeg = directBankFeedNeg; } - /** - * No longer in use. - * - * @param indirectBankFeedNeg Double - * @return DataSourceResponse - */ - public DataSourceResponse indirectBankFeedNeg(Double indirectBankFeedNeg) { - this.indirectBankFeedNeg = indirectBankFeedNeg; - return this; - } - - /** - * No longer in use. - * - * @return indirectBankFeedNeg - */ - @ApiModelProperty(value = "No longer in use.") - /** - * No longer in use. - * - * @return indirectBankFeedNeg Double - */ - public Double getIndirectBankFeedNeg() { - return indirectBankFeedNeg; - } - - /** - * No longer in use. - * - * @param indirectBankFeedNeg Double - */ - public void setIndirectBankFeedNeg(Double indirectBankFeedNeg) { - this.indirectBankFeedNeg = indirectBankFeedNeg; - } - /** * Sum of the amounts of all statement lines where the source of the data was a file manually * uploaded in to Xero. This gives an indication on the certainty of correctness of the data. Only @@ -741,15 +627,12 @@ public boolean equals(java.lang.Object o) { } DataSourceResponse dataSourceResponse = (DataSourceResponse) o; return Objects.equals(this.directBankFeed, dataSourceResponse.directBankFeed) - && Objects.equals(this.indirectBankFeed, dataSourceResponse.indirectBankFeed) && Objects.equals(this.fileUpload, dataSourceResponse.fileUpload) && Objects.equals(this.manual, dataSourceResponse.manual) && Objects.equals(this.directBankFeedPos, dataSourceResponse.directBankFeedPos) - && Objects.equals(this.indirectBankFeedPos, dataSourceResponse.indirectBankFeedPos) && Objects.equals(this.fileUploadPos, dataSourceResponse.fileUploadPos) && Objects.equals(this.manualPos, dataSourceResponse.manualPos) && Objects.equals(this.directBankFeedNeg, dataSourceResponse.directBankFeedNeg) - && Objects.equals(this.indirectBankFeedNeg, dataSourceResponse.indirectBankFeedNeg) && Objects.equals(this.fileUploadNeg, dataSourceResponse.fileUploadNeg) && Objects.equals(this.manualNeg, dataSourceResponse.manualNeg) && Objects.equals(this.otherPos, dataSourceResponse.otherPos) @@ -761,15 +644,12 @@ public boolean equals(java.lang.Object o) { public int hashCode() { return Objects.hash( directBankFeed, - indirectBankFeed, fileUpload, manual, directBankFeedPos, - indirectBankFeedPos, fileUploadPos, manualPos, directBankFeedNeg, - indirectBankFeedNeg, fileUploadNeg, manualNeg, otherPos, @@ -782,19 +662,12 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class DataSourceResponse {\n"); sb.append(" directBankFeed: ").append(toIndentedString(directBankFeed)).append("\n"); - sb.append(" indirectBankFeed: ").append(toIndentedString(indirectBankFeed)).append("\n"); sb.append(" fileUpload: ").append(toIndentedString(fileUpload)).append("\n"); sb.append(" manual: ").append(toIndentedString(manual)).append("\n"); sb.append(" directBankFeedPos: ").append(toIndentedString(directBankFeedPos)).append("\n"); - sb.append(" indirectBankFeedPos: ") - .append(toIndentedString(indirectBankFeedPos)) - .append("\n"); sb.append(" fileUploadPos: ").append(toIndentedString(fileUploadPos)).append("\n"); sb.append(" manualPos: ").append(toIndentedString(manualPos)).append("\n"); sb.append(" directBankFeedNeg: ").append(toIndentedString(directBankFeedNeg)).append("\n"); - sb.append(" indirectBankFeedNeg: ") - .append(toIndentedString(indirectBankFeedNeg)) - .append("\n"); sb.append(" fileUploadNeg: ").append(toIndentedString(fileUploadNeg)).append("\n"); sb.append(" manualNeg: ").append(toIndentedString(manualNeg)).append("\n"); sb.append(" otherPos: ").append(toIndentedString(otherPos)).append("\n"); diff --git a/src/main/java/com/xero/models/payrollnz/EmployeeLeaveSetup.java b/src/main/java/com/xero/models/payrollnz/EmployeeLeaveSetup.java index 2cdea61e..8b01f013 100644 --- a/src/main/java/com/xero/models/payrollnz/EmployeeLeaveSetup.java +++ b/src/main/java/com/xero/models/payrollnz/EmployeeLeaveSetup.java @@ -39,6 +39,12 @@ public class EmployeeLeaveSetup { @JsonProperty("sickLeaveMaximumHoursToAccrue") private Double sickLeaveMaximumHoursToAccrue; + @JsonProperty("SickLeaveToAccrueAnnually") + private Double sickLeaveToAccrueAnnually; + + @JsonProperty("SickLeaveMaximumToAccrue") + private Double sickLeaveMaximumToAccrue; + @JsonProperty("sickLeaveOpeningBalance") private Double sickLeaveOpeningBalance; @@ -47,6 +53,9 @@ public class EmployeeLeaveSetup { @JsonProperty("SickLeaveAnniversaryDate") private LocalDate sickLeaveAnniversaryDate; + + @JsonProperty("AnnualLeaveAnniversaryDate") + private LocalDate annualLeaveAnniversaryDate; /** * Identifier if holiday pay will be included in each payslip * @@ -209,8 +218,7 @@ public void setNegativeAnnualLeaveBalancePaidAmount(Double negativeAnnualLeaveBa } /** - * Number of hours accrued annually for sick leave. Multiply the number of days they're - * entitled to by the hours worked per day + * Deprecated use SickLeaveToAccrueAnnually * * @param sickLeaveHoursToAccrueAnnually Double * @return EmployeeLeaveSetup @@ -221,19 +229,13 @@ public EmployeeLeaveSetup sickLeaveHoursToAccrueAnnually(Double sickLeaveHoursTo } /** - * Number of hours accrued annually for sick leave. Multiply the number of days they're - * entitled to by the hours worked per day + * Deprecated use SickLeaveToAccrueAnnually * * @return sickLeaveHoursToAccrueAnnually */ - @ApiModelProperty( - example = "100.5", - value = - "Number of hours accrued annually for sick leave. Multiply the number of days they're" - + " entitled to by the hours worked per day") + @ApiModelProperty(example = "100.5", value = "Deprecated use SickLeaveToAccrueAnnually") /** - * Number of hours accrued annually for sick leave. Multiply the number of days they're - * entitled to by the hours worked per day + * Deprecated use SickLeaveToAccrueAnnually * * @return sickLeaveHoursToAccrueAnnually Double */ @@ -242,8 +244,7 @@ public Double getSickLeaveHoursToAccrueAnnually() { } /** - * Number of hours accrued annually for sick leave. Multiply the number of days they're - * entitled to by the hours worked per day + * Deprecated use SickLeaveToAccrueAnnually * * @param sickLeaveHoursToAccrueAnnually Double */ @@ -252,8 +253,7 @@ public void setSickLeaveHoursToAccrueAnnually(Double sickLeaveHoursToAccrueAnnua } /** - * Maximum number of hours accrued annually for sick leave. Multiply the maximum days they can - * accrue by the hours worked per day + * Deprecated use SickLeaveMaximumToAccrue * * @param sickLeaveMaximumHoursToAccrue Double * @return EmployeeLeaveSetup @@ -264,19 +264,13 @@ public EmployeeLeaveSetup sickLeaveMaximumHoursToAccrue(Double sickLeaveMaximumH } /** - * Maximum number of hours accrued annually for sick leave. Multiply the maximum days they can - * accrue by the hours worked per day + * Deprecated use SickLeaveMaximumToAccrue * * @return sickLeaveMaximumHoursToAccrue */ - @ApiModelProperty( - example = "200.5", - value = - "Maximum number of hours accrued annually for sick leave. Multiply the maximum days they" - + " can accrue by the hours worked per day") + @ApiModelProperty(example = "200.5", value = "Deprecated use SickLeaveMaximumToAccrue") /** - * Maximum number of hours accrued annually for sick leave. Multiply the maximum days they can - * accrue by the hours worked per day + * Deprecated use SickLeaveMaximumToAccrue * * @return sickLeaveMaximumHoursToAccrue Double */ @@ -285,8 +279,7 @@ public Double getSickLeaveMaximumHoursToAccrue() { } /** - * Maximum number of hours accrued annually for sick leave. Multiply the maximum days they can - * accrue by the hours worked per day + * Deprecated use SickLeaveMaximumToAccrue * * @param sickLeaveMaximumHoursToAccrue Double */ @@ -294,6 +287,93 @@ public void setSickLeaveMaximumHoursToAccrue(Double sickLeaveMaximumHoursToAccru this.sickLeaveMaximumHoursToAccrue = sickLeaveMaximumHoursToAccrue; } + /** + * Number of units accrued annually for sick leave. The type of units is determined by the + * property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type + * + * @param sickLeaveToAccrueAnnually Double + * @return EmployeeLeaveSetup + */ + public EmployeeLeaveSetup sickLeaveToAccrueAnnually(Double sickLeaveToAccrueAnnually) { + this.sickLeaveToAccrueAnnually = sickLeaveToAccrueAnnually; + return this; + } + + /** + * Number of units accrued annually for sick leave. The type of units is determined by the + * property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type + * + * @return sickLeaveToAccrueAnnually + */ + @ApiModelProperty( + example = "100.5", + value = + "Number of units accrued annually for sick leave. The type of units is determined by the" + + " property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type") + /** + * Number of units accrued annually for sick leave. The type of units is determined by the + * property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type + * + * @return sickLeaveToAccrueAnnually Double + */ + public Double getSickLeaveToAccrueAnnually() { + return sickLeaveToAccrueAnnually; + } + + /** + * Number of units accrued annually for sick leave. The type of units is determined by the + * property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type + * + * @param sickLeaveToAccrueAnnually Double + */ + public void setSickLeaveToAccrueAnnually(Double sickLeaveToAccrueAnnually) { + this.sickLeaveToAccrueAnnually = sickLeaveToAccrueAnnually; + } + + /** + * Maximum number of units accrued annually for sick leave. The type of units is determined by the + * property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type + * + * @param sickLeaveMaximumToAccrue Double + * @return EmployeeLeaveSetup + */ + public EmployeeLeaveSetup sickLeaveMaximumToAccrue(Double sickLeaveMaximumToAccrue) { + this.sickLeaveMaximumToAccrue = sickLeaveMaximumToAccrue; + return this; + } + + /** + * Maximum number of units accrued annually for sick leave. The type of units is determined by the + * property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type + * + * @return sickLeaveMaximumToAccrue + */ + @ApiModelProperty( + example = "200.5", + value = + "Maximum number of units accrued annually for sick leave. The type of units is" + + " determined by the property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave" + + " type") + /** + * Maximum number of units accrued annually for sick leave. The type of units is determined by the + * property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type + * + * @return sickLeaveMaximumToAccrue Double + */ + public Double getSickLeaveMaximumToAccrue() { + return sickLeaveMaximumToAccrue; + } + + /** + * Maximum number of units accrued annually for sick leave. The type of units is determined by the + * property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type + * + * @param sickLeaveMaximumToAccrue Double + */ + public void setSickLeaveMaximumToAccrue(Double sickLeaveMaximumToAccrue) { + this.sickLeaveMaximumToAccrue = sickLeaveMaximumToAccrue; + } + /** * Initial sick leave balance. This will be positive unless they've taken sick leave in * advance @@ -376,7 +456,7 @@ public void setSickLeaveScheduleOfAccrual(String sickLeaveScheduleOfAccrual) { /** * If Sick Leave Schedule of Accrual is \"OnAnniversaryDate\", this is the date when - * entitled to Sick Leave + * entitled to Sick Leave. When null the Employee's start date is used as the anniversary date * * @param sickLeaveAnniversaryDate LocalDate * @return EmployeeLeaveSetup @@ -388,7 +468,7 @@ public EmployeeLeaveSetup sickLeaveAnniversaryDate(LocalDate sickLeaveAnniversar /** * If Sick Leave Schedule of Accrual is \"OnAnniversaryDate\", this is the date when - * entitled to Sick Leave + * entitled to Sick Leave. When null the Employee's start date is used as the anniversary date * * @return sickLeaveAnniversaryDate */ @@ -396,10 +476,11 @@ public EmployeeLeaveSetup sickLeaveAnniversaryDate(LocalDate sickLeaveAnniversar example = "Sun Jan 19 00:00:00 UTC 2020", value = "If Sick Leave Schedule of Accrual is \"OnAnniversaryDate\", this is the date when" - + " entitled to Sick Leave") + + " entitled to Sick Leave. When null the Employee's start date is used as the" + + " anniversary date") /** * If Sick Leave Schedule of Accrual is \"OnAnniversaryDate\", this is the date when - * entitled to Sick Leave + * entitled to Sick Leave. When null the Employee's start date is used as the anniversary date * * @return sickLeaveAnniversaryDate LocalDate */ @@ -409,7 +490,7 @@ public LocalDate getSickLeaveAnniversaryDate() { /** * If Sick Leave Schedule of Accrual is \"OnAnniversaryDate\", this is the date when - * entitled to Sick Leave + * entitled to Sick Leave. When null the Employee's start date is used as the anniversary date * * @param sickLeaveAnniversaryDate LocalDate */ @@ -417,6 +498,49 @@ public void setSickLeaveAnniversaryDate(LocalDate sickLeaveAnniversaryDate) { this.sickLeaveAnniversaryDate = sickLeaveAnniversaryDate; } + /** + * The first date the employee will accrue Annual Leave. When null the Employee's start date + * is used as the anniversary date + * + * @param annualLeaveAnniversaryDate LocalDate + * @return EmployeeLeaveSetup + */ + public EmployeeLeaveSetup annualLeaveAnniversaryDate(LocalDate annualLeaveAnniversaryDate) { + this.annualLeaveAnniversaryDate = annualLeaveAnniversaryDate; + return this; + } + + /** + * The first date the employee will accrue Annual Leave. When null the Employee's start date + * is used as the anniversary date + * + * @return annualLeaveAnniversaryDate + */ + @ApiModelProperty( + example = "Sun Jan 19 00:00:00 UTC 2020", + value = + "The first date the employee will accrue Annual Leave. When null the Employee's start" + + " date is used as the anniversary date") + /** + * The first date the employee will accrue Annual Leave. When null the Employee's start date + * is used as the anniversary date + * + * @return annualLeaveAnniversaryDate LocalDate + */ + public LocalDate getAnnualLeaveAnniversaryDate() { + return annualLeaveAnniversaryDate; + } + + /** + * The first date the employee will accrue Annual Leave. When null the Employee's start date + * is used as the anniversary date + * + * @param annualLeaveAnniversaryDate LocalDate + */ + public void setAnnualLeaveAnniversaryDate(LocalDate annualLeaveAnniversaryDate) { + this.annualLeaveAnniversaryDate = annualLeaveAnniversaryDate; + } + @Override public boolean equals(java.lang.Object o) { if (this == o) { @@ -438,11 +562,17 @@ public boolean equals(java.lang.Object o) { this.sickLeaveHoursToAccrueAnnually, employeeLeaveSetup.sickLeaveHoursToAccrueAnnually) && Objects.equals( this.sickLeaveMaximumHoursToAccrue, employeeLeaveSetup.sickLeaveMaximumHoursToAccrue) + && Objects.equals( + this.sickLeaveToAccrueAnnually, employeeLeaveSetup.sickLeaveToAccrueAnnually) + && Objects.equals( + this.sickLeaveMaximumToAccrue, employeeLeaveSetup.sickLeaveMaximumToAccrue) && Objects.equals(this.sickLeaveOpeningBalance, employeeLeaveSetup.sickLeaveOpeningBalance) && Objects.equals( this.sickLeaveScheduleOfAccrual, employeeLeaveSetup.sickLeaveScheduleOfAccrual) && Objects.equals( - this.sickLeaveAnniversaryDate, employeeLeaveSetup.sickLeaveAnniversaryDate); + this.sickLeaveAnniversaryDate, employeeLeaveSetup.sickLeaveAnniversaryDate) + && Objects.equals( + this.annualLeaveAnniversaryDate, employeeLeaveSetup.annualLeaveAnniversaryDate); } @Override @@ -454,9 +584,12 @@ public int hashCode() { negativeAnnualLeaveBalancePaidAmount, sickLeaveHoursToAccrueAnnually, sickLeaveMaximumHoursToAccrue, + sickLeaveToAccrueAnnually, + sickLeaveMaximumToAccrue, sickLeaveOpeningBalance, sickLeaveScheduleOfAccrual, - sickLeaveAnniversaryDate); + sickLeaveAnniversaryDate, + annualLeaveAnniversaryDate); } @Override @@ -479,6 +612,12 @@ public String toString() { sb.append(" sickLeaveMaximumHoursToAccrue: ") .append(toIndentedString(sickLeaveMaximumHoursToAccrue)) .append("\n"); + sb.append(" sickLeaveToAccrueAnnually: ") + .append(toIndentedString(sickLeaveToAccrueAnnually)) + .append("\n"); + sb.append(" sickLeaveMaximumToAccrue: ") + .append(toIndentedString(sickLeaveMaximumToAccrue)) + .append("\n"); sb.append(" sickLeaveOpeningBalance: ") .append(toIndentedString(sickLeaveOpeningBalance)) .append("\n"); @@ -488,6 +627,9 @@ public String toString() { sb.append(" sickLeaveAnniversaryDate: ") .append(toIndentedString(sickLeaveAnniversaryDate)) .append("\n"); + sb.append(" annualLeaveAnniversaryDate: ") + .append(toIndentedString(annualLeaveAnniversaryDate)) + .append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/com/xero/models/payrollnz/EmployeeLeaveType.java b/src/main/java/com/xero/models/payrollnz/EmployeeLeaveType.java index 86d8eade..ea43c1be 100644 --- a/src/main/java/com/xero/models/payrollnz/EmployeeLeaveType.java +++ b/src/main/java/com/xero/models/payrollnz/EmployeeLeaveType.java @@ -88,12 +88,21 @@ public static ScheduleOfAccrualEnum fromValue(String value) { @JsonProperty("hoursAccruedAnnually") private Double hoursAccruedAnnually; + @JsonProperty("UnitsAccruedAnnually") + private Double unitsAccruedAnnually; + + @JsonProperty("typeOfUnitsToAccrue") + private String typeOfUnitsToAccrue; + @JsonProperty("maximumToAccrue") private Double maximumToAccrue; @JsonProperty("openingBalance") private Double openingBalance; + @JsonProperty("openingBalanceTypeOfUnits") + private String openingBalanceTypeOfUnits; + @JsonProperty("rateAccruedHourly") private Double rateAccruedHourly; @@ -182,8 +191,7 @@ public void setScheduleOfAccrual(ScheduleOfAccrualEnum scheduleOfAccrual) { } /** - * The number of hours accrued for the leave annually. This is 0 when the scheduleOfAccrual chosen - * is \"OnHourWorked\" + * Deprecated use UnitsAccruedAnnually * * @param hoursAccruedAnnually Double * @return EmployeeLeaveType @@ -194,18 +202,13 @@ public EmployeeLeaveType hoursAccruedAnnually(Double hoursAccruedAnnually) { } /** - * The number of hours accrued for the leave annually. This is 0 when the scheduleOfAccrual chosen - * is \"OnHourWorked\" + * Deprecated use UnitsAccruedAnnually * * @return hoursAccruedAnnually */ - @ApiModelProperty( - value = - "The number of hours accrued for the leave annually. This is 0 when the" - + " scheduleOfAccrual chosen is \"OnHourWorked\"") + @ApiModelProperty(value = "Deprecated use UnitsAccruedAnnually") /** - * The number of hours accrued for the leave annually. This is 0 when the scheduleOfAccrual chosen - * is \"OnHourWorked\" + * Deprecated use UnitsAccruedAnnually * * @return hoursAccruedAnnually Double */ @@ -214,8 +217,7 @@ public Double getHoursAccruedAnnually() { } /** - * The number of hours accrued for the leave annually. This is 0 when the scheduleOfAccrual chosen - * is \"OnHourWorked\" + * Deprecated use UnitsAccruedAnnually * * @param hoursAccruedAnnually Double */ @@ -224,7 +226,84 @@ public void setHoursAccruedAnnually(Double hoursAccruedAnnually) { } /** - * The maximum number of hours that can be accrued for the leave + * The number of units accrued for the leave annually. This is 0 when the ScheduleOfAccrual chosen + * is \"NoAccruals\" + * + * @param unitsAccruedAnnually Double + * @return EmployeeLeaveType + */ + public EmployeeLeaveType unitsAccruedAnnually(Double unitsAccruedAnnually) { + this.unitsAccruedAnnually = unitsAccruedAnnually; + return this; + } + + /** + * The number of units accrued for the leave annually. This is 0 when the ScheduleOfAccrual chosen + * is \"NoAccruals\" + * + * @return unitsAccruedAnnually + */ + @ApiModelProperty( + value = + "The number of units accrued for the leave annually. This is 0 when the" + + " ScheduleOfAccrual chosen is \"NoAccruals\"") + /** + * The number of units accrued for the leave annually. This is 0 when the ScheduleOfAccrual chosen + * is \"NoAccruals\" + * + * @return unitsAccruedAnnually Double + */ + public Double getUnitsAccruedAnnually() { + return unitsAccruedAnnually; + } + + /** + * The number of units accrued for the leave annually. This is 0 when the ScheduleOfAccrual chosen + * is \"NoAccruals\" + * + * @param unitsAccruedAnnually Double + */ + public void setUnitsAccruedAnnually(Double unitsAccruedAnnually) { + this.unitsAccruedAnnually = unitsAccruedAnnually; + } + + /** + * The type of units accrued for the leave annually + * + * @param typeOfUnitsToAccrue String + * @return EmployeeLeaveType + */ + public EmployeeLeaveType typeOfUnitsToAccrue(String typeOfUnitsToAccrue) { + this.typeOfUnitsToAccrue = typeOfUnitsToAccrue; + return this; + } + + /** + * The type of units accrued for the leave annually + * + * @return typeOfUnitsToAccrue + */ + @ApiModelProperty(value = "The type of units accrued for the leave annually") + /** + * The type of units accrued for the leave annually + * + * @return typeOfUnitsToAccrue String + */ + public String getTypeOfUnitsToAccrue() { + return typeOfUnitsToAccrue; + } + + /** + * The type of units accrued for the leave annually + * + * @param typeOfUnitsToAccrue String + */ + public void setTypeOfUnitsToAccrue(String typeOfUnitsToAccrue) { + this.typeOfUnitsToAccrue = typeOfUnitsToAccrue; + } + + /** + * The maximum number of units that can be accrued for the leave * * @param maximumToAccrue Double * @return EmployeeLeaveType @@ -235,13 +314,13 @@ public EmployeeLeaveType maximumToAccrue(Double maximumToAccrue) { } /** - * The maximum number of hours that can be accrued for the leave + * The maximum number of units that can be accrued for the leave * * @return maximumToAccrue */ - @ApiModelProperty(value = "The maximum number of hours that can be accrued for the leave") + @ApiModelProperty(value = "The maximum number of units that can be accrued for the leave") /** - * The maximum number of hours that can be accrued for the leave + * The maximum number of units that can be accrued for the leave * * @return maximumToAccrue Double */ @@ -250,7 +329,7 @@ public Double getMaximumToAccrue() { } /** - * The maximum number of hours that can be accrued for the leave + * The maximum number of units that can be accrued for the leave * * @param maximumToAccrue Double */ @@ -259,7 +338,7 @@ public void setMaximumToAccrue(Double maximumToAccrue) { } /** - * The initial number of hours assigned when the leave was added to the employee + * The initial number of units assigned when the leave was added to the employee * * @param openingBalance Double * @return EmployeeLeaveType @@ -270,14 +349,14 @@ public EmployeeLeaveType openingBalance(Double openingBalance) { } /** - * The initial number of hours assigned when the leave was added to the employee + * The initial number of units assigned when the leave was added to the employee * * @return openingBalance */ @ApiModelProperty( - value = "The initial number of hours assigned when the leave was added to the employee") + value = "The initial number of units assigned when the leave was added to the employee") /** - * The initial number of hours assigned when the leave was added to the employee + * The initial number of units assigned when the leave was added to the employee * * @return openingBalance Double */ @@ -286,7 +365,7 @@ public Double getOpeningBalance() { } /** - * The initial number of hours assigned when the leave was added to the employee + * The initial number of units assigned when the leave was added to the employee * * @param openingBalance Double */ @@ -294,6 +373,41 @@ public void setOpeningBalance(Double openingBalance) { this.openingBalance = openingBalance; } + /** + * The type of units for the opening balance + * + * @param openingBalanceTypeOfUnits String + * @return EmployeeLeaveType + */ + public EmployeeLeaveType openingBalanceTypeOfUnits(String openingBalanceTypeOfUnits) { + this.openingBalanceTypeOfUnits = openingBalanceTypeOfUnits; + return this; + } + + /** + * The type of units for the opening balance + * + * @return openingBalanceTypeOfUnits + */ + @ApiModelProperty(value = "The type of units for the opening balance") + /** + * The type of units for the opening balance + * + * @return openingBalanceTypeOfUnits String + */ + public String getOpeningBalanceTypeOfUnits() { + return openingBalanceTypeOfUnits; + } + + /** + * The type of units for the opening balance + * + * @param openingBalanceTypeOfUnits String + */ + public void setOpeningBalanceTypeOfUnits(String openingBalanceTypeOfUnits) { + this.openingBalanceTypeOfUnits = openingBalanceTypeOfUnits; + } + /** * The number of hours added to the leave balance for every hour worked by the employee. This is * normally 0, unless the scheduleOfAccrual chosen is \"OnHourWorked\" @@ -542,8 +656,12 @@ public boolean equals(java.lang.Object o) { return Objects.equals(this.leaveTypeID, employeeLeaveType.leaveTypeID) && Objects.equals(this.scheduleOfAccrual, employeeLeaveType.scheduleOfAccrual) && Objects.equals(this.hoursAccruedAnnually, employeeLeaveType.hoursAccruedAnnually) + && Objects.equals(this.unitsAccruedAnnually, employeeLeaveType.unitsAccruedAnnually) + && Objects.equals(this.typeOfUnitsToAccrue, employeeLeaveType.typeOfUnitsToAccrue) && Objects.equals(this.maximumToAccrue, employeeLeaveType.maximumToAccrue) && Objects.equals(this.openingBalance, employeeLeaveType.openingBalance) + && Objects.equals( + this.openingBalanceTypeOfUnits, employeeLeaveType.openingBalanceTypeOfUnits) && Objects.equals(this.rateAccruedHourly, employeeLeaveType.rateAccruedHourly) && Objects.equals( this.percentageOfGrossEarnings, employeeLeaveType.percentageOfGrossEarnings) @@ -561,8 +679,11 @@ public int hashCode() { leaveTypeID, scheduleOfAccrual, hoursAccruedAnnually, + unitsAccruedAnnually, + typeOfUnitsToAccrue, maximumToAccrue, openingBalance, + openingBalanceTypeOfUnits, rateAccruedHourly, percentageOfGrossEarnings, includeHolidayPayEveryPay, @@ -580,8 +701,17 @@ public String toString() { sb.append(" hoursAccruedAnnually: ") .append(toIndentedString(hoursAccruedAnnually)) .append("\n"); + sb.append(" unitsAccruedAnnually: ") + .append(toIndentedString(unitsAccruedAnnually)) + .append("\n"); + sb.append(" typeOfUnitsToAccrue: ") + .append(toIndentedString(typeOfUnitsToAccrue)) + .append("\n"); sb.append(" maximumToAccrue: ").append(toIndentedString(maximumToAccrue)).append("\n"); sb.append(" openingBalance: ").append(toIndentedString(openingBalance)).append("\n"); + sb.append(" openingBalanceTypeOfUnits: ") + .append(toIndentedString(openingBalanceTypeOfUnits)) + .append("\n"); sb.append(" rateAccruedHourly: ").append(toIndentedString(rateAccruedHourly)).append("\n"); sb.append(" percentageOfGrossEarnings: ") .append(toIndentedString(percentageOfGrossEarnings)) diff --git a/src/main/java/com/xero/models/payrollnz/LeavePeriod.java b/src/main/java/com/xero/models/payrollnz/LeavePeriod.java index b66bc982..b6be569d 100644 --- a/src/main/java/com/xero/models/payrollnz/LeavePeriod.java +++ b/src/main/java/com/xero/models/payrollnz/LeavePeriod.java @@ -31,13 +31,25 @@ public class LeavePeriod { @JsonProperty("numberOfUnits") private Double numberOfUnits; - /** Period Status */ + + @JsonProperty("numberOfUnitsTaken") + private Double numberOfUnitsTaken; + + @JsonProperty("typeOfUnits") + private String typeOfUnits; + + @JsonProperty("typeOfUnitsTaken") + private String typeOfUnitsTaken; + /** Status of leave */ public enum PeriodStatusEnum { /** APPROVED */ APPROVED("Approved"), /** COMPLETED */ - COMPLETED("Completed"); + COMPLETED("Completed"), + + /** ESTIMATED */ + ESTIMATED("Estimated"); private String value; @@ -189,7 +201,112 @@ public void setNumberOfUnits(Double numberOfUnits) { } /** - * Period Status + * The number of units taken for the leave + * + * @param numberOfUnitsTaken Double + * @return LeavePeriod + */ + public LeavePeriod numberOfUnitsTaken(Double numberOfUnitsTaken) { + this.numberOfUnitsTaken = numberOfUnitsTaken; + return this; + } + + /** + * The number of units taken for the leave + * + * @return numberOfUnitsTaken + */ + @ApiModelProperty(value = "The number of units taken for the leave") + /** + * The number of units taken for the leave + * + * @return numberOfUnitsTaken Double + */ + public Double getNumberOfUnitsTaken() { + return numberOfUnitsTaken; + } + + /** + * The number of units taken for the leave + * + * @param numberOfUnitsTaken Double + */ + public void setNumberOfUnitsTaken(Double numberOfUnitsTaken) { + this.numberOfUnitsTaken = numberOfUnitsTaken; + } + + /** + * The type of units paid for the leave + * + * @param typeOfUnits String + * @return LeavePeriod + */ + public LeavePeriod typeOfUnits(String typeOfUnits) { + this.typeOfUnits = typeOfUnits; + return this; + } + + /** + * The type of units paid for the leave + * + * @return typeOfUnits + */ + @ApiModelProperty(value = "The type of units paid for the leave") + /** + * The type of units paid for the leave + * + * @return typeOfUnits String + */ + public String getTypeOfUnits() { + return typeOfUnits; + } + + /** + * The type of units paid for the leave + * + * @param typeOfUnits String + */ + public void setTypeOfUnits(String typeOfUnits) { + this.typeOfUnits = typeOfUnits; + } + + /** + * The type of units taken for the leave + * + * @param typeOfUnitsTaken String + * @return LeavePeriod + */ + public LeavePeriod typeOfUnitsTaken(String typeOfUnitsTaken) { + this.typeOfUnitsTaken = typeOfUnitsTaken; + return this; + } + + /** + * The type of units taken for the leave + * + * @return typeOfUnitsTaken + */ + @ApiModelProperty(value = "The type of units taken for the leave") + /** + * The type of units taken for the leave + * + * @return typeOfUnitsTaken String + */ + public String getTypeOfUnitsTaken() { + return typeOfUnitsTaken; + } + + /** + * The type of units taken for the leave + * + * @param typeOfUnitsTaken String + */ + public void setTypeOfUnitsTaken(String typeOfUnitsTaken) { + this.typeOfUnitsTaken = typeOfUnitsTaken; + } + + /** + * Status of leave * * @param periodStatus PeriodStatusEnum * @return LeavePeriod @@ -200,13 +317,13 @@ public LeavePeriod periodStatus(PeriodStatusEnum periodStatus) { } /** - * Period Status + * Status of leave * * @return periodStatus */ - @ApiModelProperty(value = "Period Status") + @ApiModelProperty(value = "Status of leave") /** - * Period Status + * Status of leave * * @return periodStatus PeriodStatusEnum */ @@ -215,7 +332,7 @@ public PeriodStatusEnum getPeriodStatus() { } /** - * Period Status + * Status of leave * * @param periodStatus PeriodStatusEnum */ @@ -235,12 +352,22 @@ public boolean equals(java.lang.Object o) { return Objects.equals(this.periodStartDate, leavePeriod.periodStartDate) && Objects.equals(this.periodEndDate, leavePeriod.periodEndDate) && Objects.equals(this.numberOfUnits, leavePeriod.numberOfUnits) + && Objects.equals(this.numberOfUnitsTaken, leavePeriod.numberOfUnitsTaken) + && Objects.equals(this.typeOfUnits, leavePeriod.typeOfUnits) + && Objects.equals(this.typeOfUnitsTaken, leavePeriod.typeOfUnitsTaken) && Objects.equals(this.periodStatus, leavePeriod.periodStatus); } @Override public int hashCode() { - return Objects.hash(periodStartDate, periodEndDate, numberOfUnits, periodStatus); + return Objects.hash( + periodStartDate, + periodEndDate, + numberOfUnits, + numberOfUnitsTaken, + typeOfUnits, + typeOfUnitsTaken, + periodStatus); } @Override @@ -250,6 +377,9 @@ public String toString() { sb.append(" periodStartDate: ").append(toIndentedString(periodStartDate)).append("\n"); sb.append(" periodEndDate: ").append(toIndentedString(periodEndDate)).append("\n"); sb.append(" numberOfUnits: ").append(toIndentedString(numberOfUnits)).append("\n"); + sb.append(" numberOfUnitsTaken: ").append(toIndentedString(numberOfUnitsTaken)).append("\n"); + sb.append(" typeOfUnits: ").append(toIndentedString(typeOfUnits)).append("\n"); + sb.append(" typeOfUnitsTaken: ").append(toIndentedString(typeOfUnitsTaken)).append("\n"); sb.append(" periodStatus: ").append(toIndentedString(periodStatus)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/com/xero/models/payrollnz/LeaveType.java b/src/main/java/com/xero/models/payrollnz/LeaveType.java index 7968610b..6bca919b 100644 --- a/src/main/java/com/xero/models/payrollnz/LeaveType.java +++ b/src/main/java/com/xero/models/payrollnz/LeaveType.java @@ -39,6 +39,12 @@ public class LeaveType { @JsonProperty("isActive") private Boolean isActive; + + @JsonProperty("typeOfUnits") + private String typeOfUnits; + + @JsonProperty("typeOfUnitsToAccrue") + private String typeOfUnitsToAccrue; /** * Xero unique identifier for the leave type * @@ -253,6 +259,76 @@ public void setIsActive(Boolean isActive) { this.isActive = isActive; } + /** + * The type of units to be paid for the leave type + * + * @param typeOfUnits String + * @return LeaveType + */ + public LeaveType typeOfUnits(String typeOfUnits) { + this.typeOfUnits = typeOfUnits; + return this; + } + + /** + * The type of units to be paid for the leave type + * + * @return typeOfUnits + */ + @ApiModelProperty(value = "The type of units to be paid for the leave type") + /** + * The type of units to be paid for the leave type + * + * @return typeOfUnits String + */ + public String getTypeOfUnits() { + return typeOfUnits; + } + + /** + * The type of units to be paid for the leave type + * + * @param typeOfUnits String + */ + public void setTypeOfUnits(String typeOfUnits) { + this.typeOfUnits = typeOfUnits; + } + + /** + * The type of units to be accrued for the leave type + * + * @param typeOfUnitsToAccrue String + * @return LeaveType + */ + public LeaveType typeOfUnitsToAccrue(String typeOfUnitsToAccrue) { + this.typeOfUnitsToAccrue = typeOfUnitsToAccrue; + return this; + } + + /** + * The type of units to be accrued for the leave type + * + * @return typeOfUnitsToAccrue + */ + @ApiModelProperty(value = "The type of units to be accrued for the leave type") + /** + * The type of units to be accrued for the leave type + * + * @return typeOfUnitsToAccrue String + */ + public String getTypeOfUnitsToAccrue() { + return typeOfUnitsToAccrue; + } + + /** + * The type of units to be accrued for the leave type + * + * @param typeOfUnitsToAccrue String + */ + public void setTypeOfUnitsToAccrue(String typeOfUnitsToAccrue) { + this.typeOfUnitsToAccrue = typeOfUnitsToAccrue; + } + @Override public boolean equals(java.lang.Object o) { if (this == o) { @@ -267,12 +343,22 @@ public boolean equals(java.lang.Object o) { && Objects.equals(this.isPaidLeave, leaveType.isPaidLeave) && Objects.equals(this.showOnPayslip, leaveType.showOnPayslip) && Objects.equals(this.updatedDateUTC, leaveType.updatedDateUTC) - && Objects.equals(this.isActive, leaveType.isActive); + && Objects.equals(this.isActive, leaveType.isActive) + && Objects.equals(this.typeOfUnits, leaveType.typeOfUnits) + && Objects.equals(this.typeOfUnitsToAccrue, leaveType.typeOfUnitsToAccrue); } @Override public int hashCode() { - return Objects.hash(leaveTypeID, name, isPaidLeave, showOnPayslip, updatedDateUTC, isActive); + return Objects.hash( + leaveTypeID, + name, + isPaidLeave, + showOnPayslip, + updatedDateUTC, + isActive, + typeOfUnits, + typeOfUnitsToAccrue); } @Override @@ -285,6 +371,10 @@ public String toString() { sb.append(" showOnPayslip: ").append(toIndentedString(showOnPayslip)).append("\n"); sb.append(" updatedDateUTC: ").append(toIndentedString(updatedDateUTC)).append("\n"); sb.append(" isActive: ").append(toIndentedString(isActive)).append("\n"); + sb.append(" typeOfUnits: ").append(toIndentedString(typeOfUnits)).append("\n"); + sb.append(" typeOfUnitsToAccrue: ") + .append(toIndentedString(typeOfUnitsToAccrue)) + .append("\n"); sb.append("}"); return sb.toString(); }