xero-ruby 0.2.3 → 1.2.0

data/lib/xero-ruby/models/{request_empty.rb → accounting/request_empty.rb}

@@ -3,21 +3,21 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.0.6
+The version of the OpenAPI document: 2.2.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.2.0
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'time'
 require 'date'
 
-module XeroRuby
+module XeroRuby::Accounting
   class RequestEmpty
     # Need at least one field to create an empty JSON payload
     attr_accessor :status
-
+    
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -36,13 +36,13 @@ module XeroRuby
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::RequestEmpty` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::Accounting::RequestEmpty` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::RequestEmpty`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::Accounting::RequestEmpty`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -149,7 +149,7 @@ module XeroRuby
           end
         end
       else # model
-        XeroRuby.const_get(type).build_from_hash(value)
+        XeroRuby::Accounting.const_get(type).build_from_hash(value)
       end
     end
 

data/lib/xero-ruby/models/{row_type.rb → accounting/row_type.rb}

@@ -3,17 +3,17 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.0.6
+The version of the OpenAPI document: 2.2.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.2.0
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'time'
 require 'date'
 
-module XeroRuby
+module XeroRuby::Accounting
   class RowType
     HEADER = "Header".freeze
     SECTION = "Section".freeze

data/lib/xero-ruby/models/{sales_tracking_category.rb → accounting/sales_tracking_category.rb}

@@ -3,24 +3,24 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.0.6
+The version of the OpenAPI document: 2.2.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.2.0
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'time'
 require 'date'
 
-module XeroRuby
+module XeroRuby::Accounting
   class SalesTrackingCategory
     # The default sales tracking category name for contacts
     attr_accessor :tracking_category_name
-
+    
     # The default purchase tracking category name for contacts
     attr_accessor :tracking_option_name
-
+    
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -41,13 +41,13 @@ module XeroRuby
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::SalesTrackingCategory` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::Accounting::SalesTrackingCategory` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::SalesTrackingCategory`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::Accounting::SalesTrackingCategory`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -159,7 +159,7 @@ module XeroRuby
           end
         end
       else # model
-        XeroRuby.const_get(type).build_from_hash(value)
+        XeroRuby::Accounting.const_get(type).build_from_hash(value)
       end
     end
 

data/lib/xero-ruby/models/{schedule.rb → accounting/schedule.rb}

@@ -3,39 +3,47 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.0.6
+The version of the OpenAPI document: 2.2.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.2.0
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'time'
 require 'date'
 
-module XeroRuby
+module XeroRuby::Accounting
   class Schedule
     # Integer used with the unit e.g. 1 (every 1 week), 2 (every 2 months)
     attr_accessor :period
-
+    
     # One of the following - WEEKLY or MONTHLY
     attr_accessor :unit
-
+    WEEKLY = "WEEKLY".freeze
+    MONTHLY = "MONTHLY".freeze
+    
     # Integer used with due date type e.g 20 (of following month), 31 (of current month)
     attr_accessor :due_date
-
+    
     # the payment terms
     attr_accessor :due_date_type
-
+    DAYSAFTERBILLDATE = "DAYSAFTERBILLDATE".freeze
+    DAYSAFTERBILLMONTH = "DAYSAFTERBILLMONTH".freeze
+    DAYSAFTERINVOICEDATE = "DAYSAFTERINVOICEDATE".freeze
+    DAYSAFTERINVOICEMONTH = "DAYSAFTERINVOICEMONTH".freeze
+    OFCURRENTMONTH = "OFCURRENTMONTH".freeze
+    OFFOLLOWINGMONTH = "OFFOLLOWINGMONTH".freeze
+    
     # Date the first invoice of the current version of the repeating schedule was generated (changes when repeating invoice is edited)
     attr_accessor :start_date
-
+    
     # The calendar date of the next invoice in the schedule to be generated
     attr_accessor :next_scheduled_date
-
+    
     # Invoice end date – only returned if the template has an end date set
     attr_accessor :end_date
-
+    
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -88,13 +96,13 @@ module XeroRuby
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::Schedule` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::Accounting::Schedule` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::Schedule`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::Accounting::Schedule`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -140,7 +148,7 @@ module XeroRuby
     def valid?
       unit_validator = EnumAttributeValidator.new('String', ["WEEKLY", "MONTHLY"])
       return false unless unit_validator.valid?(@unit)
-      due_date_type_validator = EnumAttributeValidator.new('String', ["DAYSAFTERBILLDATE", "DAYSAFTERBILLMONTH", "OFCURRENTMONTH", "OFFOLLOWINGMONTH"])
+      due_date_type_validator = EnumAttributeValidator.new('String', ["DAYSAFTERBILLDATE", "DAYSAFTERBILLMONTH", "DAYSAFTERINVOICEDATE", "DAYSAFTERINVOICEMONTH", "OFCURRENTMONTH", "OFFOLLOWINGMONTH"])
       return false unless due_date_type_validator.valid?(@due_date_type)
       true
     end
@@ -158,7 +166,7 @@ module XeroRuby
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] due_date_type Object to be assigned
     def due_date_type=(due_date_type)
-      validator = EnumAttributeValidator.new('String', ["DAYSAFTERBILLDATE", "DAYSAFTERBILLMONTH", "OFCURRENTMONTH", "OFFOLLOWINGMONTH"])
+      validator = EnumAttributeValidator.new('String', ["DAYSAFTERBILLDATE", "DAYSAFTERBILLMONTH", "DAYSAFTERINVOICEDATE", "DAYSAFTERINVOICEMONTH", "OFCURRENTMONTH", "OFFOLLOWINGMONTH"])
       unless validator.valid?(due_date_type)
         fail ArgumentError, "invalid value for \"due_date_type\", must be one of #{validator.allowable_values}."
       end
@@ -255,7 +263,7 @@ module XeroRuby
           end
         end
       else # model
-        XeroRuby.const_get(type).build_from_hash(value)
+        XeroRuby::Accounting.const_get(type).build_from_hash(value)
       end
     end
 

data/lib/xero-ruby/models/{tax_component.rb → accounting/tax_component.rb}

@@ -3,30 +3,30 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.0.6
+The version of the OpenAPI document: 2.2.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.2.0
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'time'
 require 'date'
 
-module XeroRuby
+module XeroRuby::Accounting
   class TaxComponent
     # Name of Tax Component
     attr_accessor :name
-
+    
     # Tax Rate (up to 4dp)
     attr_accessor :rate
-
+    
     # Boolean to describe if Tax rate is compounded.
     attr_accessor :is_compound
-
+    
     # Boolean to describe if tax rate is non-recoverable. Non-recoverable rates are only applicable to Canadian organisations
     attr_accessor :is_non_recoverable
-
+    
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -51,13 +51,13 @@ module XeroRuby
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::TaxComponent` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::Accounting::TaxComponent` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::TaxComponent`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::Accounting::TaxComponent`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -179,7 +179,7 @@ module XeroRuby
           end
         end
       else # model
-        XeroRuby.const_get(type).build_from_hash(value)
+        XeroRuby::Accounting.const_get(type).build_from_hash(value)
       end
     end
 

data/lib/xero-ruby/models/{tax_rate.rb → accounting/tax_rate.rb}

@@ -3,54 +3,132 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.0.6
+The version of the OpenAPI document: 2.2.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.2.0
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'time'
 require 'date'
 
-module XeroRuby
+module XeroRuby::Accounting
   class TaxRate
     # Name of tax rate
     attr_accessor :name
-
+    
     # The tax type
     attr_accessor :tax_type
-
+    
     # See TaxComponents
     attr_accessor :tax_components
-
+    
     # See Status Codes
     attr_accessor :status
-
+    ACTIVE = "ACTIVE".freeze
+    DELETED = "DELETED".freeze
+    ARCHIVED = "ARCHIVED".freeze
+    PENDING = "PENDING".freeze
+    
     # See ReportTaxTypes
     attr_accessor :report_tax_type
-
+    AVALARA = "AVALARA".freeze
+    BASEXCLUDED = "BASEXCLUDED".freeze
+    CAPITALSALESOUTPUT = "CAPITALSALESOUTPUT".freeze
+    CAPITALEXPENSESINPUT = "CAPITALEXPENSESINPUT".freeze
+    ECOUTPUT = "ECOUTPUT".freeze
+    ECOUTPUTSERVICES = "ECOUTPUTSERVICES".freeze
+    ECINPUT = "ECINPUT".freeze
+    ECACQUISITIONS = "ECACQUISITIONS".freeze
+    EXEMPTEXPENSES = "EXEMPTEXPENSES".freeze
+    EXEMPTINPUT = "EXEMPTINPUT".freeze
+    EXEMPTOUTPUT = "EXEMPTOUTPUT".freeze
+    GSTONIMPORTS = "GSTONIMPORTS".freeze
+    INPUT = "INPUT".freeze
+    INPUTTAXED = "INPUTTAXED".freeze
+    MOSSSALES = "MOSSSALES".freeze
+    NONE = "NONE".freeze
+    NONEOUTPUT = "NONEOUTPUT".freeze
+    OUTPUT = "OUTPUT".freeze
+    PURCHASESINPUT = "PURCHASESINPUT".freeze
+    SALESOUTPUT = "SALESOUTPUT".freeze
+    EXEMPTCAPITAL = "EXEMPTCAPITAL".freeze
+    EXEMPTEXPORT = "EXEMPTEXPORT".freeze
+    CAPITALEXINPUT = "CAPITALEXINPUT".freeze
+    GSTONCAPIMPORTS = "GSTONCAPIMPORTS".freeze
+    GSTONCAPITALIMPORTS = "GSTONCAPITALIMPORTS".freeze
+    REVERSECHARGES = "REVERSECHARGES".freeze
+    PAYMENTS = "PAYMENTS".freeze
+    INVOICE = "INVOICE".freeze
+    CASH = "CASH".freeze
+    ACCRUAL = "ACCRUAL".freeze
+    FLATRATECASH = "FLATRATECASH".freeze
+    FLATRATEACCRUAL = "FLATRATEACCRUAL".freeze
+    ACCRUALS = "ACCRUALS".freeze
+    TXCA = "TXCA".freeze
+    SRCAS = "SRCAS".freeze
+    DSOUTPUT = "DSOUTPUT".freeze
+    BLINPUT2 = "BLINPUT2".freeze
+    EPINPUT = "EPINPUT".freeze
+    IMINPUT2 = "IMINPUT2".freeze
+    MEINPUT = "MEINPUT".freeze
+    IGDSINPUT2 = "IGDSINPUT2".freeze
+    ESN33_OUTPUT = "ESN33OUTPUT".freeze
+    OPINPUT = "OPINPUT".freeze
+    OSOUTPUT = "OSOUTPUT".freeze
+    TXN33_INPUT = "TXN33INPUT".freeze
+    TXESSINPUT = "TXESSINPUT".freeze
+    TXREINPUT = "TXREINPUT".freeze
+    TXPETINPUT = "TXPETINPUT".freeze
+    NRINPUT = "NRINPUT".freeze
+    ES33_OUTPUT = "ES33OUTPUT".freeze
+    ZERORATEDINPUT = "ZERORATEDINPUT".freeze
+    ZERORATEDOUTPUT = "ZERORATEDOUTPUT".freeze
+    DRCHARGESUPPLY = "DRCHARGESUPPLY".freeze
+    DRCHARGE = "DRCHARGE".freeze
+    CAPINPUT = "CAPINPUT".freeze
+    CAPIMPORTS = "CAPIMPORTS".freeze
+    IMINPUT = "IMINPUT".freeze
+    INPUT2 = "INPUT2".freeze
+    CIUINPUT = "CIUINPUT".freeze
+    SRINPUT = "SRINPUT".freeze
+    OUTPUT2 = "OUTPUT2".freeze
+    SROUTPUT = "SROUTPUT".freeze
+    CAPOUTPUT = "CAPOUTPUT".freeze
+    SROUTPUT2 = "SROUTPUT2".freeze
+    CIUOUTPUT = "CIUOUTPUT".freeze
+    ZROUTPUT = "ZROUTPUT".freeze
+    ZREXPORT = "ZREXPORT".freeze
+    ACC28_PLUS = "ACC28PLUS".freeze
+    ACCUPTO28 = "ACCUPTO28".freeze
+    OTHEROUTPUT = "OTHEROUTPUT".freeze
+    SHOUTPUT = "SHOUTPUT".freeze
+    ZRINPUT = "ZRINPUT".freeze
+    BADDEBT = "BADDEBT".freeze
+    OTHERINPUT = "OTHERINPUT".freeze
+    
     # Boolean to describe if tax rate can be used for asset accounts i.e.  true,false
     attr_accessor :can_apply_to_assets
-
+    
     # Boolean to describe if tax rate can be used for equity accounts i.e true,false
     attr_accessor :can_apply_to_equity
-
+    
     # Boolean to describe if tax rate can be used for expense accounts  i.e. true,false
     attr_accessor :can_apply_to_expenses
-
+    
     # Boolean to describe if tax rate can be used for liability accounts  i.e. true,false
     attr_accessor :can_apply_to_liabilities
-
+    
     # Boolean to describe if tax rate can be used for revenue accounts i.e. true,false
     attr_accessor :can_apply_to_revenue
-
+    
     # Tax Rate (decimal to 4dp) e.g 12.5000
     attr_accessor :display_tax_rate
-
+    
     # Effective Tax Rate (decimal to 4dp) e.g 12.5000
     attr_accessor :effective_rate
-
+    
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -113,13 +191,13 @@ module XeroRuby
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::TaxRate` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `XeroRuby::Accounting::TaxRate` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::TaxRate`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `XeroRuby::Accounting::TaxRate`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -187,7 +265,7 @@ module XeroRuby
     def valid?
       status_validator = EnumAttributeValidator.new('String', ["ACTIVE", "DELETED", "ARCHIVED", "PENDING"])
       return false unless status_validator.valid?(@status)
-      report_tax_type_validator = EnumAttributeValidator.new('String', ["AVALARA", "BASEXCLUDED", "CAPITALSALESOUTPUT", "CAPITALEXPENSESINPUT", "ECOUTPUT", "ECOUTPUTSERVICES", "ECINPUT", "ECACQUISITIONS", "EXEMPTEXPENSES", "EXEMPTINPUT", "EXEMPTOUTPUT", "GSTONIMPORTS", "INPUT", "INPUTTAXED", "MOSSSALES", "NONE", "NONEOUTPUT", "OUTPUT", "PURCHASESINPUT", "SALESOUTPUT", "EXEMPTCAPITAL", "EXEMPTEXPORT", "CAPITALEXINPUT", "GSTONCAPIMPORTS", "GSTONCAPITALIMPORTS", "REVERSECHARGES", "PAYMENTS", "INVOICE", "CASH", "ACCRUAL", "FLATRATECASH", "FLATRATEACCRUAL", "ACCRUALS", "TXCA", "SRCAS", "DSOUTPUT", "BLINPUT2", "EPINPUT", "IMINPUT2", "MEINPUT", "IGDSINPUT2", "ESN33OUTPUT", "OPINPUT", "OSOUTPUT", "TXN33INPUT", "TXESSINPUT", "TXREINPUT", "TXPETINPUT", "NRINPUT", "ES33OUTPUT", "ZERORATEDINPUT", "ZERORATEDOUTPUT"])
+      report_tax_type_validator = EnumAttributeValidator.new('String', ["AVALARA", "BASEXCLUDED", "CAPITALSALESOUTPUT", "CAPITALEXPENSESINPUT", "ECOUTPUT", "ECOUTPUTSERVICES", "ECINPUT", "ECACQUISITIONS", "EXEMPTEXPENSES", "EXEMPTINPUT", "EXEMPTOUTPUT", "GSTONIMPORTS", "INPUT", "INPUTTAXED", "MOSSSALES", "NONE", "NONEOUTPUT", "OUTPUT", "PURCHASESINPUT", "SALESOUTPUT", "EXEMPTCAPITAL", "EXEMPTEXPORT", "CAPITALEXINPUT", "GSTONCAPIMPORTS", "GSTONCAPITALIMPORTS", "REVERSECHARGES", "PAYMENTS", "INVOICE", "CASH", "ACCRUAL", "FLATRATECASH", "FLATRATEACCRUAL", "ACCRUALS", "TXCA", "SRCAS", "DSOUTPUT", "BLINPUT2", "EPINPUT", "IMINPUT2", "MEINPUT", "IGDSINPUT2", "ESN33OUTPUT", "OPINPUT", "OSOUTPUT", "TXN33INPUT", "TXESSINPUT", "TXREINPUT", "TXPETINPUT", "NRINPUT", "ES33OUTPUT", "ZERORATEDINPUT", "ZERORATEDOUTPUT", "DRCHARGESUPPLY", "DRCHARGE", "CAPINPUT", "CAPIMPORTS", "IMINPUT", "INPUT2", "CIUINPUT", "SRINPUT", "OUTPUT2", "SROUTPUT", "CAPOUTPUT", "SROUTPUT2", "CIUOUTPUT", "ZROUTPUT", "ZREXPORT", "ACC28PLUS", "ACCUPTO28", "OTHEROUTPUT", "SHOUTPUT", "ZRINPUT", "BADDEBT", "OTHERINPUT"])
       return false unless report_tax_type_validator.valid?(@report_tax_type)
       true
     end
@@ -205,7 +283,7 @@ module XeroRuby
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] report_tax_type Object to be assigned
     def report_tax_type=(report_tax_type)
-      validator = EnumAttributeValidator.new('String', ["AVALARA", "BASEXCLUDED", "CAPITALSALESOUTPUT", "CAPITALEXPENSESINPUT", "ECOUTPUT", "ECOUTPUTSERVICES", "ECINPUT", "ECACQUISITIONS", "EXEMPTEXPENSES", "EXEMPTINPUT", "EXEMPTOUTPUT", "GSTONIMPORTS", "INPUT", "INPUTTAXED", "MOSSSALES", "NONE", "NONEOUTPUT", "OUTPUT", "PURCHASESINPUT", "SALESOUTPUT", "EXEMPTCAPITAL", "EXEMPTEXPORT", "CAPITALEXINPUT", "GSTONCAPIMPORTS", "GSTONCAPITALIMPORTS", "REVERSECHARGES", "PAYMENTS", "INVOICE", "CASH", "ACCRUAL", "FLATRATECASH", "FLATRATEACCRUAL", "ACCRUALS", "TXCA", "SRCAS", "DSOUTPUT", "BLINPUT2", "EPINPUT", "IMINPUT2", "MEINPUT", "IGDSINPUT2", "ESN33OUTPUT", "OPINPUT", "OSOUTPUT", "TXN33INPUT", "TXESSINPUT", "TXREINPUT", "TXPETINPUT", "NRINPUT", "ES33OUTPUT", "ZERORATEDINPUT", "ZERORATEDOUTPUT"])
+      validator = EnumAttributeValidator.new('String', ["AVALARA", "BASEXCLUDED", "CAPITALSALESOUTPUT", "CAPITALEXPENSESINPUT", "ECOUTPUT", "ECOUTPUTSERVICES", "ECINPUT", "ECACQUISITIONS", "EXEMPTEXPENSES", "EXEMPTINPUT", "EXEMPTOUTPUT", "GSTONIMPORTS", "INPUT", "INPUTTAXED", "MOSSSALES", "NONE", "NONEOUTPUT", "OUTPUT", "PURCHASESINPUT", "SALESOUTPUT", "EXEMPTCAPITAL", "EXEMPTEXPORT", "CAPITALEXINPUT", "GSTONCAPIMPORTS", "GSTONCAPITALIMPORTS", "REVERSECHARGES", "PAYMENTS", "INVOICE", "CASH", "ACCRUAL", "FLATRATECASH", "FLATRATEACCRUAL", "ACCRUALS", "TXCA", "SRCAS", "DSOUTPUT", "BLINPUT2", "EPINPUT", "IMINPUT2", "MEINPUT", "IGDSINPUT2", "ESN33OUTPUT", "OPINPUT", "OSOUTPUT", "TXN33INPUT", "TXESSINPUT", "TXREINPUT", "TXPETINPUT", "NRINPUT", "ES33OUTPUT", "ZERORATEDINPUT", "ZERORATEDOUTPUT", "DRCHARGESUPPLY", "DRCHARGE", "CAPINPUT", "CAPIMPORTS", "IMINPUT", "INPUT2", "CIUINPUT", "SRINPUT", "OUTPUT2", "SROUTPUT", "CAPOUTPUT", "SROUTPUT2", "CIUOUTPUT", "ZROUTPUT", "ZREXPORT", "ACC28PLUS", "ACCUPTO28", "OTHEROUTPUT", "SHOUTPUT", "ZRINPUT", "BADDEBT", "OTHERINPUT"])
       unless validator.valid?(report_tax_type)
         fail ArgumentError, "invalid value for \"report_tax_type\", must be one of #{validator.allowable_values}."
       end
@@ -307,7 +385,7 @@ module XeroRuby
           end
         end
       else # model
-        XeroRuby.const_get(type).build_from_hash(value)
+        XeroRuby::Accounting.const_get(type).build_from_hash(value)
       end
     end