xero-ruby 3.2.0 → 3.5.0

data/lib/xero-ruby/api/payroll_au_api.rb

@@ -633,7 +633,7 @@ module XeroRuby
     # Searches payroll employees
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 employees will be returned in a single API call
@@ -646,7 +646,7 @@ module XeroRuby
     # Searches payroll employees
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 employees will be returned in a single API call
@@ -789,7 +789,7 @@ module XeroRuby
     # Retrieves leave applications
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 objects will be returned in a single API call
@@ -802,7 +802,7 @@ module XeroRuby
     # Retrieves leave applications
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 objects will be returned in a single API call
@@ -870,7 +870,7 @@ module XeroRuby
     # Retrieves pay items
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 objects will be returned in a single API call
@@ -883,7 +883,7 @@ module XeroRuby
     # Retrieves pay items
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 objects will be returned in a single API call
@@ -1026,7 +1026,7 @@ module XeroRuby
     # Retrieves pay runs
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 PayRuns will be returned in a single API call
@@ -1039,7 +1039,7 @@ module XeroRuby
     # Retrieves pay runs
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 PayRuns will be returned in a single API call
@@ -1182,7 +1182,7 @@ module XeroRuby
     # Retrieves payroll calendars
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 objects will be returned in a single API call
@@ -1195,7 +1195,7 @@ module XeroRuby
     # Retrieves payroll calendars
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 objects will be returned in a single API call
@@ -1557,7 +1557,7 @@ module XeroRuby
     # Retrieves superfunds
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 SuperFunds will be returned in a single API call
@@ -1570,7 +1570,7 @@ module XeroRuby
     # Retrieves superfunds
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 SuperFunds will be returned in a single API call
@@ -1713,7 +1713,7 @@ module XeroRuby
     # Retrieves timesheets
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 timesheets will be returned in a single API call
@@ -1726,7 +1726,7 @@ module XeroRuby
     # Retrieves timesheets
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :if_modified_since Only records created or modified since this timestamp will be returned
+    # @option opts [DateTime] :if_modified_since Only records created or modified since this timestamp will be returned
     # @option opts [String] :where Filter by an any element
     # @option opts [String] :order Order by an any element
     # @option opts [Integer] :page e.g. page=1 – Up to 100 timesheets will be returned in a single API call

data/lib/xero-ruby/api/payroll_nz_api.rb

@@ -3150,8 +3150,7 @@ module XeroRuby
     # Retrieves employees
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :first_name Filter by first name
-    # @option opts [String] :last_name Filter by last name
+    # @option opts [String] :filter Filter by first name and/or lastname
     # @option opts [Integer] :page Page number which specifies the set of records to retrieve. By default the number of the records per set is 100.
     # @return [Employees]
     def get_employees(xero_tenant_id, opts = {})
@@ -3162,8 +3161,7 @@ module XeroRuby
     # Retrieves employees
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :first_name Filter by first name
-    # @option opts [String] :last_name Filter by last name
+    # @option opts [String] :filter Filter by first name and/or lastname
     # @option opts [Integer] :page Page number which specifies the set of records to retrieve. By default the number of the records per set is 100.
     # @return [Array<(Employees, Integer, Hash)>] Employees data, response status code and response headers
     def get_employees_with_http_info(xero_tenant_id, options = {})
@@ -3183,8 +3181,7 @@ module XeroRuby
 
       # query parameters
       query_params = opts[:query_params] || {}
-      query_params[:'firstName'] = opts[:'first_name'] if !opts[:'first_name'].nil?
-      query_params[:'lastName'] = opts[:'last_name'] if !opts[:'last_name'].nil?
+      query_params[:'filter'] = opts[:'filter'] if !opts[:'filter'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
       
       # XeroAPI's `IDs` convention openapi-generator does not snake_case properly.. manual over-riding `i_ds` malformations:
@@ -4419,8 +4416,11 @@ module XeroRuby
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :page Page number which specifies the set of records to retrieve. By default the number of the records per set is 100.
-    # @option opts [String] :employee_id By default get Timesheets will return the timesheets for all employees in an organization. You can add GET https://…/timesheets?filter&#x3D;employeeId&#x3D;&#x3D;{EmployeeID} to get only the timesheets of a particular employee.
-    # @option opts [String] :payroll_calendar_id By default get Timesheets will return all the timesheets for an organization. You can add GET https://…/timesheets?filter&#x3D;payrollCalendarId&#x3D;&#x3D;{PayrollCalendarID} to filter the timesheets by payroll calendar id
+    # @option opts [String] :filter Filter by employeeId and/or payrollCalendarId
+    # @option opts [String] :status filter results by any timesheets with a matching timesheet status
+    # @option opts [String] :start_date filter results by any timesheets with a startDate on or after the provided date
+    # @option opts [String] :end_date filter results by any timesheets with a endDate on or before the provided date
+    # @option opts [String] :sort sort the order of timesheets returned. The default is based on the timesheets createdDate, sorted oldest to newest. Currently, the only other option is to reverse the order based on the timesheets startDate, sorted newest to oldest.
     # @return [Timesheets]
     def get_timesheets(xero_tenant_id, opts = {})
       data, _status_code, _headers = get_timesheets_with_http_info(xero_tenant_id, opts)
@@ -4431,8 +4431,11 @@ module XeroRuby
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :page Page number which specifies the set of records to retrieve. By default the number of the records per set is 100.
-    # @option opts [String] :employee_id By default get Timesheets will return the timesheets for all employees in an organization. You can add GET https://…/timesheets?filter&#x3D;employeeId&#x3D;&#x3D;{EmployeeID} to get only the timesheets of a particular employee.
-    # @option opts [String] :payroll_calendar_id By default get Timesheets will return all the timesheets for an organization. You can add GET https://…/timesheets?filter&#x3D;payrollCalendarId&#x3D;&#x3D;{PayrollCalendarID} to filter the timesheets by payroll calendar id
+    # @option opts [String] :filter Filter by employeeId and/or payrollCalendarId
+    # @option opts [String] :status filter results by any timesheets with a matching timesheet status
+    # @option opts [String] :start_date filter results by any timesheets with a startDate on or after the provided date
+    # @option opts [String] :end_date filter results by any timesheets with a endDate on or before the provided date
+    # @option opts [String] :sort sort the order of timesheets returned. The default is based on the timesheets createdDate, sorted oldest to newest. Currently, the only other option is to reverse the order based on the timesheets startDate, sorted newest to oldest.
     # @return [Array<(Timesheets, Integer, Hash)>] Timesheets data, response status code and response headers
     def get_timesheets_with_http_info(xero_tenant_id, options = {})
       opts = options.dup
@@ -4452,8 +4455,11 @@ module XeroRuby
       # query parameters
       query_params = opts[:query_params] || {}
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
-      query_params[:'employeeId'] = opts[:'employee_id'] if !opts[:'employee_id'].nil?
-      query_params[:'payrollCalendarId'] = opts[:'payroll_calendar_id'] if !opts[:'payroll_calendar_id'].nil?
+      query_params[:'filter'] = opts[:'filter'] if !opts[:'filter'].nil?
+      query_params[:'status'] = opts[:'status'] if !opts[:'status'].nil?
+      query_params[:'startDate'] = opts[:'start_date'] if !opts[:'start_date'].nil?
+      query_params[:'endDate'] = opts[:'end_date'] if !opts[:'end_date'].nil?
+      query_params[:'sort'] = opts[:'sort'] if !opts[:'sort'].nil?
       
       # XeroAPI's `IDs` convention openapi-generator does not snake_case properly.. manual over-riding `i_ds` malformations:
       query_params[:'IDs'] = @api_client.build_collection_param(opts[:'ids'], :csv) if !opts[:'ids'].nil?

data/lib/xero-ruby/api/payroll_uk_api.rb

@@ -4644,7 +4644,11 @@ module XeroRuby
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :page Page number which specifies the set of records to retrieve. By default the number of the records per set is 100.
-    # @option opts [String] :filter Filter by first name and/or lastname
+    # @option opts [String] :filter Filter by employeeId and/or payrollCalendarId
+    # @option opts [String] :status filter results by any timesheets with a matching timesheet status
+    # @option opts [String] :start_date filter results by any timesheets with a startDate on or after the provided date
+    # @option opts [String] :end_date filter results by any timesheets with a endDate on or before the provided date
+    # @option opts [String] :sort sort the order of timesheets returned. The default is based on the timesheets createdDate, sorted oldest to newest. Currently, the only other option is to reverse the order based on the timesheets startDate, sorted newest to oldest.
     # @return [Timesheets]
     def get_timesheets(xero_tenant_id, opts = {})
       data, _status_code, _headers = get_timesheets_with_http_info(xero_tenant_id, opts)
@@ -4655,7 +4659,11 @@ module XeroRuby
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :page Page number which specifies the set of records to retrieve. By default the number of the records per set is 100.
-    # @option opts [String] :filter Filter by first name and/or lastname
+    # @option opts [String] :filter Filter by employeeId and/or payrollCalendarId
+    # @option opts [String] :status filter results by any timesheets with a matching timesheet status
+    # @option opts [String] :start_date filter results by any timesheets with a startDate on or after the provided date
+    # @option opts [String] :end_date filter results by any timesheets with a endDate on or before the provided date
+    # @option opts [String] :sort sort the order of timesheets returned. The default is based on the timesheets createdDate, sorted oldest to newest. Currently, the only other option is to reverse the order based on the timesheets startDate, sorted newest to oldest.
     # @return [Array<(Timesheets, Integer, Hash)>] Timesheets data, response status code and response headers
     def get_timesheets_with_http_info(xero_tenant_id, options = {})
       opts = options.dup
@@ -4676,6 +4684,10 @@ module XeroRuby
       query_params = opts[:query_params] || {}
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
       query_params[:'filter'] = opts[:'filter'] if !opts[:'filter'].nil?
+      query_params[:'status'] = opts[:'status'] if !opts[:'status'].nil?
+      query_params[:'startDate'] = opts[:'start_date'] if !opts[:'start_date'].nil?
+      query_params[:'endDate'] = opts[:'end_date'] if !opts[:'end_date'].nil?
+      query_params[:'sort'] = opts[:'sort'] if !opts[:'sort'].nil?
       
       # XeroAPI's `IDs` convention openapi-generator does not snake_case properly.. manual over-riding `i_ds` malformations:
       query_params[:'IDs'] = @api_client.build_collection_param(opts[:'ids'], :csv) if !opts[:'ids'].nil?

data/lib/xero-ruby/api_client.rb

@@ -57,9 +57,17 @@ module XeroRuby
     end
 
     def authorization_url
-      url = "#{@config.login_url}?response_type=code&client_id=#{@client_id}&redirect_uri=#{@redirect_uri}&scope=#{CGI.escape(@scopes)}"
-      url << "&state=#{@state}" if @state
-      return url
+      url = URI.parse(@config.login_url)
+      url.query = URI.encode_www_form(
+        {
+          response_type: 'code',
+          client_id: @client_id,
+          redirect_uri: @redirect_uri,
+          scope: @scopes,
+          state: @state
+        }.compact
+      )
+      url.to_s
     end
 
     def accounting_api
@@ -97,6 +105,16 @@ module XeroRuby
       XeroRuby::PayrollUkApi.new(self)
     end
 
+    def app_store_api
+      @config.base_url = @config.app_store_url
+      XeroRuby::AppStoreApi.new(self)
+    end
+
+    def finance_api
+      @config.base_url = @config.finance_url
+      XeroRuby::FinanceApi.new(self)
+    end
+
     # Token Helpers
     def token_set
       @config.token_set
@@ -271,12 +289,16 @@ module XeroRuby
         method_base_url = @config.payroll_uk_url
       when "ProjectApi"
         method_base_url = @config.project_url
+      when "AppStoreApi"
+        method_base_url = @config.app_store_url
+      when "FinanceApi"
+        method_base_url = @config.finance_url
       else
         method_base_url = @config.accounting_url
       end
 
       connection = Faraday.new(:url => method_base_url, :ssl => ssl_options) do |conn|
-        conn.basic_auth(config.username, config.password)
+        conn.request(:basic_auth, config.username, config.password)
         if opts[:header_params]["Content-Type"] == "multipart/form-data"
           conn.request :multipart
           conn.request :url_encoded
@@ -493,6 +515,10 @@ module XeroRuby
           XeroRuby::PayrollNz.const_get(return_type).build_from_hash(data)
         when 'PayrollUkApi'
           XeroRuby::PayrollUk.const_get(return_type).build_from_hash(data)
+        when 'AppStoreApi'
+          XeroRuby::AppStore.const_get(return_type).build_from_hash(data)
+        when 'FinanceApi'
+          XeroRuby::Finance.const_get(return_type).build_from_hash(data)
         else
           XeroRuby::Accounting.const_get(return_type).build_from_hash(data)
         end

data/lib/xero-ruby/configuration.rb

@@ -33,6 +33,8 @@ module XeroRuby
     attr_accessor :payroll_au_url
     attr_accessor :payroll_nz_url
     attr_accessor :payroll_uk_url
+    attr_accessor :app_store_url
+    attr_accessor :finance_url
 
     # Defines API keys used with API Key authentications.
     #
@@ -149,6 +151,8 @@ module XeroRuby
       @payroll_au_url = 'https://api.xero.com/payroll.xro/1.0/'
       @payroll_nz_url = 'https://api.xero.com/payroll.xro/2.0/'
       @payroll_uk_url = 'https://api.xero.com/payroll.xro/2.0/'
+      @app_store_url = 'https://api.xero.com/appstore/2.0/'
+      @finance_url = 'https://api.xero.com/finance.xro/1.0/'
       @access_token = nil
       @id_token = nil
       @api_key = {}

data/lib/xero-ruby/models/accounting/bank_transfer.rb

@@ -40,6 +40,15 @@ module XeroRuby::Accounting
     # The Bank Transaction ID for the destination account
     attr_accessor :to_bank_transaction_id
     
+    # The Bank Transaction boolean to show if it is reconciled for the source account
+    attr_accessor :from_is_reconciled
+    
+    # The Bank Transaction boolean to show if it is reconciled for the destination account
+    attr_accessor :to_is_reconciled
+    
+    # Reference for the transactions.
+    attr_accessor :reference
+    
     # Boolean to indicate if a Bank Transfer has an attachment
     attr_accessor :has_attachments
     
@@ -60,6 +69,9 @@ module XeroRuby::Accounting
         :'currency_rate' => :'CurrencyRate',
         :'from_bank_transaction_id' => :'FromBankTransactionID',
         :'to_bank_transaction_id' => :'ToBankTransactionID',
+        :'from_is_reconciled' => :'FromIsReconciled',
+        :'to_is_reconciled' => :'ToIsReconciled',
+        :'reference' => :'Reference',
         :'has_attachments' => :'HasAttachments',
         :'created_date_utc' => :'CreatedDateUTC',
         :'validation_errors' => :'ValidationErrors'
@@ -77,6 +89,9 @@ module XeroRuby::Accounting
         :'currency_rate' => :'BigDecimal',
         :'from_bank_transaction_id' => :'String',
         :'to_bank_transaction_id' => :'String',
+        :'from_is_reconciled' => :'Boolean',
+        :'to_is_reconciled' => :'Boolean',
+        :'reference' => :'String',
         :'has_attachments' => :'Boolean',
         :'created_date_utc' => :'DateTime',
         :'validation_errors' => :'Array<ValidationError>'
@@ -130,6 +145,22 @@ module XeroRuby::Accounting
         self.to_bank_transaction_id = attributes[:'to_bank_transaction_id']
       end
 
+      if attributes.key?(:'from_is_reconciled')
+        self.from_is_reconciled = attributes[:'from_is_reconciled']
+      else
+        self.from_is_reconciled = false
+      end
+
+      if attributes.key?(:'to_is_reconciled')
+        self.to_is_reconciled = attributes[:'to_is_reconciled']
+      else
+        self.to_is_reconciled = false
+      end
+
+      if attributes.key?(:'reference')
+        self.reference = attributes[:'reference']
+      end
+
       if attributes.key?(:'has_attachments')
         self.has_attachments = attributes[:'has_attachments']
       else
@@ -188,6 +219,9 @@ module XeroRuby::Accounting
           currency_rate == o.currency_rate &&
           from_bank_transaction_id == o.from_bank_transaction_id &&
           to_bank_transaction_id == o.to_bank_transaction_id &&
+          from_is_reconciled == o.from_is_reconciled &&
+          to_is_reconciled == o.to_is_reconciled &&
+          reference == o.reference &&
           has_attachments == o.has_attachments &&
           created_date_utc == o.created_date_utc &&
           validation_errors == o.validation_errors
@@ -202,7 +236,7 @@ module XeroRuby::Accounting
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [from_bank_account, to_bank_account, amount, date, bank_transfer_id, currency_rate, from_bank_transaction_id, to_bank_transaction_id, has_attachments, created_date_utc, validation_errors].hash
+      [from_bank_account, to_bank_account, amount, date, bank_transfer_id, currency_rate, from_bank_transaction_id, to_bank_transaction_id, from_is_reconciled, to_is_reconciled, reference, has_attachments, created_date_utc, validation_errors].hash
     end
 
     # Builds the object from hash

data/lib/xero-ruby/models/accounting/budget_balance.rb

@@ -42,8 +42,8 @@ module XeroRuby::Accounting
     def self.openapi_types
       {
         :'period' => :'Date',
-        :'amount' => :'Integer',
-        :'unit_amount' => :'Integer',
+        :'amount' => :'BigDecimal',
+        :'unit_amount' => :'BigDecimal',
         :'notes' => :'String'
       }
     end

data/lib/xero-ruby/models/accounting/contact.rb

@@ -19,6 +19,9 @@ module XeroRuby::Accounting
     # Xero identifier
     attr_accessor :contact_id
     
+    # ID for the destination of a merged contact. Only returned when using paging or when fetching a contact by ContactId or ContactNumber.
+    attr_accessor :merged_to_contact_id
+    
     # This can be updated via the API only i.e. This field is read only on the Xero contact screen, used to identify contacts in external systems (max length = 50). If the Contact Number is used, this is displayed as Contact Code in the Contacts UI in Xero.
     attr_accessor :contact_number
     
@@ -40,6 +43,9 @@ module XeroRuby::Accounting
     # Last name of contact person (max length = 255)
     attr_accessor :last_name
     
+    # Company registration number (max length = 50)
+    attr_accessor :company_number
+    
     # Email address of contact person (umlauts not supported) (max length  = 255)
     attr_accessor :email_address
     
@@ -73,6 +79,18 @@ module XeroRuby::Accounting
     # true or false – Boolean that describes if a contact has any AR invoices entered against them. Cannot be set via PUT or POST – it is automatically set when an accounts receivable invoice is generated against this contact.
     attr_accessor :is_customer
     
+    # The default sales line amount type for a contact. Only available when summaryOnly parameter or paging is used, or when fetch by ContactId or ContactNumber.
+    attr_accessor :sales_default_line_amount_type
+    INCLUSIVE = "INCLUSIVE".freeze
+    EXCLUSIVE = "EXCLUSIVE".freeze
+    # NONE = "NONE".freeze
+    
+    # The default purchases line amount type for a contact Only available when summaryOnly parameter or paging is used, or when fetch by ContactId or ContactNumber.
+    attr_accessor :purchases_default_line_amount_type
+    # INCLUSIVE = "INCLUSIVE".freeze
+    # EXCLUSIVE = "EXCLUSIVE".freeze
+    # NONE = "NONE".freeze
+    
 
     attr_accessor :default_currency
     
@@ -162,12 +180,14 @@ module XeroRuby::Accounting
     def self.attribute_map
       {
         :'contact_id' => :'ContactID',
+        :'merged_to_contact_id' => :'MergedToContactID',
         :'contact_number' => :'ContactNumber',
         :'account_number' => :'AccountNumber',
         :'contact_status' => :'ContactStatus',
         :'name' => :'Name',
         :'first_name' => :'FirstName',
         :'last_name' => :'LastName',
+        :'company_number' => :'CompanyNumber',
         :'email_address' => :'EmailAddress',
         :'skype_user_name' => :'SkypeUserName',
         :'contact_persons' => :'ContactPersons',
@@ -179,6 +199,8 @@ module XeroRuby::Accounting
         :'phones' => :'Phones',
         :'is_supplier' => :'IsSupplier',
         :'is_customer' => :'IsCustomer',
+        :'sales_default_line_amount_type' => :'SalesDefaultLineAmountType',
+        :'purchases_default_line_amount_type' => :'PurchasesDefaultLineAmountType',
         :'default_currency' => :'DefaultCurrency',
         :'xero_network_key' => :'XeroNetworkKey',
         :'sales_default_account_code' => :'SalesDefaultAccountCode',
@@ -207,12 +229,14 @@ module XeroRuby::Accounting
     def self.openapi_types
       {
         :'contact_id' => :'String',
+        :'merged_to_contact_id' => :'String',
         :'contact_number' => :'String',
         :'account_number' => :'String',
         :'contact_status' => :'String',
         :'name' => :'String',
         :'first_name' => :'String',
         :'last_name' => :'String',
+        :'company_number' => :'String',
         :'email_address' => :'String',
         :'skype_user_name' => :'String',
         :'contact_persons' => :'Array<ContactPerson>',
@@ -224,6 +248,8 @@ module XeroRuby::Accounting
         :'phones' => :'Array<Phone>',
         :'is_supplier' => :'Boolean',
         :'is_customer' => :'Boolean',
+        :'sales_default_line_amount_type' => :'String',
+        :'purchases_default_line_amount_type' => :'String',
         :'default_currency' => :'CurrencyCode',
         :'xero_network_key' => :'String',
         :'sales_default_account_code' => :'String',
@@ -267,6 +293,10 @@ module XeroRuby::Accounting
         self.contact_id = attributes[:'contact_id']
       end
 
+      if attributes.key?(:'merged_to_contact_id')
+        self.merged_to_contact_id = attributes[:'merged_to_contact_id']
+      end
+
       if attributes.key?(:'contact_number')
         self.contact_number = attributes[:'contact_number']
       end
@@ -291,6 +321,10 @@ module XeroRuby::Accounting
         self.last_name = attributes[:'last_name']
       end
 
+      if attributes.key?(:'company_number')
+        self.company_number = attributes[:'company_number']
+      end
+
       if attributes.key?(:'email_address')
         self.email_address = attributes[:'email_address']
       end
@@ -341,6 +375,14 @@ module XeroRuby::Accounting
         self.is_customer = attributes[:'is_customer']
       end
 
+      if attributes.key?(:'sales_default_line_amount_type')
+        self.sales_default_line_amount_type = attributes[:'sales_default_line_amount_type']
+      end
+
+      if attributes.key?(:'purchases_default_line_amount_type')
+        self.purchases_default_line_amount_type = attributes[:'purchases_default_line_amount_type']
+      end
+
       if attributes.key?(:'default_currency')
         self.default_currency = attributes[:'default_currency']
       end
@@ -464,6 +506,10 @@ module XeroRuby::Accounting
         invalid_properties.push('invalid value for "last_name", the character length must be smaller than or equal to 255.')
       end
 
+      if !@company_number.nil? && @company_number.to_s.length > 50
+        invalid_properties.push('invalid value for "company_number", the character length must be smaller than or equal to 50.')
+      end
+
       if !@email_address.nil? && @email_address.to_s.length > 255
         invalid_properties.push('invalid value for "email_address", the character length must be smaller than or equal to 255.')
       end
@@ -485,8 +531,13 @@ module XeroRuby::Accounting
       return false if !@name.nil? && @name.to_s.length > 255
       return false if !@first_name.nil? && @first_name.to_s.length > 255
       return false if !@last_name.nil? && @last_name.to_s.length > 255
+      return false if !@company_number.nil? && @company_number.to_s.length > 50
       return false if !@email_address.nil? && @email_address.to_s.length > 255
       return false if !@tax_number.nil? && @tax_number.to_s.length > 50
+      sales_default_line_amount_type_validator = EnumAttributeValidator.new('String', ["INCLUSIVE", "EXCLUSIVE", "NONE"])
+      return false unless sales_default_line_amount_type_validator.valid?(@sales_default_line_amount_type)
+      purchases_default_line_amount_type_validator = EnumAttributeValidator.new('String', ["INCLUSIVE", "EXCLUSIVE", "NONE"])
+      return false unless purchases_default_line_amount_type_validator.valid?(@purchases_default_line_amount_type)
       true
     end
 
@@ -550,6 +601,16 @@ module XeroRuby::Accounting
       @last_name = last_name
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] company_number Value to be assigned
+    def company_number=(company_number)
+      if !company_number.nil? && company_number.to_s.length > 50
+        fail ArgumentError, 'invalid value for "company_number", the character length must be smaller than or equal to 50.'
+      end
+
+      @company_number = company_number
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] email_address Value to be assigned
     def email_address=(email_address)
@@ -570,18 +631,40 @@ module XeroRuby::Accounting
       @tax_number = tax_number
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] sales_default_line_amount_type Object to be assigned
+    def sales_default_line_amount_type=(sales_default_line_amount_type)
+      validator = EnumAttributeValidator.new('String', ["INCLUSIVE", "EXCLUSIVE", "NONE"])
+      unless validator.valid?(sales_default_line_amount_type)
+        fail ArgumentError, "invalid value for \"sales_default_line_amount_type\", must be one of #{validator.allowable_values}."
+      end
+      @sales_default_line_amount_type = sales_default_line_amount_type
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] purchases_default_line_amount_type Object to be assigned
+    def purchases_default_line_amount_type=(purchases_default_line_amount_type)
+      validator = EnumAttributeValidator.new('String', ["INCLUSIVE", "EXCLUSIVE", "NONE"])
+      unless validator.valid?(purchases_default_line_amount_type)
+        fail ArgumentError, "invalid value for \"purchases_default_line_amount_type\", must be one of #{validator.allowable_values}."
+      end
+      @purchases_default_line_amount_type = purchases_default_line_amount_type
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           contact_id == o.contact_id &&
+          merged_to_contact_id == o.merged_to_contact_id &&
           contact_number == o.contact_number &&
           account_number == o.account_number &&
           contact_status == o.contact_status &&
           name == o.name &&
           first_name == o.first_name &&
           last_name == o.last_name &&
+          company_number == o.company_number &&
           email_address == o.email_address &&
           skype_user_name == o.skype_user_name &&
           contact_persons == o.contact_persons &&
@@ -593,6 +676,8 @@ module XeroRuby::Accounting
           phones == o.phones &&
           is_supplier == o.is_supplier &&
           is_customer == o.is_customer &&
+          sales_default_line_amount_type == o.sales_default_line_amount_type &&
+          purchases_default_line_amount_type == o.purchases_default_line_amount_type &&
           default_currency == o.default_currency &&
           xero_network_key == o.xero_network_key &&
           sales_default_account_code == o.sales_default_account_code &&
@@ -625,7 +710,7 @@ module XeroRuby::Accounting
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [contact_id, contact_number, account_number, contact_status, name, first_name, last_name, email_address, skype_user_name, contact_persons, bank_account_details, tax_number, accounts_receivable_tax_type, accounts_payable_tax_type, addresses, phones, is_supplier, is_customer, default_currency, xero_network_key, sales_default_account_code, purchases_default_account_code, sales_tracking_categories, purchases_tracking_categories, tracking_category_name, tracking_category_option, payment_terms, updated_date_utc, contact_groups, website, branding_theme, batch_payments, discount, balances, attachments, has_attachments, validation_errors, has_validation_errors, status_attribute_string].hash
+      [contact_id, merged_to_contact_id, contact_number, account_number, contact_status, name, first_name, last_name, company_number, email_address, skype_user_name, contact_persons, bank_account_details, tax_number, accounts_receivable_tax_type, accounts_payable_tax_type, addresses, phones, is_supplier, is_customer, sales_default_line_amount_type, purchases_default_line_amount_type, default_currency, xero_network_key, sales_default_account_code, purchases_default_account_code, sales_tracking_categories, purchases_tracking_categories, tracking_category_name, tracking_category_option, payment_terms, updated_date_utc, contact_groups, website, branding_theme, batch_payments, discount, balances, attachments, has_attachments, validation_errors, has_validation_errors, status_attribute_string].hash
     end
 
     # Builds the object from hash