Skip to content

Commit 08818ef

Browse files
committed
Fixed tracking for ManualJournal Line items
Added missing TrackingOptionId and Option string
1 parent 49d852f commit 08818ef

5 files changed

Lines changed: 57 additions & 9 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.github.xeroapi</groupId>
55
<artifactId>xero-java</artifactId>
66
<packaging>jar</packaging>
7-
<version>2.3.1</version>
7+
<version>2.3.2</version>
88
<name>Xero-Java SDK</name>
99
<description>This is the official Java SDK for Xero API</description>
1010
<url>https://github.com/XeroAPI/Xero-Java</url>

src/main/java/com/xero/api/JsonConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
public class JsonConfig implements Config {
1717

18-
private String SDK_VERSION = "2.3.1";
18+
private String SDK_VERSION = "2.3.2";
1919
private String APP_TYPE = "Public";
2020
private String USER_AGENT = "Xero-Java-SDK";
2121
private String ACCEPT = "application/xml";

src/main/java/com/xero/models/accounting/Error.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ public Error addElementsItem(Element elementsItem) {
115115
}
116116

117117
/**
118-
* Arry of Elements of validation Errors
118+
* Array of Elements of validation Errors
119119
* @return elements
120120
**/
121-
@ApiModelProperty(value = "Arry of Elements of validation Errors")
121+
@ApiModelProperty(value = "Array of Elements of validation Errors")
122122
public List<Element> getElements() {
123123
return elements;
124124
}

src/main/java/com/xero/models/accounting/TaxComponent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ public TaxComponent isCompound(Boolean isCompound) {
8686
}
8787

8888
/**
89-
* Boolean to describe if Tax rate is compounded.
89+
* Boolean to describe if Tax rate is compounded
9090
* @return isCompound
9191
**/
92-
@ApiModelProperty(value = "Boolean to describe if Tax rate is compounded.")
92+
@ApiModelProperty(value = "Boolean to describe if Tax rate is compounded")
9393
public Boolean getIsCompound() {
9494
return isCompound;
9595
}

src/main/java/com/xero/models/accounting/TrackingCategory.java

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,17 @@ public class TrackingCategory {
3737
private UUID trackingCategoryID;
3838

3939

40+
@JsonProperty("TrackingOptionID")
41+
private UUID trackingOptionID;
42+
43+
4044
@JsonProperty("Name")
4145
private String name;
4246

47+
48+
@JsonProperty("Option")
49+
private String option;
50+
4351
/**
4452
* The status of a tracking category
4553
*/
@@ -89,10 +97,10 @@ public TrackingCategory trackingCategoryID(UUID trackingCategoryID) {
8997
}
9098

9199
/**
92-
* The Xero identifier for a tracking categorye.g. 297c2dc5-cc47-4afd-8ec8-74990b8761e9
100+
* The Xero identifier for a tracking category e.g. 297c2dc5-cc47-4afd-8ec8-74990b8761e9
93101
* @return trackingCategoryID
94102
**/
95-
@ApiModelProperty(value = "The Xero identifier for a tracking categorye.g. 297c2dc5-cc47-4afd-8ec8-74990b8761e9")
103+
@ApiModelProperty(value = "The Xero identifier for a tracking category e.g. 297c2dc5-cc47-4afd-8ec8-74990b8761e9")
96104
public UUID getTrackingCategoryID() {
97105
return trackingCategoryID;
98106
}
@@ -101,6 +109,24 @@ public void setTrackingCategoryID(UUID trackingCategoryID) {
101109
this.trackingCategoryID = trackingCategoryID;
102110
}
103111

112+
public TrackingCategory trackingOptionID(UUID trackingOptionID) {
113+
this.trackingOptionID = trackingOptionID;
114+
return this;
115+
}
116+
117+
/**
118+
* The Xero identifier for a tracking option e.g. dc54c220-0140-495a-b925-3246adc0075f
119+
* @return trackingOptionID
120+
**/
121+
@ApiModelProperty(value = "The Xero identifier for a tracking option e.g. dc54c220-0140-495a-b925-3246adc0075f")
122+
public UUID getTrackingOptionID() {
123+
return trackingOptionID;
124+
}
125+
126+
public void setTrackingOptionID(UUID trackingOptionID) {
127+
this.trackingOptionID = trackingOptionID;
128+
}
129+
104130
public TrackingCategory name(String name) {
105131
this.name = name;
106132
return this;
@@ -119,6 +145,24 @@ public void setName(String name) {
119145
this.name = name;
120146
}
121147

148+
public TrackingCategory option(String option) {
149+
this.option = option;
150+
return this;
151+
}
152+
153+
/**
154+
* The option name of the tracking option e.g. East, West (max length &#x3D; 100)
155+
* @return option
156+
**/
157+
@ApiModelProperty(value = "The option name of the tracking option e.g. East, West (max length = 100)")
158+
public String getOption() {
159+
return option;
160+
}
161+
162+
public void setOption(String option) {
163+
this.option = option;
164+
}
165+
122166
public TrackingCategory status(StatusEnum status) {
123167
this.status = status;
124168
return this;
@@ -174,14 +218,16 @@ public boolean equals(java.lang.Object o) {
174218
}
175219
TrackingCategory trackingCategory = (TrackingCategory) o;
176220
return Objects.equals(this.trackingCategoryID, trackingCategory.trackingCategoryID) &&
221+
Objects.equals(this.trackingOptionID, trackingCategory.trackingOptionID) &&
177222
Objects.equals(this.name, trackingCategory.name) &&
223+
Objects.equals(this.option, trackingCategory.option) &&
178224
Objects.equals(this.status, trackingCategory.status) &&
179225
Objects.equals(this.options, trackingCategory.options);
180226
}
181227

182228
@Override
183229
public int hashCode() {
184-
return Objects.hash(trackingCategoryID, name, status, options);
230+
return Objects.hash(trackingCategoryID, trackingOptionID, name, option, status, options);
185231
}
186232

187233

@@ -191,7 +237,9 @@ public String toString() {
191237
sb.append("class TrackingCategory {\n");
192238

193239
sb.append(" trackingCategoryID: ").append(toIndentedString(trackingCategoryID)).append("\n");
240+
sb.append(" trackingOptionID: ").append(toIndentedString(trackingOptionID)).append("\n");
194241
sb.append(" name: ").append(toIndentedString(name)).append("\n");
242+
sb.append(" option: ").append(toIndentedString(option)).append("\n");
195243
sb.append(" status: ").append(toIndentedString(status)).append("\n");
196244
sb.append(" options: ").append(toIndentedString(options)).append("\n");
197245
sb.append("}");

0 commit comments

Comments
 (0)