Skip to content

Commit 23da784

Browse files
RettBehrensRettBehrens
committed
resolves conflicts
2 parents 920347a + d243195 commit 23da784

File tree

16 files changed

+486
-10
lines changed

16 files changed

+486
-10
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,4 @@ xeroapi-sdk-codegen/
113113
# test specific configuration files
114114
/tests/oauth2_client.py
115115
/tests/oauth2_token.py
116+
.build_notes.md

‎docs/v1/accounting/index.html‎

Lines changed: 280 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,6 +1801,7 @@
18011801
"x-is-msdate-time" : true
18021802
},
18031803
"BudgetLines" : {
1804+
<<<<<<< HEAD
18041805
"type" : "array",
18051806
"items" : {
18061807
"$ref" : "#/components/schemas/BudgetLine"
@@ -1811,14 +1812,24 @@
18111812
"items" : {
18121813
"$ref" : "#/components/schemas/TrackingCategory"
18131814
}
1815+
=======
1816+
"$ref" : "#/components/schemas/BudgetLines"
1817+
},
1818+
"Tracking" : {
1819+
"$ref" : "#/components/schemas/TrackingCategory"
1820+
>>>>>>> master
18141821
}
18151822
},
18161823
"description" : "",
18171824
"externalDocs" : {
18181825
"url" : "http://developer.xero.com/documentation/api/budgets/"
18191826
}
18201827
};
1828+
<<<<<<< HEAD
18211829
defs["BudgetBalance"] = {
1830+
=======
1831+
defs["BudgetLines"] = {
1832+
>>>>>>> master
18221833
"title" : "",
18231834
"type" : "object",
18241835
"properties" : {
@@ -1841,6 +1852,7 @@
18411852
"description" : "Any footnotes associated with this balance"
18421853
}
18431854
},
1855+
<<<<<<< HEAD
18441856
"description" : ""
18451857
};
18461858
defs["BudgetLine"] = {
@@ -1864,6 +1876,8 @@
18641876
}
18651877
}
18661878
},
1879+
=======
1880+
>>>>>>> master
18671881
"description" : "",
18681882
"externalDocs" : {
18691883
"url" : "http://developer.xero.com/documentation/api/budgets/"
@@ -5930,7 +5944,11 @@
59305944
<nav id="scrollingNav">
59315945
<ul class="sidenav nav nav-list">
59325946
<li class="nav-header" data-group="Accounting"><strong>SDK: </strong><span id='sdk-name'></span></li>
5947+
<<<<<<< HEAD
59335948
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>1.8.0</li>
5949+
=======
5950+
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>1.7.0</li>
5951+
>>>>>>> master
59345952
<li class="nav-header" data-group="Accounting"><a href="#api-Accounting">Methods</a></li>
59355953
<li data-group="Accounting" data-name="createAccount" class="">
59365954
<a href="#api-Accounting-createAccount">createAccount</a>
@@ -33931,6 +33949,7 @@ <h2>Parameters</h2>
3393133949
<hr>
3393233950
<div id="api-Accounting-getReportBalanceSheet">
3393333951
<article id="api-Accounting-getReportBalanceSheet-0" data-group="User" data-name="getReportBalanceSheet" data-version="0">
33952+
<<<<<<< HEAD
3393433953
<div class="pull-left">
3393533954
<h1>getReportBalanceSheet</h1>
3393633955
<p>Retrieves report for balancesheet</p>
@@ -34322,6 +34341,8 @@ <h2>Parameters</h2>
3432234341
<hr>
3432334342
<div id="api-Accounting-getReportBudgetSummary">
3432434343
<article id="api-Accounting-getReportBudgetSummary-0" data-group="User" data-name="getReportBudgetSummary" data-version="0">
34344+
=======
34345+
>>>>>>> master
3432534346
<div class="pull-left">
3432634347
<h1>getReportBudgetSummary</h1>
3432734348
<p>Retrieves report for budget summary</p>
@@ -34638,6 +34659,265 @@ <h3>Usage and SDK Samples</h3>
3463834659

3463934660
api_client.set_oauth2_token("YOUR_ACCESS_TOKEN")
3464034661

34662+
def accounting_get_report_from_id():
34663+
api_instance = AccountingApi(api_client)
34664+
xero_tenant_id = 'YOUR_XERO_TENANT_ID'
34665+
report_id = '00000000-0000-0000-0000-000000000000'
34666+
34667+
try:
34668+
<<<<<<< HEAD
34669+
api_response = api_instance.get_report_from_id(xero_tenant_id, report_id)
34670+
=======
34671+
api_response = api_instance.get_report_budget_summary(xero_tenant_id, date, periods, time_frame)
34672+
>>>>>>> master
34673+
print(api_response)
34674+
except AccountingBadRequestException as e:
34675+
print("Exception when calling AccountingApi->getReportFromId: %s\n" % e)</code></pre>
34676+
</div>
34677+
</div>
34678+
<h2>Scopes</h2>
34679+
<table>
34680+
34681+
<tr>
34682+
<td>accounting.reports.read</td>
34683+
<td>Grant read-only access to accounting reports</td>
34684+
</tr>
34685+
34686+
</table>
34687+
<h2>Parameters</h2>
34688+
<div class="methodsubtabletitle">Path parameters</div>
34689+
<table id="methodsubtable">
34690+
<tr>
34691+
<th width="150px">Name</th>
34692+
<th>Description</th>
34693+
</tr>
34694+
<tr><td style="width:150px;">ReportID<span style="color:red;">*</span></td>
34695+
<td>
34696+
34697+
34698+
<div id="d2e199_getReportFromId_reportID">
34699+
<div class="json-schema-view">
34700+
<div class="primitive">
34701+
<span class="type">
34702+
String
34703+
</span>
34704+
34705+
<div class="inner description marked">
34706+
Unique identifier for a Report
34707+
</div>
34708+
</div>
34709+
<div class="inner required">
34710+
Required
34711+
</div>
34712+
</div>
34713+
</div>
34714+
</td>
34715+
</tr>
34716+
34717+
</table>
34718+
<<<<<<< HEAD
34719+
=======
34720+
<div class="methodsubtabletitle">Query parameters</div>
34721+
<table id="methodsubtable">
34722+
<tr>
34723+
<th width="150px">Name</th>
34724+
<th>Description</th>
34725+
</tr>
34726+
<tr><td style="width:150px;">date</td>
34727+
<td>
34728+
34729+
34730+
<div id="d2e199_getReportBudgetSummary_date">
34731+
<div class="json-schema-view">
34732+
<div class="primitive">
34733+
<span class="type">
34734+
date
34735+
</span>
34736+
<span class="format">
34737+
(date)
34738+
</span>
34739+
34740+
<div class="inner description marked">
34741+
The date for the Bank Summary report e.g. 2018-03-31
34742+
</div>
34743+
</div>
34744+
</div>
34745+
</div>
34746+
</td>
34747+
</tr>
34748+
34749+
<tr><td style="width:150px;">periods</td>
34750+
<td>
34751+
34752+
34753+
<div id="d2e199_getReportBudgetSummary_periods">
34754+
<div class="json-schema-view">
34755+
<div class="primitive">
34756+
<span class="type">
34757+
Integer
34758+
</span>
34759+
34760+
<div class="inner description marked">
34761+
The number of periods to compare (integer between 1 and 12)
34762+
</div>
34763+
</div>
34764+
</div>
34765+
</div>
34766+
</td>
34767+
</tr>
34768+
34769+
<tr><td style="width:150px;">timeframe</td>
34770+
<td>
34771+
34772+
34773+
<div id="d2e199_getReportBudgetSummary_timeframe">
34774+
<div class="json-schema-view">
34775+
<div class="primitive">
34776+
<span class="type">
34777+
Integer
34778+
</span>
34779+
34780+
<div class="inner description marked">
34781+
The period size to compare to (1=month, 3=quarter, 12=year)
34782+
</div>
34783+
</div>
34784+
</div>
34785+
</div>
34786+
</td>
34787+
</tr>
34788+
34789+
</table>
34790+
</article>
34791+
</div>
34792+
<hr>
34793+
<div id="api-Accounting-getReportExecutiveSummary">
34794+
<article id="api-Accounting-getReportExecutiveSummary-0" data-group="User" data-name="getReportExecutiveSummary" data-version="0">
34795+
<div class="pull-left">
34796+
<h1>getReportExecutiveSummary</h1>
34797+
<p>Retrieves report for executive summary</p>
34798+
</div>
34799+
<div class="pull-right"></div>
34800+
<div class="clearfix"></div>
34801+
<p></p>
34802+
<p class="marked"></p>
34803+
<p></p>
34804+
<br />
34805+
<pre class="prettyprint language-html prettyprinted" data-type="get"><code><span class="pln">/Reports/ExecutiveSummary</span></code></pre>
34806+
<p>
34807+
<h3>Usage and SDK Samples</h3>
34808+
</p>
34809+
<ul class="nav nav-tabs nav-tabs-examples">
34810+
<!-- *****REPLACE***** comment out the other languages <li> -->
34811+
<li class=""><a href="#examples-Accounting-getReportExecutiveSummary-0-python">Python</a></li>
34812+
</ul>
34813+
<div class="tab-content">
34814+
<!-- *****REPLACE***** comment out the other languages tab-pane -->
34815+
<div class="tab-pane" id="examples-Accounting-getReportExecutiveSummary-0-python">
34816+
<pre class="prettyprint"><code class="language-python"># configure api_client for use with xero-python sdk client
34817+
api_client = ApiClient(
34818+
Configuration(
34819+
debug=false,
34820+
oauth2_token=OAuth2Token(
34821+
client_id="YOUR_CLIENT_ID", client_secret="YOUR_CLIENT_SECRET"
34822+
),
34823+
),
34824+
pool_threads=1,
34825+
)
34826+
34827+
api_client.set_oauth2_token("YOUR_ACCESS_TOKEN")
34828+
34829+
def accounting_get_report_executive_summary():
34830+
api_instance = AccountingApi(api_client)
34831+
xero_tenant_id = 'YOUR_XERO_TENANT_ID'
34832+
date = dateutil.parser.parse("2019-03-31")
34833+
34834+
try:
34835+
api_response = api_instance.get_report_executive_summary(xero_tenant_id, date)
34836+
print(api_response)
34837+
except AccountingBadRequestException as e:
34838+
print("Exception when calling AccountingApi->getReportExecutiveSummary: %s\n" % e)</code></pre>
34839+
</div>
34840+
</div>
34841+
<h2>Scopes</h2>
34842+
<table>
34843+
34844+
<tr>
34845+
<td>accounting.reports.read</td>
34846+
<td>Grant read-only access to accounting reports</td>
34847+
</tr>
34848+
34849+
</table>
34850+
<h2>Parameters</h2>
34851+
>>>>>>> master
34852+
<div class="methodsubtabletitle">Header parameters</div>
34853+
<table id="methodsubtable">
34854+
<tr>
34855+
<th width="150px">Name</th>
34856+
<th>Description</th>
34857+
</tr>
34858+
<tr><td style="width:150px;">xero-tenant-id<span style="color:red;">*</span></td>
34859+
<td>
34860+
34861+
34862+
<div id="d2e199_getReportFromId_xeroTenantId">
34863+
<div class="json-schema-view">
34864+
<div class="primitive">
34865+
<span class="type">
34866+
String
34867+
</span>
34868+
34869+
<div class="inner description marked">
34870+
Xero identifier for Tenant
34871+
</div>
34872+
</div>
34873+
<div class="inner required">
34874+
Required
34875+
</div>
34876+
</div>
34877+
</div>
34878+
</td>
34879+
</tr>
34880+
34881+
</table>
34882+
</article>
34883+
</div>
34884+
<hr>
34885+
<div id="api-Accounting-getReportFromId">
34886+
<article id="api-Accounting-getReportFromId-0" data-group="User" data-name="getReportFromId" data-version="0">
34887+
<div class="pull-left">
34888+
<h1>getReportFromId</h1>
34889+
<p>Retrieves a specific report using a unique ReportID</p>
34890+
</div>
34891+
<div class="pull-right"></div>
34892+
<div class="clearfix"></div>
34893+
<p></p>
34894+
<p class="marked"></p>
34895+
<p></p>
34896+
<br />
34897+
<pre class="prettyprint language-html prettyprinted" data-type="get"><code><span class="pln">/Reports/{ReportID}</span></code></pre>
34898+
<p>
34899+
<h3>Usage and SDK Samples</h3>
34900+
</p>
34901+
<ul class="nav nav-tabs nav-tabs-examples">
34902+
<!-- *****REPLACE***** comment out the other languages <li> -->
34903+
<li class=""><a href="#examples-Accounting-getReportFromId-0-python">Python</a></li>
34904+
</ul>
34905+
<div class="tab-content">
34906+
<!-- *****REPLACE***** comment out the other languages tab-pane -->
34907+
<div class="tab-pane" id="examples-Accounting-getReportFromId-0-python">
34908+
<pre class="prettyprint"><code class="language-python"># configure api_client for use with xero-python sdk client
34909+
api_client = ApiClient(
34910+
Configuration(
34911+
debug=false,
34912+
oauth2_token=OAuth2Token(
34913+
client_id="YOUR_CLIENT_ID", client_secret="YOUR_CLIENT_SECRET"
34914+
),
34915+
),
34916+
pool_threads=1,
34917+
)
34918+
34919+
api_client.set_oauth2_token("YOUR_ACCESS_TOKEN")
34920+
3464134921
def accounting_get_report_from_id():
3464234922
api_instance = AccountingApi(api_client)
3464334923
xero_tenant_id = 'YOUR_XERO_TENANT_ID'

‎setup.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,9 @@ def read_file(filename):
4848
keywords="xero python sdk API oAuth",
4949
name="xero_python",
5050
packages=find_packages(include=["xero_python", "xero_python.*"]),
51+
<<<<<<< HEAD
5152
version="1.8.0",
53+
=======
54+
version="1.7.0",
55+
>>>>>>> master
5256
)

‎xero_python/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22

33
__author__ = """Xero Developer API"""
44
__email__ = "[email protected]"
5+
<<<<<<< HEAD
56
__version__ = "1.8.0"
7+
=======
8+
__version__ = "1.7.0"
9+
>>>>>>> master

‎xero_python/accounting/api/accounting_api.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
"""
1111

1212
"""
13+
<<<<<<< HEAD
1314
OpenAPI spec version: 2.13.4
15+
=======
16+
OpenAPI spec version: 2.13.2
17+
>>>>>>> master
1418
"""
1519

1620
import importlib
@@ -26,7 +30,7 @@
2630

2731

2832
class empty:
29-
""" empty object to mark optional parameter not set """
33+
"""empty object to mark optional parameter not set"""
3034

3135

3236
class AccountingApi(object):

0 commit comments

Comments
 (0)