xero-ruby 3.4.0 → 3.7.0

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

@@ -3594,7 +3594,7 @@ module XeroRuby
     # Retrieves employees
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :filter Filter by first name and/or lastname
+    # @option opts [String] :filter Filter by first name, lastname, and/or whether they are an off-payroll worker
     # @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 = {})
@@ -3605,7 +3605,7 @@ module XeroRuby
     # Retrieves employees
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :filter Filter by first name and/or lastname
+    # @option opts [String] :filter Filter by first name, lastname, and/or whether they are an off-payroll worker
     # @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 = {})

data/lib/xero-ruby/api_client.rb

@@ -110,6 +110,11 @@ module XeroRuby
       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
@@ -183,7 +188,7 @@ module XeroRuby
     end
 
     def validate_state(params)
-      if params[:state] != @state
+      if params['state'] != @state
         raise StandardError.new "WARNING: @config.state: #{@state} and OAuth callback state: #{params['state']} do not match!"
       end
       return true
@@ -284,6 +289,10 @@ 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
@@ -508,6 +517,8 @@ module XeroRuby
           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

@@ -34,6 +34,7 @@ module XeroRuby
     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.
     #
@@ -151,6 +152,7 @@ module XeroRuby
       @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/account.rb

@@ -33,20 +33,20 @@ module XeroRuby::Accounting
     
     # Accounts with a status of ACTIVE can be updated to ARCHIVED. See Account Status Codes
     attr_accessor :status
-    ACTIVE = "ACTIVE".freeze
-    ARCHIVED = "ARCHIVED".freeze
-    DELETED = "DELETED".freeze
+    ACTIVE ||= "ACTIVE".freeze
+    ARCHIVED ||= "ARCHIVED".freeze
+    DELETED ||= "DELETED".freeze
     
     # Description of the Account. Valid for all types of accounts except bank accounts (max length = 4000)
     attr_accessor :description
     
     # For bank accounts only. See Bank Account types
     attr_accessor :bank_account_type
-    BANK = "BANK".freeze
-    CREDITCARD = "CREDITCARD".freeze
-    PAYPAL = "PAYPAL".freeze
-    NONE = "NONE".freeze
-    EMPTY = "".freeze
+    BANK ||= "BANK".freeze
+    CREDITCARD ||= "CREDITCARD".freeze
+    PAYPAL ||= "PAYPAL".freeze
+    NONE ||= "NONE".freeze
+    EMPTY ||= "".freeze
     
 
     attr_accessor :currency_code
@@ -62,35 +62,35 @@ module XeroRuby::Accounting
     
     # See Account Class Types
     attr_accessor :_class
-    ASSET = "ASSET".freeze
-    EQUITY = "EQUITY".freeze
-    EXPENSE = "EXPENSE".freeze
-    LIABILITY = "LIABILITY".freeze
-    REVENUE = "REVENUE".freeze
+    ASSET ||= "ASSET".freeze
+    EQUITY ||= "EQUITY".freeze
+    EXPENSE ||= "EXPENSE".freeze
+    LIABILITY ||= "LIABILITY".freeze
+    REVENUE ||= "REVENUE".freeze
     
     # If this is a system account then this element is returned. See System Account types. Note that non-system accounts may have this element set as either “” or null.
     attr_accessor :system_account
-    DEBTORS = "DEBTORS".freeze
-    CREDITORS = "CREDITORS".freeze
-    BANKCURRENCYGAIN = "BANKCURRENCYGAIN".freeze
-    GST = "GST".freeze
-    GSTONIMPORTS = "GSTONIMPORTS".freeze
-    HISTORICAL = "HISTORICAL".freeze
-    REALISEDCURRENCYGAIN = "REALISEDCURRENCYGAIN".freeze
-    RETAINEDEARNINGS = "RETAINEDEARNINGS".freeze
-    ROUNDING = "ROUNDING".freeze
-    TRACKINGTRANSFERS = "TRACKINGTRANSFERS".freeze
-    UNPAIDEXPCLM = "UNPAIDEXPCLM".freeze
-    UNREALISEDCURRENCYGAIN = "UNREALISEDCURRENCYGAIN".freeze
-    WAGEPAYABLES = "WAGEPAYABLES".freeze
-    CISASSETS = "CISASSETS".freeze
-    CISASSET = "CISASSET".freeze
-    CISLABOUR = "CISLABOUR".freeze
-    CISLABOUREXPENSE = "CISLABOUREXPENSE".freeze
-    CISLABOURINCOME = "CISLABOURINCOME".freeze
-    CISLIABILITY = "CISLIABILITY".freeze
-    CISMATERIALS = "CISMATERIALS".freeze
-    # EMPTY = "".freeze
+    DEBTORS ||= "DEBTORS".freeze
+    CREDITORS ||= "CREDITORS".freeze
+    BANKCURRENCYGAIN ||= "BANKCURRENCYGAIN".freeze
+    GST ||= "GST".freeze
+    GSTONIMPORTS ||= "GSTONIMPORTS".freeze
+    HISTORICAL ||= "HISTORICAL".freeze
+    REALISEDCURRENCYGAIN ||= "REALISEDCURRENCYGAIN".freeze
+    RETAINEDEARNINGS ||= "RETAINEDEARNINGS".freeze
+    ROUNDING ||= "ROUNDING".freeze
+    TRACKINGTRANSFERS ||= "TRACKINGTRANSFERS".freeze
+    UNPAIDEXPCLM ||= "UNPAIDEXPCLM".freeze
+    UNREALISEDCURRENCYGAIN ||= "UNREALISEDCURRENCYGAIN".freeze
+    WAGEPAYABLES ||= "WAGEPAYABLES".freeze
+    CISASSETS ||= "CISASSETS".freeze
+    CISASSET ||= "CISASSET".freeze
+    CISLABOUR ||= "CISLABOUR".freeze
+    CISLABOUREXPENSE ||= "CISLABOUREXPENSE".freeze
+    CISLABOURINCOME ||= "CISLABOURINCOME".freeze
+    CISLIABILITY ||= "CISLIABILITY".freeze
+    CISMATERIALS ||= "CISMATERIALS".freeze
+    EMPTY ||= "".freeze
     
     # Shown if set
     attr_accessor :reporting_code

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

@@ -14,28 +14,28 @@ require 'date'
 
 module XeroRuby::Accounting
   class AccountType
-    BANK = "BANK".freeze
-    CURRENT = "CURRENT".freeze
-    CURRLIAB = "CURRLIAB".freeze
-    DEPRECIATN = "DEPRECIATN".freeze
-    DIRECTCOSTS = "DIRECTCOSTS".freeze
-    EQUITY = "EQUITY".freeze
-    EXPENSE = "EXPENSE".freeze
-    FIXED = "FIXED".freeze
-    INVENTORY = "INVENTORY".freeze
-    LIABILITY = "LIABILITY".freeze
-    NONCURRENT = "NONCURRENT".freeze
-    OTHERINCOME = "OTHERINCOME".freeze
-    OVERHEADS = "OVERHEADS".freeze
-    PREPAYMENT = "PREPAYMENT".freeze
-    REVENUE = "REVENUE".freeze
-    SALES = "SALES".freeze
-    TERMLIAB = "TERMLIAB".freeze
-    PAYGLIABILITY = "PAYGLIABILITY".freeze
-    PAYG = "PAYG".freeze
-    SUPERANNUATIONEXPENSE = "SUPERANNUATIONEXPENSE".freeze
-    SUPERANNUATIONLIABILITY = "SUPERANNUATIONLIABILITY".freeze
-    WAGESEXPENSE = "WAGESEXPENSE".freeze
+    BANK ||= "BANK".freeze
+    CURRENT ||= "CURRENT".freeze
+    CURRLIAB ||= "CURRLIAB".freeze
+    DEPRECIATN ||= "DEPRECIATN".freeze
+    DIRECTCOSTS ||= "DIRECTCOSTS".freeze
+    EQUITY ||= "EQUITY".freeze
+    EXPENSE ||= "EXPENSE".freeze
+    FIXED ||= "FIXED".freeze
+    INVENTORY ||= "INVENTORY".freeze
+    LIABILITY ||= "LIABILITY".freeze
+    NONCURRENT ||= "NONCURRENT".freeze
+    OTHERINCOME ||= "OTHERINCOME".freeze
+    OVERHEADS ||= "OVERHEADS".freeze
+    PREPAYMENT ||= "PREPAYMENT".freeze
+    REVENUE ||= "REVENUE".freeze
+    SALES ||= "SALES".freeze
+    TERMLIAB ||= "TERMLIAB".freeze
+    PAYGLIABILITY ||= "PAYGLIABILITY".freeze
+    PAYG ||= "PAYG".freeze
+    SUPERANNUATIONEXPENSE ||= "SUPERANNUATIONEXPENSE".freeze
+    SUPERANNUATIONLIABILITY ||= "SUPERANNUATIONLIABILITY".freeze
+    WAGESEXPENSE ||= "WAGESEXPENSE".freeze
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string

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

@@ -21,8 +21,8 @@ module XeroRuby::Accounting
     
     # Status of the action for this organisation
     attr_accessor :status
-    ALLOWED = "ALLOWED".freeze
-    NOT_ALLOWED = "NOT-ALLOWED".freeze
+    ALLOWED ||= "ALLOWED".freeze
+    NOT_ALLOWED ||= "NOT-ALLOWED".freeze
     
     class EnumAttributeValidator
       attr_reader :datatype

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

@@ -18,8 +18,8 @@ module XeroRuby::Accounting
   class Address
     # define the type of address
     attr_accessor :address_type
-    POBOX = "POBOX".freeze
-    STREET = "STREET".freeze
+    POBOX ||= "POBOX".freeze
+    STREET ||= "STREET".freeze
     
     # max length = 500
     attr_accessor :address_line1

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

@@ -18,9 +18,9 @@ module XeroRuby::Accounting
   class AddressForOrganisation
     # define the type of address
     attr_accessor :address_type
-    POBOX = "POBOX".freeze
-    STREET = "STREET".freeze
-    DELIVERY = "DELIVERY".freeze
+    POBOX ||= "POBOX".freeze
+    STREET ||= "STREET".freeze
+    DELIVERY ||= "DELIVERY".freeze
     
     # max length = 500
     attr_accessor :address_line1

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

@@ -18,14 +18,14 @@ module XeroRuby::Accounting
   class BankTransaction
     # See Bank Transaction Types
     attr_accessor :type
-    RECEIVE = "RECEIVE".freeze
-    RECEIVE_OVERPAYMENT = "RECEIVE-OVERPAYMENT".freeze
-    RECEIVE_PREPAYMENT = "RECEIVE-PREPAYMENT".freeze
-    SPEND = "SPEND".freeze
-    SPEND_OVERPAYMENT = "SPEND-OVERPAYMENT".freeze
-    SPEND_PREPAYMENT = "SPEND-PREPAYMENT".freeze
-    RECEIVE_TRANSFER = "RECEIVE-TRANSFER".freeze
-    SPEND_TRANSFER = "SPEND-TRANSFER".freeze
+    RECEIVE ||= "RECEIVE".freeze
+    RECEIVE_OVERPAYMENT ||= "RECEIVE-OVERPAYMENT".freeze
+    RECEIVE_PREPAYMENT ||= "RECEIVE-PREPAYMENT".freeze
+    SPEND ||= "SPEND".freeze
+    SPEND_OVERPAYMENT ||= "SPEND-OVERPAYMENT".freeze
+    SPEND_PREPAYMENT ||= "SPEND-PREPAYMENT".freeze
+    RECEIVE_TRANSFER ||= "RECEIVE-TRANSFER".freeze
+    SPEND_TRANSFER ||= "SPEND-TRANSFER".freeze
     
 
     attr_accessor :contact
@@ -56,9 +56,9 @@ module XeroRuby::Accounting
     
     # See Bank Transaction Status Codes
     attr_accessor :status
-    AUTHORISED = "AUTHORISED".freeze
-    DELETED = "DELETED".freeze
-    VOIDED = "VOIDED".freeze
+    AUTHORISED ||= "AUTHORISED".freeze
+    DELETED ||= "DELETED".freeze
+    VOIDED ||= "VOIDED".freeze
     
 
     attr_accessor :line_amount_types

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

@@ -51,13 +51,13 @@ module XeroRuby::Accounting
     
     # PAYBATCH for bill payments or RECBATCH for sales invoice payments (read-only)
     attr_accessor :type
-    PAYBATCH = "PAYBATCH".freeze
-    RECBATCH = "RECBATCH".freeze
+    PAYBATCH ||= "PAYBATCH".freeze
+    RECBATCH ||= "RECBATCH".freeze
     
     # AUTHORISED or DELETED (read-only). New batch payments will have a status of AUTHORISED. It is not possible to delete batch payments via the API.
     attr_accessor :status
-    AUTHORISED = "AUTHORISED".freeze
-    DELETED = "DELETED".freeze
+    AUTHORISED ||= "AUTHORISED".freeze
+    DELETED ||= "DELETED".freeze
     
     # The total of the payments that make up the batch (read-only)
     attr_accessor :total_amount

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

@@ -27,7 +27,7 @@ module XeroRuby::Accounting
     
     # Always INVOICE
     attr_accessor :type
-    INVOICE = "INVOICE".freeze
+    INVOICE ||= "INVOICE".freeze
     
     # Integer – ranked order of branding theme. The default branding theme has a value of 0
     attr_accessor :sort_order

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

@@ -21,8 +21,8 @@ module XeroRuby::Accounting
     
     # Type of Budget. OVERALL or TRACKING
     attr_accessor :type
-    OVERALL = "OVERALL".freeze
-    TRACKING = "TRACKING".freeze
+    OVERALL ||= "OVERALL".freeze
+    TRACKING ||= "TRACKING".freeze
     
     # The Budget description
     attr_accessor :description

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
     
@@ -27,9 +30,9 @@ module XeroRuby::Accounting
     
     # Current status of a contact – see contact status types
     attr_accessor :contact_status
-    ACTIVE = "ACTIVE".freeze
-    ARCHIVED = "ARCHIVED".freeze
-    GDPRREQUEST = "GDPRREQUEST".freeze
+    ACTIVE ||= "ACTIVE".freeze
+    ARCHIVED ||= "ARCHIVED".freeze
+    GDPRREQUEST ||= "GDPRREQUEST".freeze
     
     # Full name of contact/organisation (max length = 255)
     attr_accessor :name
@@ -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

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

@@ -21,8 +21,8 @@ module XeroRuby::Accounting
     
     # The Status of a contact group. To delete a contact group update the status to DELETED. Only contact groups with a status of ACTIVE are returned on GETs.
     attr_accessor :status
-    ACTIVE = "ACTIVE".freeze
-    DELETED = "DELETED".freeze
+    ACTIVE ||= "ACTIVE".freeze
+    DELETED ||= "DELETED".freeze
     
     # The Xero identifier for an contact group – specified as a string following the endpoint name. e.g. /297c2dc5-cc47-4afd-8ec8-74990b8761e9
     attr_accessor :contact_group_id