Merge pull request DeBortoliWines#38 from gjvoosten/odoo-compatibility-fixes

@gjvoosten great thanks for this PR

Author: flotho

src/main/java/com/debortoliwines/odoo/api/ObjectAdapter.java

@@ -586,10 +586,9 @@ private static String getFieldNameForImport(Field field) {
      * @throws OdooApiException
      */
     public boolean importData(RowCollection rows) throws OdooApiException, XmlRpcException {
-        //TODO : Check the way importdata are handled in v8/v9/
-        // Workaround. Odoo7 bug where old and new rows can't be sent
+        // Workaround: old and new rows can't be sent together
         // together using the import_data or load function
-        if (this.serverVersion.getMajor() >= 7 && this.serverVersion.getMinor() == 0) {
+        if (this.serverVersion.getMajor() >= 7) {
             RowCollection newRows = new RowCollection();
             RowCollection oldRows = new RowCollection();
 
@@ -647,8 +646,8 @@ private void importDataV7(RowCollection rows, Object[][] importRows) throws XmlR
 
         String[] targetFieldList = getFieldListForImport(rows.get(0).getFields());
 
-        // Workaround Odoo V7 bug. Remove the .id field for new rows.
-        if (this.serverVersion.getMinor() == 0 && !rows.isEmpty() && rows.get(0).getID() == 0) {
+        // Remove the .id field for new rows.
+        if (this.serverVersion.getMajor() >= 7 && !rows.isEmpty() && rows.get(0).getID() == 0) {
             String[] newTargetFieldList = new String[targetFieldList.length - 1];
             for (int i = 1; i < targetFieldList.length; i++) {
                 newTargetFieldList[i - 1] = targetFieldList[i];

src/main/java/com/debortoliwines/odoo/api/OdooCommand.java

@@ -53,7 +53,7 @@ public OdooCommand(Session session) {
      * @return Response that need to be parsed from the calling method to check
      * if successful and then adapt the result as an array.
      */
-    public Response searchObject(String objectName, Object[] filter) {
+    public Response searchObject(String objectName, Object[] filter) throws XmlRpcException {
         return (Response) searchObject(objectName, filter, -1, -1, null, false);
     }
 
@@ -72,11 +72,14 @@ public Response searchObject(String objectName, Object[] filter) {
      * returned and could be parsed as Object[] of IDs if response is
      * successfull
      */
-    public Response searchObject(String objectName, Object[] filter, int offset, int limit, String order, boolean count) {
+    public Response searchObject(String objectName, Object[] filter, int offset, int limit, String order, boolean count) throws XmlRpcException {
         Object offsetParam = offset < 0 ? false : offset;
         Object limitParam = limit < 0 ? false : limit;
         Object orderParam = order == null || order.length() == 0 ? false : order;
-        Object[] params = new Object[]{filter, offsetParam, limitParam, orderParam, count};
+        // Before Odoo 10 there's a 'context' parameter between order and count
+        Object[] params = (this.session.getServerVersion().getMajor() < 10)
+                ? new Object[]{filter, offsetParam, limitParam, orderParam, false, count}
+                : new Object[]{filter, offsetParam, limitParam, orderParam, count};
 
         try {
             Response response = new Response(session.executeCommand(objectName, "search", params));
@@ -97,7 +100,7 @@ public Response searchObject(String objectName, Object[] filter, int offset, int
     @SuppressWarnings("unchecked")
     public Map<String, Object> getFields(String objectName, String[] filterFields) throws XmlRpcException {
         Map<String, Object> fieldsArray;
-        if (this.session.getServerVersion().getMajor() >= 10 ) {
+        if (this.session.getServerVersion().getMajor() >= 8 ) {
             fieldsArray = (Map<String, Object>) session.executeCommand(objectName, "fields_get",
                     new Object[]{filterFields});
         } else {
@@ -120,7 +123,7 @@ public Map<String, Object> getFields(String objectName, String[] filterFields) t
      */
     public Object[] readObject(String objectName, Object[] ids, String[] fields) throws XmlRpcException {
         Object[] readResult ;
-        if (this.session.getServerVersion().getMajor() >= 10 ) {
+        if (this.session.getServerVersion().getMajor() >= 8 ) {
             readResult = (Object[]) session.executeCommand(objectName, "read", new Object[]{ids, fields});
         } else {
             readResult = (Object[]) session.executeCommand(objectName, "read", new Object[]{ids, fields, session.getContext()});
@@ -200,7 +203,7 @@ public boolean unlinkObject(String objectName, Object[] ids) throws XmlRpcExcept
      */
     public Object createObject(String objectName, Map<String, Object> values) throws XmlRpcException {
         Object readResult ;
-        if (this.session.getServerVersion().getMajor() >= 10 ) {
+        if (this.session.getServerVersion().getMajor() >= 8 ) {
             readResult = (Object) session.executeCommand(objectName, "create", new Object[]{values});
         } else {
             readResult = (Object) session.executeCommand(objectName, "create", new Object[]{values, session.getContext()});

src/main/java/com/debortoliwines/odoo/api/Session.java

@@ -49,6 +49,7 @@ public class Session {
     private RPCProtocol protocol;
 
     private OdooXmlRpcProxy objectClient;
+    private Version serverVersion;
 
     /**
      * *
@@ -266,7 +267,11 @@ public void executeWorkflow(final String objectName, final String signal, final
      * @throws XmlRpcException
      */
     public Version getServerVersion() throws XmlRpcException {
-        return OdooXmlRpcProxy.getServerVersion(protocol, host, port);
+        if (serverVersion == null) {
+            // Cache server version
+            serverVersion = OdooXmlRpcProxy.getServerVersion(protocol, host, port);
+        }
+        return serverVersion;
     }
 
     /**