SDK-550

ipp-java-qbapihelper/pom.xml

@@ -21,10 +21,10 @@
     <parent>
         <artifactId>ipp-v3-java-devkit-pom</artifactId>
         <groupId>com.intuit.quickbooks-online</groupId>
-        <version>2.9.3</version>
+        <version>2.9.4</version>
     </parent>
   <artifactId>ipp-java-qbapihelper</artifactId>
-  <version>2.9.3</version>
+  <version>2.9.4</version>
   <packaging>jar</packaging>
   <name>Quickbooks API Helper for Oauth</name>
   <description>Quickbooks API Helper Project for OAuth, Disconnect and Reconnect</description>

ipp-v3-java-data/pom.xml

@@ -4,13 +4,13 @@
 	<parent>
 		<groupId>com.intuit.quickbooks-online</groupId>
 		<artifactId>ipp-v3-java-devkit-pom</artifactId>
-		<version>2.9.3</version>
+		<version>2.9.4</version>
 	</parent>
 
 	<artifactId>ipp-v3-java-data</artifactId>
 	<name>IPP V3 Java - Data Project</name>
 	<description>IPP Java V3 DevKit Data project - FMS Entities generation</description>
-    <version>2.9.3</version>
+    <version>2.9.4</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

ipp-v3-java-devkit-assembly/pom.xml

@@ -15,17 +15,17 @@
   <parent>
     <groupId>com.intuit.quickbooks-online</groupId>
     <artifactId>ipp-v3-java-devkit-pom</artifactId>
-    <version>2.9.3</version>
+    <version>2.9.4</version>
   </parent>
 
   <artifactId>ipp-v3-java-devkit-assembly</artifactId>
   <packaging>pom</packaging>
   <name>IPP Java Devkit Assembly (${project.version})</name>
   <description>IPP Java V3 DevKit assembly</description>
-  <version>2.9.3</version>
+  <version>2.9.4</version>
   <properties>
-      <release.devkit.version>2.9.3</release.devkit.version>
-      <release.data.version>2.9.3</release.data.version>
+      <release.devkit.version>2.9.4</release.devkit.version>
+      <release.data.version>2.9.4</release.data.version>
   </properties>
   <dependencies>
     <!-- Main artifacts -->

ipp-v3-java-devkit-shaded-assembly/pom.xml

@@ -15,17 +15,17 @@
   <parent>
     <groupId>com.intuit.quickbooks-online</groupId>
     <artifactId>ipp-v3-java-devkit-pom</artifactId>
-    <version>2.9.2</version>
+    <version>2.9.4</version>
   </parent>
 
   <artifactId>ipp-v3-java-devkit-shaded-assembly</artifactId>
   <packaging>pom</packaging>
   <name>IPP Java Devkit Assembly Shaded (${project.version})</name>
   <description>IPP Java V3 DevKit assembly</description>
-  <version>2.9.3</version>
+  <version>2.9.4</version>
   <properties>
-      <release.devkit.version>2.9.3</release.devkit.version>
-      <release.data.version>2.9.3</release.data.version>
+      <release.devkit.version>2.9.4</release.devkit.version>
+      <release.data.version>2.9.4</release.data.version>
   </properties>
   <dependencies>
     <!-- Main artifacts -->

ipp-v3-java-devkit/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <artifactId>ipp-v3-java-devkit-pom</artifactId>
         <groupId>com.intuit.quickbooks-online</groupId>
-        <version>2.9.3</version>
+        <version>2.9.4</version>
     </parent>
 
 	<artifactId>ipp-v3-java-devkit</artifactId>
-	<version>2.9.3</version>
+	<version>2.9.4</version>
 	<packaging>jar</packaging>
 	<name>IPP V3 Java Devkit - Development Project</name>
 	<description>IPP Java V3 DevKit Project - Core</description>
@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>com.intuit.quickbooks-online</groupId>
 			<artifactId>ipp-v3-java-data</artifactId>
-			<version>2.9.3</version>
+			<version>2.9.4</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java

@@ -438,7 +438,45 @@ private boolean isKeyValueExpected(String key) {
                 || key.equals(RequestElements.REPORT_PARAM_AGING_PERIOD)
                 || key.equals(RequestElements.REPORT_PARAM_NUM_PERIOD)
                 || key.equals(RequestElements.REPORT_PARAM_REPORT_DT)
-                || key.equals(RequestElements.REPORT_PARAM_COLUMNS);
+                || key.equals(RequestElements.REPORT_PARAM_COLUMNS)
+                || key.equals(RequestElements.REPORT_PARAM_ACCOUNT)
+        		|| key.equals(RequestElements.REPORT_PARAM_ACCOUNT_TYPE)
+        		|| key.equals(RequestElements.REPORT_PARAM_SOURCE_ACCOUNT_TYPE)
+        		|| key.equals(RequestElements.REPORT_PARAM_SORT_BY)
+        		|| key.equals(RequestElements.REPORT_PARAM_SORT_ORDER)
+        		|| key.equals(RequestElements.REPORT_PARAM_SOURCE_ACCOUNT)
+        		|| key.equals(RequestElements.REPORT_PARAM_PAYMENT_METHOD)
+        		|| key.equals(RequestElements.REPORT_PARAM_START_DUE_DT)
+        		|| key.equals(RequestElements.REPORT_PARAM_END_DUE_DT)
+        		|| key.equals(RequestElements.REPORT_PARAM_APPAID)
+        		|| key.equals(RequestElements.REPORT_PARAM_ARPAID)
+        		|| key.equals(RequestElements.REPORT_PARAM_BOTH_AMT)
+        		|| key.equals(RequestElements.REPORT_PARAM_CLEARED)
+        		|| key.equals(RequestElements.REPORT_PARAM_CREATE_DT_MACRO)
+        		|| key.equals(RequestElements.REPORT_PARAM_DOC_NUM)
+        		|| key.equals(RequestElements.REPORT_PARAM_DUE_DT_MACRO)
+        		|| key.equals(RequestElements.REPORT_PARAM_GROUP_BY)
+        		|| key.equals(RequestElements.REPORT_PARAM_MEMO)
+        		|| key.equals(RequestElements.REPORT_PARAM_MOD_DT_MACRO)
+        		|| key.equals(RequestElements.REPORT_PARAM_NAME)
+        		|| key.equals(RequestElements.REPORT_PARAM_PRINTED)
+        		|| key.equals(RequestElements.REPORT_PARAM_END_MOD_DT)
+        		|| key.equals(RequestElements.REPORT_PARAM_START_MOD_DT)
+        		|| key.equals(RequestElements.REPORT_PARAM_TERM)
+        		|| key.equals(RequestElements.REPORT_PARAM_TRANSACTION_TYPE)
+        		|| key.equals(RequestElements.REPORT_PARAM_AGING_METHOD)
+        		|| key.equals(RequestElements.REPORT_PARAM_PAST_DUE)
+        		|| key.equals(RequestElements.REPORT_PARAM_CREATE_DT_MACRO)
+        		|| key.equals(RequestElements.REPORT_PARAM_END_CREATED_DT)
+        		|| key.equals(RequestElements.REPORT_PARAM_START_CREATED_DT)
+        		|| key.equals(RequestElements.REPORT_PARAM_JOURNAL_CODE)
+        		|| key.equals(RequestElements.REPORT_PARAM_EMPLOYEE)
+        		|| key.equals(RequestElements.REPORT_PARAM_AGENCY_ID)
+        		|| key.equals(RequestElements.REPORT_PARAM_CUSTOM1)
+        		|| key.equals(RequestElements.REPORT_PARAM_CUSTOM2)
+        		|| key.equals(RequestElements.REPORT_PARAM_CUSTOM3)
+        		|| key.equals(RequestElements.REPORT_PARAM_SHIPVIA)
+        		|| key.equals(RequestElements.REPORT_PARAM_ACCOUNT_STATUS);
     }
 
     /**

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/RequestElements.java

@@ -119,11 +119,11 @@ public class RequestElements {
     /**
      * variable REPORT_PARAM_END_CREATED_DT
      */
-    public static final String REPORT_PARAM_END_CREATED_DT = "end_createddate";
+    public static final String REPORT_PARAM_END_CREATED_DT = "end_createdate";
     /**
      * variable REPORT_PARAM_START_CREATED_DT
      */
-    public static final String REPORT_PARAM_START_CREATED_DT = "start_createddate";
+    public static final String REPORT_PARAM_START_CREATED_DT = "start_createdate";
 
     /**
 	 * variable REPORT_PARAM_DT_MACRO
@@ -347,6 +347,22 @@ public class RequestElements {
      * Vendor,Employee,Location,Payment Method,Day,Week,Month,Quarter,Year,None
      */
     public static final String REPORT_PARAM_GROUP_BY = "group_by";
+
+    public static final String REPORT_PARAM_JOURNAL_CODE = "journal_code";
+
+    public static final String REPORT_PARAM_EMPLOYEE = "employee";
+
+    public static final String REPORT_PARAM_AGENCY_ID = "agency_id";
+
+    public static final String REPORT_PARAM_CUSTOM1 = "custom1";
+
+    public static final String REPORT_PARAM_CUSTOM2 = "custom2";
+
+    public static final String REPORT_PARAM_CUSTOM3 = "custom3";
+
+    public static final String REPORT_PARAM_SHIPVIA = "shipvia";
+
+    public static final String REPORT_PARAM_ACCOUNT_STATUS = "account_status";
 
     /**
 	 * variable REQ_PARAM_ENTITIES

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/services/ReportService.java

@@ -242,6 +242,22 @@ public class ReportService {
      * variable doc_num
      */
     private  String doc_num = null;
+
+    private  String journal_code = null;
+
+    private  String employee = null;
+
+    private  String agency_id = null;
+
+    private  String custom1 = null;
+
+    private  String custom2 = null;
+
+    private  String custom3 = null;
+
+    private  String shipvia = null;
+
+    private  String account_status = null;
 
 
 
@@ -483,6 +499,38 @@ private IntuitMessage prepareReport(String reportName) throws FMSException {
         {
             requestParameters.put(RequestElements.REPORT_PARAM_DOC_NUM, getDoc_num());
         }
+        if (getJournal_code() != null)
+        {
+            requestParameters.put(RequestElements.REPORT_PARAM_JOURNAL_CODE, getJournal_code());
+        }
+        if (getEmployee() != null)
+        {
+            requestParameters.put(RequestElements.REPORT_PARAM_EMPLOYEE, getEmployee());
+        }
+        if (getAgency_id() != null)
+        {
+            requestParameters.put(RequestElements.REPORT_PARAM_AGENCY_ID, getAgency_id());
+        }
+        if (getCustom1() != null)
+        {
+            requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM1, getCustom1());
+        }
+        if (getCustom2() != null)
+        {
+            requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM2, getCustom2());
+        }
+        if (getCustom3() != null)
+        {
+            requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM3, getCustom3());
+        }
+        if (getShipvia() != null)
+        {
+            requestParameters.put(RequestElements.REPORT_PARAM_SHIPVIA, getShipvia());
+        }
+        if (getAccount_status() != null)
+        {
+            requestParameters.put(RequestElements.REPORT_PARAM_ACCOUNT_STATUS, getAccount_status());
+        }
 
 
 			requestElements.setAction(OperationType.REPORTS.toString() + "/" + reportName);
@@ -1059,4 +1107,70 @@ public String getDoc_num() {
     public void setDoc_num(String doc_num) {
         this.doc_num = doc_num;
     }
+
+	public String getJournal_code() {
+		return journal_code;
+	}
+
+	public void setJournal_code(String journal_code) {
+		this.journal_code = journal_code;
+	}
+
+	public String getEmployee() {
+		return employee;
+	}
+
+	public void setEmployee(String employee) {
+		this.employee = employee;
+	}
+
+	public String getAgency_id() {
+		return agency_id;
+	}
+
+	public void setAgency_id(String agency_id) {
+		this.agency_id = agency_id;
+	}
+
+	public String getCustom1() {
+		return custom1;
+	}
+
+	public void setCustom1(String custom1) {
+		this.custom1 = custom1;
+	}
+
+	public String getCustom2() {
+		return custom2;
+	}
+
+	public void setCustom2(String custom2) {
+		this.custom2 = custom2;
+	}
+
+	public String getCustom3() {
+		return custom3;
+	}
+
+	public void setCustom3(String custom3) {
+		this.custom3 = custom3;
+	}
+
+	public String getShipvia() {
+		return shipvia;
+	}
+
+	public void setShipvia(String shipvia) {
+		this.shipvia = shipvia;
+	}
+
+	public String getAccount_status() {
+		return account_status;
+	}
+
+	public void setAccount_status(String account_status) {
+		this.account_status = account_status;
+	}
+
+
 }

ipp-v3-java-devkit/src/main/resources/ippdevkit.properties

@@ -2,7 +2,7 @@
 
 ## Devkit Version
 # This version has to be updated according to the pom version
-version = 2.9.3
+version = 2.9.4
 
 # This is to have the request source to be sent to IDS request header
 request.source = V3JavaSDK

ipp-v3-java-devkit/src/test/resources/ippdevkit.properties

@@ -1,7 +1,7 @@
 ### IPP Dev Kit helper properties
 
 ## Devkit version
-version = 2.9.3
+version = 2.9.4
 
 # This is to have the request source to be sent to IDS request header
 request.source = V3JavaSDK

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.intuit.quickbooks-online</groupId>
     <artifactId>ipp-v3-java-devkit-pom</artifactId>
-    <version>2.9.3</version>
+    <version>2.9.4</version>
     <packaging>pom</packaging>
     <name>IPP V3 Java DevKit</name>
     <url>https://github.com/intuit/QuickBooks-V3-Java-SDK</url>