Skip to content

Commit 488cee8

Browse files
author
sangeet-joy_xero
committed
resolved merge conflicts
2 parents d5b537f + 913ebe6 commit 488cee8

39 files changed

Lines changed: 1359 additions & 177 deletions

‎Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
xero-ruby (9.3.0)
4+
xero-ruby (11.1.0)
55
faraday (>= 2.0, < 3.0)
66
json (~> 2.1, >= 2.1.0)
77
json-jwt (~> 1.16, >= 1.16.3)

‎docs/accounting/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4193,7 +4193,7 @@
41934193
"Class" : {
41944194
"type" : "string",
41954195
"description" : "Organisation Classes describe which plan the Xero organisation is on (e.g. DEMO, TRIAL, PREMIUM)",
4196-
"enum" : [ "DEMO", "TRIAL", "STARTER", "STANDARD", "PREMIUM", "PREMIUM_20", "PREMIUM_50", "PREMIUM_100", "LEDGER", "GST_CASHBOOK", "NON_GST_CASHBOOK", "ULTIMATE", "LITE", "ULTIMATE_10", "ULTIMATE_20", "ULTIMATE_50", "ULTIMATE_100", "IGNITE", "GROW", "COMPREHENSIVE" ]
4196+
"enum" : [ "DEMO", "TRIAL", "STARTER", "STANDARD", "PREMIUM", "PREMIUM_20", "PREMIUM_50", "PREMIUM_100", "LEDGER", "GST_CASHBOOK", "NON_GST_CASHBOOK", "ULTIMATE", "LITE", "ULTIMATE_10", "ULTIMATE_20", "ULTIMATE_50", "ULTIMATE_100", "IGNITE", "GROW", "COMPREHENSIVE", "SIMPLE" ]
41974197
},
41984198
"Edition" : {
41994199
"type" : "string",
@@ -6339,7 +6339,7 @@
63396339
<nav id="scrollingNav">
63406340
<ul class="sidenav nav nav-list">
63416341
<li class="nav-header" data-group="Accounting"><strong>SDK: </strong><span id='sdk-name'></span></li>
6342-
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>9.3.0</li>
6342+
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>11.1.0</li>
63436343
<li class="nav-header" data-group="Accounting"><a href="#api-Accounting">Methods</a></li>
63446344
<li data-group="Accounting" data-name="createAccount" class="">
63456345
<a href="#api-Accounting-createAccount">createAccount</a>

‎docs/app_store/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@
12411241
<nav id="scrollingNav">
12421242
<ul class="sidenav nav nav-list">
12431243
<li class="nav-header" data-group="AppStore"><strong>SDK: </strong><span id='sdk-name'></span></li>
1244-
<li class="nav-header" data-group="AppStore"><strong>VSN: </strong>9.3.0</li>
1244+
<li class="nav-header" data-group="AppStore"><strong>VSN: </strong>11.1.0</li>
12451245
<li class="nav-header" data-group="AppStore"><a href="#api-AppStore">Methods</a></li>
12461246
<li data-group="AppStore" data-name="getSubscription" class="">
12471247
<a href="#api-AppStore-getSubscription">getSubscription</a>

‎docs/assets/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@
13921392
<nav id="scrollingNav">
13931393
<ul class="sidenav nav nav-list">
13941394
<li class="nav-header" data-group="Asset"><strong>SDK: </strong><span id='sdk-name'></span></li>
1395-
<li class="nav-header" data-group="Asset"><strong>VSN: </strong>9.3.0</li>
1395+
<li class="nav-header" data-group="Asset"><strong>VSN: </strong>11.1.0</li>
13961396
<li class="nav-header" data-group="Asset"><a href="#api-Asset">Methods</a></li>
13971397
<li data-group="Asset" data-name="createAsset" class="">
13981398
<a href="#api-Asset-createAsset">createAsset</a>

‎docs/files/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@
11701170
<nav id="scrollingNav">
11711171
<ul class="sidenav nav nav-list">
11721172
<li class="nav-header" data-group="Files"><strong>SDK: </strong><span id='sdk-name'></span></li>
1173-
<li class="nav-header" data-group="Files"><strong>VSN: </strong>9.3.0</li>
1173+
<li class="nav-header" data-group="Files"><strong>VSN: </strong>11.1.0</li>
11741174
<li class="nav-header" data-group="Files"><a href="#api-Files">Methods</a></li>
11751175
<li data-group="Files" data-name="createFileAssociation" class="">
11761176
<a href="#api-Files-createFileAssociation">createFileAssociation</a>

‎docs/finance/CurrentStatementResponse.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
99
**start_balance** | **BigDecimal** | Looking at the most recent bank statement, this field indicates the balance before the transactions on the statement are applied (note, this is not always populated by the bank in every single instance (~10%)). | [optional]
1010
**end_balance** | **BigDecimal** | Looking at the most recent bank statement, this field indicates the balance after the transactions on the statement are applied (note, this is not always populated by the bank in every single instance (~10%)). | [optional]
1111
**imported_date_time_utc** | **DateTime** | Looking at the most recent bank statement, this field indicates when the document was imported into Xero. This date is represented in ISO 8601 format. | [optional]
12-
**import_source_type** | **String** | Looking at the most recent bank statement, this field indicates the source of the data (direct bank feed, indirect bank feed, file upload, or manual keying). | [optional]
12+
**import_source_type** | **String** | Looking at the most recent bank statement, this field indicates the source of the data (direct bank feed, file upload, or manual keying). | [optional]
1313

1414
## Code Sample
1515

‎docs/finance/DataSourceResponse.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
77
**direct_bank_feed** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was a direct bank feed in to Xero via an API integration. This could be from a bank or aggregator. This gives an indication on the certainty of correctness of the data. | [optional]
8-
**indirect_bank_feed** | **BigDecimal** | No longer in use. | [optional]
98
**file_upload** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data. | [optional]
109
**manual** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was manually input in to Xero. This gives an indication on the certainty of correctness of the data. | [optional]
1110
**direct_bank_feed_pos** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was a direct bank feed in to Xero via an API integration. This could be from a bank or aggregator. This gives an indication on the certainty of correctness of the data. Only positive transactions are included. | [optional]
12-
**indirect_bank_feed_pos** | **BigDecimal** | No longer in use. | [optional]
1311
**file_upload_pos** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data. Only positive transactions are included. | [optional]
1412
**manual_pos** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was manually input in to Xero. This gives an indication on the certainty of correctness of the data. Only positive transactions are included. | [optional]
1513
**direct_bank_feed_neg** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was a direct bank feed in to Xero via an API integration. This could be from a bank or aggregator. This gives an indication on the certainty of correctness of the data. Only negative transactions are included. | [optional]
16-
**indirect_bank_feed_neg** | **BigDecimal** | No longer in use. | [optional]
1714
**file_upload_neg** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data. Only negative transactions are included. | [optional]
1815
**manual_neg** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was manually input in to Xero. This gives an indication on the certainty of correctness of the data. Only negative transactions are included. | [optional]
1916
**other_pos** | **BigDecimal** | Sum of the amounts of all statement lines where the source of the data was unknown. This gives an indication on the certainty of correctness of the data. Only positive transactions are included. | [optional]
@@ -26,15 +23,12 @@ Name | Type | Description | Notes
2623
require 'XeroRuby::Finance'
2724

2825
instance = XeroRuby::Finance::DataSourceResponse.new(direct_bank_feed: null,
29-
indirect_bank_feed: null,
3026
file_upload: null,
3127
manual: null,
3228
direct_bank_feed_pos: null,
33-
indirect_bank_feed_pos: null,
3429
file_upload_pos: null,
3530
manual_pos: null,
3631
direct_bank_feed_neg: null,
37-
indirect_bank_feed_neg: null,
3832
file_upload_neg: null,
3933
manual_neg: null,
4034
other_pos: null,

‎docs/finance/index.html‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,7 @@
15171517
},
15181518
"importSourceType" : {
15191519
"type" : "string",
1520-
"description" : "Looking at the most recent bank statement, this field indicates the source of the data (direct bank feed, indirect bank feed, file upload, or manual keying)."
1520+
"description" : "Looking at the most recent bank statement, this field indicates the source of the data (direct bank feed, file upload, or manual keying)."
15211521
}
15221522
},
15231523
"additionalProperties" : false,
@@ -1533,13 +1533,6 @@
15331533
"format" : "double",
15341534
"x-is-money" : true
15351535
},
1536-
"indirectBankFeed" : {
1537-
"type" : "number",
1538-
"description" : "No longer in use.",
1539-
"format" : "double",
1540-
"deprecated" : true,
1541-
"x-is-money" : true
1542-
},
15431536
"fileUpload" : {
15441537
"type" : "number",
15451538
"description" : "Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data.",
@@ -1558,13 +1551,6 @@
15581551
"format" : "double",
15591552
"x-is-money" : true
15601553
},
1561-
"indirectBankFeedPos" : {
1562-
"type" : "number",
1563-
"description" : "No longer in use.",
1564-
"format" : "double",
1565-
"deprecated" : true,
1566-
"x-is-money" : true
1567-
},
15681554
"fileUploadPos" : {
15691555
"type" : "number",
15701556
"description" : "Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data. Only positive transactions are included.",
@@ -1583,13 +1569,6 @@
15831569
"format" : "double",
15841570
"x-is-money" : true
15851571
},
1586-
"indirectBankFeedNeg" : {
1587-
"type" : "number",
1588-
"description" : "No longer in use.",
1589-
"format" : "double",
1590-
"deprecated" : true,
1591-
"x-is-money" : true
1592-
},
15931572
"fileUploadNeg" : {
15941573
"type" : "number",
15951574
"description" : "Sum of the amounts of all statement lines where the source of the data was a file manually uploaded in to Xero. This gives an indication on the certainty of correctness of the data. Only negative transactions are included.",
@@ -2737,7 +2716,7 @@
27372716
<nav id="scrollingNav">
27382717
<ul class="sidenav nav nav-list">
27392718
<li class="nav-header" data-group="Finance"><strong>SDK: </strong><span id='sdk-name'></span></li>
2740-
<li class="nav-header" data-group="Finance"><strong>VSN: </strong>9.3.0</li>
2719+
<li class="nav-header" data-group="Finance"><strong>VSN: </strong>11.1.0</li>
27412720
<li class="nav-header" data-group="Finance"><a href="#api-Finance">Methods</a></li>
27422721
<li data-group="Finance" data-name="getAccountingActivityAccountUsage" class="">
27432722
<a href="#api-Finance-getAccountingActivityAccountUsage">getAccountingActivityAccountUsage</a>

‎docs/payroll_au/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3412,7 +3412,7 @@
34123412
<nav id="scrollingNav">
34133413
<ul class="sidenav nav nav-list">
34143414
<li class="nav-header" data-group="PayrollAu"><strong>SDK: </strong><span id='sdk-name'></span></li>
3415-
<li class="nav-header" data-group="PayrollAu"><strong>VSN: </strong>9.3.0</li>
3415+
<li class="nav-header" data-group="PayrollAu"><strong>VSN: </strong>11.1.0</li>
34163416
<li class="nav-header" data-group="PayrollAu"><a href="#api-PayrollAu">Methods</a></li>
34173417
<li data-group="PayrollAu" data-name="approveLeaveApplication" class="">
34183418
<a href="#api-PayrollAu-approveLeaveApplication">approveLeaveApplication</a>

‎docs/payroll_nz/EmployeeLeaveSetup.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ Name | Type | Description | Notes
88
**holiday_pay_opening_balance** | **BigDecimal** | Initial holiday pay balance. A percentage — usually 8% — of gross earnings since their last work anniversary. | [optional]
99
**annual_leave_opening_balance** | **BigDecimal** | Initial annual leave balance. The balance at their last anniversary, less any leave taken since then and excluding accrued annual leave. | [optional]
1010
**negative_annual_leave_balance_paid_amount** | **BigDecimal** | The dollar value of annual leave opening balance if negative. | [optional]
11-
**sick_leave_hours_to_accrue_annually** | **BigDecimal** | Number of hours accrued annually for sick leave. Multiply the number of days they&#39;re entitled to by the hours worked per day | [optional]
12-
**sick_leave_maximum_hours_to_accrue** | **BigDecimal** | Maximum number of hours accrued annually for sick leave. Multiply the maximum days they can accrue by the hours worked per day | [optional]
11+
**sick_leave_hours_to_accrue_annually** | **BigDecimal** | Deprecated use SickLeaveToAccrueAnnually | [optional]
12+
**sick_leave_maximum_hours_to_accrue** | **BigDecimal** | Deprecated use SickLeaveMaximumToAccrue | [optional]
13+
**sick_leave_to_accrue_annually** | **BigDecimal** | Number of units accrued annually for sick leave. The type of units is determined by the property \&quot;TypeOfUnitsToAccrue\&quot; on the \&quot;Sick Leave\&quot; leave type | [optional]
14+
**sick_leave_maximum_to_accrue** | **BigDecimal** | Maximum number of units accrued annually for sick leave. The type of units is determined by the property \&quot;TypeOfUnitsToAccrue\&quot; on the \&quot;Sick Leave\&quot; leave type | [optional]
1315
**sick_leave_opening_balance** | **BigDecimal** | Initial sick leave balance. This will be positive unless they&#39;ve taken sick leave in advance | [optional]
1416
**sick_leave_schedule_of_accrual** | **String** | Set Schedule of Accrual Type for Sick Leave | [optional]
15-
**sick_leave_anniversary_date** | **Date** | If Sick Leave Schedule of Accrual is \&quot;OnAnniversaryDate\&quot;, this is the date when entitled to Sick Leave | [optional]
17+
**sick_leave_anniversary_date** | **Date** | If Sick Leave Schedule of Accrual is \&quot;OnAnniversaryDate\&quot;, this is the date when entitled to Sick Leave. When null the Employee&#39;s start date is used as the anniversary date | [optional]
18+
**annual_leave_anniversary_date** | **Date** | The first date the employee will accrue Annual Leave. When null the Employee&#39;s start date is used as the anniversary date | [optional]
1619

1720
## Code Sample
1821

@@ -25,9 +28,12 @@ instance = XeroRuby::PayrollNz::EmployeeLeaveSetup.new(include_holiday_pay: fals
2528
negative_annual_leave_balance_paid_amount: 10.0,
2629
sick_leave_hours_to_accrue_annually: 100.5,
2730
sick_leave_maximum_hours_to_accrue: 200.5,
31+
sick_leave_to_accrue_annually: 100.5,
32+
sick_leave_maximum_to_accrue: 200.5,
2833
sick_leave_opening_balance: 10.5,
2934
sick_leave_schedule_of_accrual: OnAnniversaryDate,
30-
sick_leave_anniversary_date: Sun Jan 19 00:00:00 GMT 2020)
35+
sick_leave_anniversary_date: Sun Jan 19 00:00:00 GMT 2020,
36+
annual_leave_anniversary_date: Sun Jan 19 00:00:00 GMT 2020)
3137
```
3238

3339

0 commit comments

Comments
 (0)