xero-ruby 9.3.0 → 18.0.0

data/lib/xero-ruby/models/payroll_au_v2/timesheets.rb

@@ -0,0 +1,244 @@
+=begin
+#Xero Payroll AU API 2.0
+
+#This is the Xero Payroll API 2.0 for orgs in Australia region.
+
+Contact: api@xero.com
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.3.1
+
+=end
+
+require 'time'
+require 'date'
+
+module XeroRuby::PayrollAuV2
+  require 'bigdecimal'
+
+  class Timesheets
+
+    attr_accessor :pagination
+    
+
+    attr_accessor :problem
+    
+
+    attr_accessor :timesheets
+    
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'pagination' => :'pagination',
+        :'problem' => :'problem',
+        :'timesheets' => :'timesheets'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'pagination' => :'Pagination',
+        :'problem' => :'Problem',
+        :'timesheets' => :'Array<Timesheet>'
+      }
+    end
+
+    # Initializes the object
+    # @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::PayrollAuV2::Timesheets` 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::PayrollAuV2::Timesheets`. 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
+      }
+
+      if attributes.key?(:'pagination')
+        self.pagination = attributes[:'pagination']
+      end
+
+      if attributes.key?(:'problem')
+        self.problem = attributes[:'problem']
+      end
+
+      if attributes.key?(:'timesheets')
+        if (value = attributes[:'timesheets']).is_a?(Array)
+          self.timesheets = value
+        end
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      true
+    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 &&
+          pagination == o.pagination &&
+          problem == o.problem &&
+          timesheets == o.timesheets
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [pagination, problem, timesheets].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.openapi_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(parse_date(value))
+      when :Date
+        Date.parse(parse_date(value))
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BigDecimal
+        BigDecimal(value.to_s)
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        XeroRuby::PayrollAuV2.const_get(type).build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash(downcase: false)
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        key = downcase ? attr : param
+        hash[key] = _to_hash(value, downcase: downcase)
+      end
+      hash
+    end
+
+    # Returns the object in the form of hash with snake_case
+    def to_attributes
+      to_hash(downcase: true)
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value, downcase: false)
+      if value.is_a?(Array)
+        value.map do |v|
+          v.to_hash(downcase: downcase)
+        end
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.map { |k, v| hash[k] = _to_hash(v, downcase: downcase) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash(downcase: downcase)
+      else
+        value
+      end
+    end
+
+    def parse_date(datestring)
+      if datestring.include?('Date')
+        date_pattern = /\/Date\((-?\d+)(\+\d+)?\)\//
+        original, date, timezone = *date_pattern.match(datestring)
+        date = (date.to_i / 1000)
+        Time.at(date).utc.strftime('%Y-%m-%dT%H:%M:%S%z').to_s
+      elsif /(\d\d\d\d)-(\d\d)/.match(datestring) # handles dates w/out Days: YYYY-MM*-DD
+        Time.parse(datestring + '-01').strftime('%Y-%m-%dT%H:%M:%S').to_s
+      else # handle date 'types' for small subset of payroll API's
+        Time.parse(datestring).strftime('%Y-%m-%dT%H:%M:%S').to_s
+      end
+    end
+  end
+end

data/lib/xero-ruby/models/payroll_nz/employee.rb

@@ -225,12 +225,32 @@ module XeroRuby::PayrollNz
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if @first_name.nil?
+        invalid_properties.push('invalid value for "first_name", first_name cannot be nil.')
+      end
+
+      if @last_name.nil?
+        invalid_properties.push('invalid value for "last_name", last_name cannot be nil.')
+      end
+
+      if @date_of_birth.nil?
+        invalid_properties.push('invalid value for "date_of_birth", date_of_birth cannot be nil.')
+      end
+
+      if @address.nil?
+        invalid_properties.push('invalid value for "address", address cannot be nil.')
+      end
+
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if @first_name.nil?
+      return false if @last_name.nil?
+      return false if @date_of_birth.nil?
+      return false if @address.nil?
       gender_validator = EnumAttributeValidator.new('String', ["M", "F"])
       return false unless gender_validator.valid?(@gender)
       true

data/lib/xero-ruby/models/payroll_nz/employee_leave_setup.rb

@@ -28,11 +28,11 @@ module XeroRuby::PayrollNz
     # The dollar value of annual leave opening balance if negative.
     attr_accessor :negative_annual_leave_balance_paid_amount
     
-    # Number of hours accrued annually for sick leave. Multiply the number of days they're entitled to by the hours worked per day
-    attr_accessor :sick_leave_hours_to_accrue_annually
+    # Number of units accrued annually for sick leave. The type of units is determined by the property \"TypeOfUnitsToAccrue\" on the \"Sick Leave\" leave type
+    attr_accessor :sick_leave_to_accrue_annually
     
-    # Maximum number of hours accrued annually for sick leave. Multiply the maximum days they can accrue by the hours worked per day
-    attr_accessor :sick_leave_maximum_hours_to_accrue
+    # 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
+    attr_accessor :sick_leave_maximum_to_accrue
     
     # Initial sick leave balance. This will be positive unless they've taken sick leave in advance
     attr_accessor :sick_leave_opening_balance
@@ -40,9 +40,12 @@ module XeroRuby::PayrollNz
     # Set Schedule of Accrual Type for Sick Leave
     attr_accessor :sick_leave_schedule_of_accrual
     
-    # If Sick Leave Schedule of Accrual is \"OnAnniversaryDate\", this is the date when entitled to Sick Leave
+    # 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
     attr_accessor :sick_leave_anniversary_date
     
+    # The first date the employee will accrue Annual Leave. When null the Employee's start date is used as the anniversary date
+    attr_accessor :annual_leave_anniversary_date
+    
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -50,11 +53,12 @@ module XeroRuby::PayrollNz
         :'holiday_pay_opening_balance' => :'holidayPayOpeningBalance',
         :'annual_leave_opening_balance' => :'annualLeaveOpeningBalance',
         :'negative_annual_leave_balance_paid_amount' => :'negativeAnnualLeaveBalancePaidAmount',
-        :'sick_leave_hours_to_accrue_annually' => :'sickLeaveHoursToAccrueAnnually',
-        :'sick_leave_maximum_hours_to_accrue' => :'sickLeaveMaximumHoursToAccrue',
+        :'sick_leave_to_accrue_annually' => :'SickLeaveToAccrueAnnually',
+        :'sick_leave_maximum_to_accrue' => :'SickLeaveMaximumToAccrue',
         :'sick_leave_opening_balance' => :'sickLeaveOpeningBalance',
         :'sick_leave_schedule_of_accrual' => :'SickLeaveScheduleOfAccrual',
-        :'sick_leave_anniversary_date' => :'SickLeaveAnniversaryDate'
+        :'sick_leave_anniversary_date' => :'SickLeaveAnniversaryDate',
+        :'annual_leave_anniversary_date' => :'AnnualLeaveAnniversaryDate'
       }
     end
 
@@ -65,11 +69,12 @@ module XeroRuby::PayrollNz
         :'holiday_pay_opening_balance' => :'BigDecimal',
         :'annual_leave_opening_balance' => :'BigDecimal',
         :'negative_annual_leave_balance_paid_amount' => :'BigDecimal',
-        :'sick_leave_hours_to_accrue_annually' => :'BigDecimal',
-        :'sick_leave_maximum_hours_to_accrue' => :'BigDecimal',
+        :'sick_leave_to_accrue_annually' => :'BigDecimal',
+        :'sick_leave_maximum_to_accrue' => :'BigDecimal',
         :'sick_leave_opening_balance' => :'BigDecimal',
         :'sick_leave_schedule_of_accrual' => :'String',
-        :'sick_leave_anniversary_date' => :'Date'
+        :'sick_leave_anniversary_date' => :'Date',
+        :'annual_leave_anniversary_date' => :'Date'
       }
     end
 
@@ -104,12 +109,12 @@ module XeroRuby::PayrollNz
         self.negative_annual_leave_balance_paid_amount = attributes[:'negative_annual_leave_balance_paid_amount']
       end
 
-      if attributes.key?(:'sick_leave_hours_to_accrue_annually')
-        self.sick_leave_hours_to_accrue_annually = attributes[:'sick_leave_hours_to_accrue_annually']
+      if attributes.key?(:'sick_leave_to_accrue_annually')
+        self.sick_leave_to_accrue_annually = attributes[:'sick_leave_to_accrue_annually']
       end
 
-      if attributes.key?(:'sick_leave_maximum_hours_to_accrue')
-        self.sick_leave_maximum_hours_to_accrue = attributes[:'sick_leave_maximum_hours_to_accrue']
+      if attributes.key?(:'sick_leave_maximum_to_accrue')
+        self.sick_leave_maximum_to_accrue = attributes[:'sick_leave_maximum_to_accrue']
       end
 
       if attributes.key?(:'sick_leave_opening_balance')
@@ -123,6 +128,10 @@ module XeroRuby::PayrollNz
       if attributes.key?(:'sick_leave_anniversary_date')
         self.sick_leave_anniversary_date = attributes[:'sick_leave_anniversary_date']
       end
+
+      if attributes.key?(:'annual_leave_anniversary_date')
+        self.annual_leave_anniversary_date = attributes[:'annual_leave_anniversary_date']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -147,11 +156,12 @@ module XeroRuby::PayrollNz
           holiday_pay_opening_balance == o.holiday_pay_opening_balance &&
           annual_leave_opening_balance == o.annual_leave_opening_balance &&
           negative_annual_leave_balance_paid_amount == o.negative_annual_leave_balance_paid_amount &&
-          sick_leave_hours_to_accrue_annually == o.sick_leave_hours_to_accrue_annually &&
-          sick_leave_maximum_hours_to_accrue == o.sick_leave_maximum_hours_to_accrue &&
+          sick_leave_to_accrue_annually == o.sick_leave_to_accrue_annually &&
+          sick_leave_maximum_to_accrue == o.sick_leave_maximum_to_accrue &&
           sick_leave_opening_balance == o.sick_leave_opening_balance &&
           sick_leave_schedule_of_accrual == o.sick_leave_schedule_of_accrual &&
-          sick_leave_anniversary_date == o.sick_leave_anniversary_date
+          sick_leave_anniversary_date == o.sick_leave_anniversary_date &&
+          annual_leave_anniversary_date == o.annual_leave_anniversary_date
     end
 
     # @see the `==` method
@@ -163,7 +173,7 @@ module XeroRuby::PayrollNz
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [include_holiday_pay, holiday_pay_opening_balance, annual_leave_opening_balance, negative_annual_leave_balance_paid_amount, sick_leave_hours_to_accrue_annually, sick_leave_maximum_hours_to_accrue, sick_leave_opening_balance, sick_leave_schedule_of_accrual, sick_leave_anniversary_date].hash
+      [include_holiday_pay, holiday_pay_opening_balance, annual_leave_opening_balance, negative_annual_leave_balance_paid_amount, sick_leave_to_accrue_annually, sick_leave_maximum_to_accrue, sick_leave_opening_balance, sick_leave_schedule_of_accrual, sick_leave_anniversary_date, annual_leave_anniversary_date].hash
     end
 
     # Builds the object from hash

data/lib/xero-ruby/models/payroll_nz/employee_leave_type.rb

@@ -26,16 +26,22 @@ module XeroRuby::PayrollNz
     PERCENTAGE_OF_GROSS_EARNINGS ||= "PercentageOfGrossEarnings".freeze
     NO_ACCRUALS ||= "NoAccruals".freeze
     
-    # The number of hours accrued for the leave annually. This is 0 when the scheduleOfAccrual chosen is \"OnHourWorked\"
-    attr_accessor :hours_accrued_annually
+    # The number of units accrued for the leave annually. This is 0 when the ScheduleOfAccrual chosen is \"NoAccruals\"
+    attr_accessor :units_accrued_annually
     
-    # The maximum number of hours that can be accrued for the leave
+    # The type of units accrued for the leave annually
+    attr_accessor :type_of_units_to_accrue
+    
+    # The maximum number of units that can be accrued for the leave
     attr_accessor :maximum_to_accrue
     
-    # 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
     attr_accessor :opening_balance
     
-    # 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\"
+    # The type of units for the opening balance
+    attr_accessor :opening_balance_type_of_units
+    
+    # not supported in Payroll NZ
     attr_accessor :rate_accrued_hourly
     
     # Specific for scheduleOfAccrual having percentage of gross earnings. Identifies how much percentage of gross earnings is accrued per pay period.
@@ -80,9 +86,11 @@ module XeroRuby::PayrollNz
       {
         :'leave_type_id' => :'leaveTypeID',
         :'schedule_of_accrual' => :'scheduleOfAccrual',
-        :'hours_accrued_annually' => :'hoursAccruedAnnually',
+        :'units_accrued_annually' => :'unitsAccruedAnnually',
+        :'type_of_units_to_accrue' => :'typeOfUnitsToAccrue',
         :'maximum_to_accrue' => :'maximumToAccrue',
         :'opening_balance' => :'openingBalance',
+        :'opening_balance_type_of_units' => :'openingBalanceTypeOfUnits',
         :'rate_accrued_hourly' => :'rateAccruedHourly',
         :'percentage_of_gross_earnings' => :'percentageOfGrossEarnings',
         :'include_holiday_pay_every_pay' => :'includeHolidayPayEveryPay',
@@ -97,9 +105,11 @@ module XeroRuby::PayrollNz
       {
         :'leave_type_id' => :'String',
         :'schedule_of_accrual' => :'String',
-        :'hours_accrued_annually' => :'BigDecimal',
+        :'units_accrued_annually' => :'BigDecimal',
+        :'type_of_units_to_accrue' => :'String',
         :'maximum_to_accrue' => :'BigDecimal',
         :'opening_balance' => :'BigDecimal',
+        :'opening_balance_type_of_units' => :'String',
         :'rate_accrued_hourly' => :'BigDecimal',
         :'percentage_of_gross_earnings' => :'BigDecimal',
         :'include_holiday_pay_every_pay' => :'Boolean',
@@ -132,8 +142,12 @@ module XeroRuby::PayrollNz
         self.schedule_of_accrual = attributes[:'schedule_of_accrual']
       end
 
-      if attributes.key?(:'hours_accrued_annually')
-        self.hours_accrued_annually = attributes[:'hours_accrued_annually']
+      if attributes.key?(:'units_accrued_annually')
+        self.units_accrued_annually = attributes[:'units_accrued_annually']
+      end
+
+      if attributes.key?(:'type_of_units_to_accrue')
+        self.type_of_units_to_accrue = attributes[:'type_of_units_to_accrue']
       end
 
       if attributes.key?(:'maximum_to_accrue')
@@ -144,6 +158,10 @@ module XeroRuby::PayrollNz
         self.opening_balance = attributes[:'opening_balance']
       end
 
+      if attributes.key?(:'opening_balance_type_of_units')
+        self.opening_balance_type_of_units = attributes[:'opening_balance_type_of_units']
+      end
+
       if attributes.key?(:'rate_accrued_hourly')
         self.rate_accrued_hourly = attributes[:'rate_accrued_hourly']
       end
@@ -201,9 +219,11 @@ module XeroRuby::PayrollNz
       self.class == o.class &&
           leave_type_id == o.leave_type_id &&
           schedule_of_accrual == o.schedule_of_accrual &&
-          hours_accrued_annually == o.hours_accrued_annually &&
+          units_accrued_annually == o.units_accrued_annually &&
+          type_of_units_to_accrue == o.type_of_units_to_accrue &&
           maximum_to_accrue == o.maximum_to_accrue &&
           opening_balance == o.opening_balance &&
+          opening_balance_type_of_units == o.opening_balance_type_of_units &&
           rate_accrued_hourly == o.rate_accrued_hourly &&
           percentage_of_gross_earnings == o.percentage_of_gross_earnings &&
           include_holiday_pay_every_pay == o.include_holiday_pay_every_pay &&
@@ -221,7 +241,7 @@ module XeroRuby::PayrollNz
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [leave_type_id, schedule_of_accrual, hours_accrued_annually, maximum_to_accrue, opening_balance, rate_accrued_hourly, percentage_of_gross_earnings, include_holiday_pay_every_pay, show_annual_leave_in_advance, annual_leave_total_amount_paid, schedule_of_accrual_date].hash
+      [leave_type_id, schedule_of_accrual, units_accrued_annually, type_of_units_to_accrue, maximum_to_accrue, opening_balance, opening_balance_type_of_units, rate_accrued_hourly, percentage_of_gross_earnings, include_holiday_pay_every_pay, show_annual_leave_in_advance, annual_leave_total_amount_paid, schedule_of_accrual_date].hash
     end
 
     # Builds the object from hash

data/lib/xero-ruby/models/payroll_nz/employee_pay_template.rb

@@ -68,12 +68,17 @@ module XeroRuby::PayrollNz
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if @earning_templates.nil?
+        invalid_properties.push('invalid value for "earning_templates", earning_templates cannot be nil.')
+      end
+
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if @earning_templates.nil?
       true
     end
 

data/lib/xero-ruby/models/payroll_nz/employment.rb

@@ -93,12 +93,27 @@ module XeroRuby::PayrollNz
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if @payroll_calendar_id.nil?
+        invalid_properties.push('invalid value for "payroll_calendar_id", payroll_calendar_id cannot be nil.')
+      end
+
+      if @start_date.nil?
+        invalid_properties.push('invalid value for "start_date", start_date cannot be nil.')
+      end
+
+      if @engagement_type.nil?
+        invalid_properties.push('invalid value for "engagement_type", engagement_type cannot be nil.')
+      end
+
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if @payroll_calendar_id.nil?
+      return false if @start_date.nil?
+      return false if @engagement_type.nil?
       true
     end
 

data/lib/xero-ruby/models/payroll_nz/leave_period.rb

@@ -25,10 +25,20 @@ module XeroRuby::PayrollNz
     # The Number of Units for the leave
     attr_accessor :number_of_units
     
-    # Period Status
+    # The number of units taken for the leave
+    attr_accessor :number_of_units_taken
+    
+    # The type of units paid for the leave
+    attr_accessor :type_of_units
+    
+    # The type of units taken for the leave
+    attr_accessor :type_of_units_taken
+    
+    # Status of leave
     attr_accessor :period_status
     APPROVED ||= "Approved".freeze
     COMPLETED ||= "Completed".freeze
+    ESTIMATED ||= "Estimated".freeze
     
     class EnumAttributeValidator
       attr_reader :datatype
@@ -58,6 +68,9 @@ module XeroRuby::PayrollNz
         :'period_start_date' => :'periodStartDate',
         :'period_end_date' => :'periodEndDate',
         :'number_of_units' => :'numberOfUnits',
+        :'number_of_units_taken' => :'numberOfUnitsTaken',
+        :'type_of_units' => :'typeOfUnits',
+        :'type_of_units_taken' => :'typeOfUnitsTaken',
         :'period_status' => :'periodStatus'
       }
     end
@@ -68,6 +81,9 @@ module XeroRuby::PayrollNz
         :'period_start_date' => :'Date',
         :'period_end_date' => :'Date',
         :'number_of_units' => :'BigDecimal',
+        :'number_of_units_taken' => :'Float',
+        :'type_of_units' => :'String',
+        :'type_of_units_taken' => :'String',
         :'period_status' => :'String'
       }
     end
@@ -99,6 +115,18 @@ module XeroRuby::PayrollNz
         self.number_of_units = attributes[:'number_of_units']
       end
 
+      if attributes.key?(:'number_of_units_taken')
+        self.number_of_units_taken = attributes[:'number_of_units_taken']
+      end
+
+      if attributes.key?(:'type_of_units')
+        self.type_of_units = attributes[:'type_of_units']
+      end
+
+      if attributes.key?(:'type_of_units_taken')
+        self.type_of_units_taken = attributes[:'type_of_units_taken']
+      end
+
       if attributes.key?(:'period_status')
         self.period_status = attributes[:'period_status']
       end
@@ -114,7 +142,7 @@ module XeroRuby::PayrollNz
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      period_status_validator = EnumAttributeValidator.new('String', ["Approved", "Completed"])
+      period_status_validator = EnumAttributeValidator.new('String', ["Approved", "Completed", "Estimated"])
       return false unless period_status_validator.valid?(@period_status)
       true
     end
@@ -122,7 +150,7 @@ module XeroRuby::PayrollNz
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] period_status Object to be assigned
     def period_status=(period_status)
-      validator = EnumAttributeValidator.new('String', ["Approved", "Completed"])
+      validator = EnumAttributeValidator.new('String', ["Approved", "Completed", "Estimated"])
       unless validator.valid?(period_status)
         fail ArgumentError, "invalid value for \"period_status\", must be one of #{validator.allowable_values}."
       end
@@ -137,6 +165,9 @@ module XeroRuby::PayrollNz
           period_start_date == o.period_start_date &&
           period_end_date == o.period_end_date &&
           number_of_units == o.number_of_units &&
+          number_of_units_taken == o.number_of_units_taken &&
+          type_of_units == o.type_of_units &&
+          type_of_units_taken == o.type_of_units_taken &&
           period_status == o.period_status
     end
 
@@ -149,7 +180,7 @@ module XeroRuby::PayrollNz
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [period_start_date, period_end_date, number_of_units, period_status].hash
+      [period_start_date, period_end_date, number_of_units, number_of_units_taken, type_of_units, type_of_units_taken, period_status].hash
     end
 
     # Builds the object from hash