Additional Params for Reports

Merge PR and bump version to 0.6.3

Author: SidneyAllen

README.md

@@ -16,7 +16,7 @@ Add this dependency and repository to your POM.xml
     <dependency>
 	  <groupId>com.xero</groupId>
 	  <artifactId>xero-java-sdk</artifactId>
-	  <version>0.6.2</version>
+	  <version>0.6.3</version>
 	</dependency>
 
     <repositories>
@@ -157,7 +157,7 @@ TokenStorage storage = new TokenStorage();
 storage.save(response,requestToken.getAll());
 
 //Build the Authorization URL and redirect User
-OAuthAuthorizeToken authToken = new OAuthAuthorizeToken(requestToken.getTempToken());
+OAuthAuthorizeToken authToken = new OAuthAuthorizeToken(config,requestToken.getTempToken());
 response.sendRedirect(authToken.getAuthUrl());	
 ```
 

pom.xml

@@ -2,9 +2,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.xero</groupId>
-	<artifactId>xero-java-sdk-appfw-mods</artifactId>
+	<artifactId>xero-java-sdk</artifactId>
 	<packaging>jar</packaging>
-	<version>0.6.2</version>
+	<version>0.6.3</version>
 	<name>Xero-Java SDK</name>
 	<url>http://maven.apache.org</url>
 	<dependencies>

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

@@ -106,7 +106,7 @@ public String getAccessTokenUrl() {
 
   @Override
   public String getUserAgent() {
-    return USER_AGENT + " [Xero-Java-0.6.2]";
+    return USER_AGENT + " [Xero-Java-0.6.3]";
   }
 
   @Override

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

@@ -1593,6 +1593,25 @@ public Report getReportBalanceSheet(String where,
         return singleResult(get("reports/BalanceSheet", null, params).getReports().getReport());
     }
 
+    public Report getReportBalanceSheet(String where,
+                                        String order,
+                                        String date,
+                                        String trackingOptionId1,
+                                        String trackingOptionId2,
+                                        boolean standardLayout,
+                                        boolean paymentsOnly) throws IOException {
+        Map<String, String> params = new HashMap<>();
+        addToMapIfNotNull(params, "where", where);
+        addToMapIfNotNull(params, "order", order);
+        addToMapIfNotNull(params, "date", date);
+        addToMapIfNotNull(params, "trackingOptionID1", trackingOptionId1);
+        addToMapIfNotNull(params, "trackingOptionID2", trackingOptionId2);
+        addToMapIfNotNull(params, "standardLayout", standardLayout);
+        addToMapIfNotNull(params, "paymentsOnly", paymentsOnly);
+        return singleResult(get("reports/BalanceSheet", null, params).getReports().getReport());
+    }
+
+
     public Report getReportBankStatement(String accountId, String where, String order, String fromDate, String toDate)
         throws IOException {
         Map<String, String> params = new HashMap<>();
@@ -1623,6 +1642,30 @@ public Report getExecutiveSummary(String where, String order, String date) throw
         return singleResult(get("reports/ExecutiveSummary", null, params).getReports().getReport());
     }
 
+    public Report getReportProfitLoss(String where,
+                                      String order,
+                                      String fromDate,
+                                      String toDate,
+                                      String trackingCategoryId,
+                                      String trackingOptionId1,
+                                      String trackingCategoryId2,
+                                      String trackingOptionId2,
+                                      boolean standardLayout,
+                                      boolean paymentsOnly) throws IOException {
+        Map<String, String> params = new HashMap<>();
+        addToMapIfNotNull(params, "where", where);
+        addToMapIfNotNull(params, "order", order);
+        addToMapIfNotNull(params, "fromDate", fromDate);
+        addToMapIfNotNull(params, "toDate", toDate);
+        addToMapIfNotNull(params, "trackingCategoryID", trackingCategoryId);
+        addToMapIfNotNull(params, "trackingOptionID1", trackingOptionId1);
+        addToMapIfNotNull(params, "trackingCategoryID2", trackingCategoryId2);
+        addToMapIfNotNull(params, "trackingOptionID2", trackingOptionId2);
+        addToMapIfNotNull(params, "standardLayout", standardLayout);
+        addToMapIfNotNull(params, "paymentsOnly", paymentsOnly);
+        return singleResult(get("reports/ProfitAndLoss", null, params).getReports().getReport());
+    }
+
     public Report getReportProfitLoss(String where,
                                       String order,
                                       String fromDate,