0019923: Image type fields should adapt itself to the defined rowspan and colspan

diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
@@ -27,6 +27,12 @@
 
 isc.OBImageItemSmallImageContainer.addProperties({
   imageItem: null,
+  initWidget: function() {
+    if (this.initWidgetStyle) {
+      this.initWidgetStyle();
+    }
+    this.Super('initWidget', arguments);
+  },
   click: function () {
     var imageId = this.imageItem.getValue();
     if (!imageId) {
diff --git a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
@@ -462,10 +462,21 @@
 
 isc.OBImageItemSmallImageContainer.addProperties({
   styleName: 'OBFormFieldImageInput',
-  height: 66,
+  height: 21,
   width: '100%',
   align: 'center',
-  defaultLayoutAlign: 'center'
+  defaultLayoutAlign: 'center',
+  initWidgetStyle: function () {
+	//To adapt the height this code is used because the automatic height doesn't fill empty rows.
+    var rowSpan = 1;
+    var singleRowHeight = this.getHeight();
+    var multipleRowHeight = singleRowHeight + 24; // 24px = title height + form item padding defined in CSS
+    if (this.imageItem.rowSpan) {
+      rowSpan = this.imageItem.rowSpan;
+    }
+    var newHeight = singleRowHeight + (rowSpan - 1) * multipleRowHeight;
+    this.setHeight(newHeight);
+  }
 });
 
 isc.OBImageItemSmallImage.addProperties({