details: https://code.openbravo.com/erp/devel/pi/rev/3f735afe096f
changeset: 13303:3f735afe096f
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Jul 27 13:18:42 2011 +0200
summary: Add optional colspan & rowspan to ad_field
Can be used to define multi-column & multi-row fields.
Only available for defining workspace widgets in a form layout.
diffstat:
modules/org.openbravo.client.application/src-db/database/model/modifiedTables/AD_FIELD.xml
| 13 +
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
| 14 ++
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
| 68 ++++++++++
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
| 26 +++
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
| 54 +++++++
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
| 6 +
6 files changed, 181 insertions(+), 0 deletions(-)
diffs (257 lines):
diff -r 3a620590bef8 -r 3f735afe096f
modules/org.openbravo.client.application/src-db/database/model/modifiedTables/AD_FIELD.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/src-db/database/model/modifiedTables/AD_FIELD.xml
Wed Jul 27 13:18:42 2011 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+ <database name="MODIFIED TABLE AD_FIELD">
+ <table name="AD_FIELD" primaryKey="AD_FIELD_KEY">
+ <column name="EM_OBUIAPP_COLSPAN" primaryKey="false" required="false"
type="DECIMAL" size="10,0" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="EM_OBUIAPP_ROWSPAN" primaryKey="false" required="false"
type="DECIMAL" size="10,0" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ </table>
+ </database>
diff -r 3a620590bef8 -r 3f735afe096f
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
Wed Jul 27 13:18:42 2011 +0200
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--FF8080813166DC99013166E9DC1A0007--><AD_AUXILIARINPUT>
+<!--FF8080813166DC99013166E9DC1A0007-->
<AD_AUXILIARINPUT_ID><![CDATA[FF8080813166DC99013166E9DC1A0007]]></AD_AUXILIARINPUT_ID>
+<!--FF8080813166DC99013166E9DC1A0007-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080813166DC99013166E9DC1A0007--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080813166DC99013166E9DC1A0007--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080813166DC99013166E9DC1A0007--> <AD_TAB_ID><![CDATA[107]]></AD_TAB_ID>
+<!--FF8080813166DC99013166E9DC1A0007-->
<NAME><![CDATA[OBUIAPP_Field_Reference]]></NAME>
+<!--FF8080813166DC99013166E9DC1A0007--> <CODE><![CDATA[@SQL=SELECT
AD_REFERENCE_ID FROM AD_COLUMN WHERE AD_COLUMN_ID = @AD_COLUMN_ID@]]></CODE>
+<!--FF8080813166DC99013166E9DC1A0007-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080813166DC99013166E9DC1A0007--></AD_AUXILIARINPUT>
+
+</data>
diff -r 3a620590bef8 -r 3f735afe096f
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
Wed Jul 27 12:42:25 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
Wed Jul 27 13:18:42 2011 +0200
@@ -274,6 +274,40 @@
<!--182023ADC5294B6C87123A6AF98F567D-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--182023ADC5294B6C87123A6AF98F567D--></AD_COLUMN>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--><AD_COLUMN>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<AD_COLUMN_ID><![CDATA[1A96C47A27AC49D7BEA41E57BBD59948]]></AD_COLUMN_ID>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<NAME><![CDATA[EM_Obuiapp_Rowspan]]></NAME>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <DESCRIPTION><![CDATA[Number of rows
this field should occupy in the form]]></DESCRIPTION>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <HELP><![CDATA[This value can be used
to define, multi-row fields. So fields occupying more then one row. If this
value is not set the normal calculation takes place.]]></HELP>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<COLUMNNAME><![CDATA[EM_Obuiapp_Rowspan]]></COLUMNNAME>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<AD_TABLE_ID><![CDATA[107]]></AD_TABLE_ID>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <SEQNO><![CDATA[91]]></SEQNO>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <VALUEMIN><![CDATA[1]]></VALUEMIN>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<AD_ELEMENT_ID><![CDATA[EAC4A032E1AF4EFBBCBE5C8355EDDE74]]></AD_ELEMENT_ID>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <POSITION><![CDATA[34]]></POSITION>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1A96C47A27AC49D7BEA41E57BBD59948--></AD_COLUMN>
+
<!--1B597CE339F946A49442957168C854F6--><AD_COLUMN>
<!--1B597CE339F946A49442957168C854F6-->
<AD_COLUMN_ID><![CDATA[1B597CE339F946A49442957168C854F6]]></AD_COLUMN_ID>
<!--1B597CE339F946A49442957168C854F6-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3456,6 +3490,40 @@
<!--AE6A4E222AFC4431A26E7C35B693C498-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--AE6A4E222AFC4431A26E7C35B693C498--></AD_COLUMN>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--><AD_COLUMN>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<AD_COLUMN_ID><![CDATA[B2DDC4BECBF24431AB1940C2A38F9C54]]></AD_COLUMN_ID>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<NAME><![CDATA[EM_Obuiapp_Colspan]]></NAME>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <DESCRIPTION><![CDATA[Number of
columns this field should occupy in the form]]></DESCRIPTION>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <HELP><![CDATA[This value can be used
to define, multi-columns fields. So fields occupying more then one column. If
this value is not set the normal calculation takes place.]]></HELP>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<COLUMNNAME><![CDATA[EM_Obuiapp_Colspan]]></COLUMNNAME>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<AD_TABLE_ID><![CDATA[107]]></AD_TABLE_ID>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <SEQNO><![CDATA[81]]></SEQNO>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <VALUEMIN><![CDATA[1]]></VALUEMIN>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<AD_ELEMENT_ID><![CDATA[B7BB240B9AA74817AFD7B8C2602B1CAD]]></AD_ELEMENT_ID>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <POSITION><![CDATA[33]]></POSITION>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54--></AD_COLUMN>
+
<!--B4A0F6DE4916418DBA13952F481594FE--><AD_COLUMN>
<!--B4A0F6DE4916418DBA13952F481594FE-->
<AD_COLUMN_ID><![CDATA[B4A0F6DE4916418DBA13952F481594FE]]></AD_COLUMN_ID>
<!--B4A0F6DE4916418DBA13952F481594FE-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 3a620590bef8 -r 3f735afe096f
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
Wed Jul 27 12:42:25 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
Wed Jul 27 13:18:42 2011 +0200
@@ -189,6 +189,19 @@
<!--970F01C5451937C3E040007F01002163-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--970F01C5451937C3E040007F01002163--></AD_ELEMENT>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD--><AD_ELEMENT>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD-->
<AD_ELEMENT_ID><![CDATA[B7BB240B9AA74817AFD7B8C2602B1CAD]]></AD_ELEMENT_ID>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD-->
<COLUMNNAME><![CDATA[EM_Obuiapp_Colspan]]></COLUMNNAME>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD--> <NAME><![CDATA[Colspan]]></NAME>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD-->
<PRINTNAME><![CDATA[Colspan]]></PRINTNAME>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD--> <DESCRIPTION><![CDATA[Number of
columns this field should occupy in the form]]></DESCRIPTION>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD--> <HELP><![CDATA[This value can be used
to define, multi-columns fields. So fields occupying more then one column. If
this value is not set the normal calculation takes place.]]></HELP>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD--></AD_ELEMENT>
+
<!--BAF19AAC391C420E9BA1E54641D563D9--><AD_ELEMENT>
<!--BAF19AAC391C420E9BA1E54641D563D9-->
<AD_ELEMENT_ID><![CDATA[BAF19AAC391C420E9BA1E54641D563D9]]></AD_ELEMENT_ID>
<!--BAF19AAC391C420E9BA1E54641D563D9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -213,6 +226,19 @@
<!--D407F5CD8D234F738D98EDB872F9377A-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--D407F5CD8D234F738D98EDB872F9377A--></AD_ELEMENT>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--><AD_ELEMENT>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->
<AD_ELEMENT_ID><![CDATA[EAC4A032E1AF4EFBBCBE5C8355EDDE74]]></AD_ELEMENT_ID>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->
<COLUMNNAME><![CDATA[EM_Obuiapp_Rowspan]]></COLUMNNAME>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--> <NAME><![CDATA[Rowspan]]></NAME>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->
<PRINTNAME><![CDATA[Rowspan]]></PRINTNAME>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--> <DESCRIPTION><![CDATA[Number of rows
this field should occupy in the form]]></DESCRIPTION>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--> <HELP><![CDATA[This value can be used
to define, multi-row fields. So fields occupying more then one row. If this
value is not set the normal calculation takes place.]]></HELP>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--></AD_ELEMENT>
+
<!--FC093F3F9DD64F81828FE06AB2CC4FEB--><AD_ELEMENT>
<!--FC093F3F9DD64F81828FE06AB2CC4FEB-->
<AD_ELEMENT_ID><![CDATA[FC093F3F9DD64F81828FE06AB2CC4FEB]]></AD_ELEMENT_ID>
<!--FC093F3F9DD64F81828FE06AB2CC4FEB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 3a620590bef8 -r 3f735afe096f
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
Wed Jul 27 12:42:25 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
Wed Jul 27 13:18:42 2011 +0200
@@ -692,6 +692,33 @@
<!--85530CF66AD44D82B88C6707767A6529-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
<!--85530CF66AD44D82B88C6707767A6529--></AD_FIELD>
+<!--87DDE03149A94326BE55DC158625D244--><AD_FIELD>
+<!--87DDE03149A94326BE55DC158625D244-->
<AD_FIELD_ID><![CDATA[87DDE03149A94326BE55DC158625D244]]></AD_FIELD_ID>
+<!--87DDE03149A94326BE55DC158625D244-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--87DDE03149A94326BE55DC158625D244--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--87DDE03149A94326BE55DC158625D244--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--87DDE03149A94326BE55DC158625D244--> <NAME><![CDATA[Colspan]]></NAME>
+<!--87DDE03149A94326BE55DC158625D244--> <DESCRIPTION><![CDATA[Number of
columns this field should occupy in the form]]></DESCRIPTION>
+<!--87DDE03149A94326BE55DC158625D244--> <HELP><![CDATA[This value can be used
to define, multi-columns fields. So fields occupying more then one column. If
this value is not set the normal calculation takes place.]]></HELP>
+<!--87DDE03149A94326BE55DC158625D244-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--87DDE03149A94326BE55DC158625D244--> <AD_TAB_ID><![CDATA[107]]></AD_TAB_ID>
+<!--87DDE03149A94326BE55DC158625D244-->
<AD_COLUMN_ID><![CDATA[B2DDC4BECBF24431AB1940C2A38F9C54]]></AD_COLUMN_ID>
+<!--87DDE03149A94326BE55DC158625D244-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--87DDE03149A94326BE55DC158625D244-->
<DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ =
'FF8080813123BF670131241C2BB30012']]></DISPLAYLOGIC>
+<!--87DDE03149A94326BE55DC158625D244-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--87DDE03149A94326BE55DC158625D244--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--87DDE03149A94326BE55DC158625D244--> <SEQNO><![CDATA[62]]></SEQNO>
+<!--87DDE03149A94326BE55DC158625D244--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--87DDE03149A94326BE55DC158625D244-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--87DDE03149A94326BE55DC158625D244-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--87DDE03149A94326BE55DC158625D244-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--87DDE03149A94326BE55DC158625D244-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--87DDE03149A94326BE55DC158625D244-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--87DDE03149A94326BE55DC158625D244-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--87DDE03149A94326BE55DC158625D244-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--87DDE03149A94326BE55DC158625D244-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--87DDE03149A94326BE55DC158625D244--></AD_FIELD>
+
<!--9496136E2E3243B49310D44322956431--><AD_FIELD>
<!--9496136E2E3243B49310D44322956431-->
<AD_FIELD_ID><![CDATA[9496136E2E3243B49310D44322956431]]></AD_FIELD_ID>
<!--9496136E2E3243B49310D44322956431-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -981,6 +1008,33 @@
<!--B4B8B0DFD8064FA78844A3A25DB39C0A-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
<!--B4B8B0DFD8064FA78844A3A25DB39C0A--></AD_FIELD>
+<!--B79252A201AA41C091F9498DF820A0AC--><AD_FIELD>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<AD_FIELD_ID><![CDATA[B79252A201AA41C091F9498DF820A0AC]]></AD_FIELD_ID>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B79252A201AA41C091F9498DF820A0AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B79252A201AA41C091F9498DF820A0AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B79252A201AA41C091F9498DF820A0AC--> <NAME><![CDATA[Rowspan]]></NAME>
+<!--B79252A201AA41C091F9498DF820A0AC--> <DESCRIPTION><![CDATA[Number of rows
this field should occupy in the form]]></DESCRIPTION>
+<!--B79252A201AA41C091F9498DF820A0AC--> <HELP><![CDATA[This value can be used
to define, multi-row fields. So fields occupying more then one row. If this
value is not set the normal calculation takes place.]]></HELP>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B79252A201AA41C091F9498DF820A0AC--> <AD_TAB_ID><![CDATA[107]]></AD_TAB_ID>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<AD_COLUMN_ID><![CDATA[1A96C47A27AC49D7BEA41E57BBD59948]]></AD_COLUMN_ID>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ =
'FF8080813123BF670131241C2BB30012']]></DISPLAYLOGIC>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--B79252A201AA41C091F9498DF820A0AC--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B79252A201AA41C091F9498DF820A0AC--> <SEQNO><![CDATA[64]]></SEQNO>
+<!--B79252A201AA41C091F9498DF820A0AC--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B79252A201AA41C091F9498DF820A0AC--></AD_FIELD>
+
<!--BC4ED490B0A64E6294A673747414B095--><AD_FIELD>
<!--BC4ED490B0A64E6294A673747414B095-->
<AD_FIELD_ID><![CDATA[BC4ED490B0A64E6294A673747414B095]]></AD_FIELD_ID>
<!--BC4ED490B0A64E6294A673747414B095-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 3a620590bef8 -r 3f735afe096f
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
Wed Jul 27 12:42:25 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
Wed Jul 27 13:18:42 2011 +0200
@@ -627,6 +627,9 @@
}
public long getColSpan() {
+ if (field.getObuiappColspan() != null) {
+ return field.getObuiappColspan();
+ }
return field.getDisplayedLength() > ONE_COLUMN_MAX_LENGTH
|| (getRowSpan() == 2 &&
!property.getDomainType().getReference().getId()
.equals(IMAGEBLOB_AD_REFERENCE_ID)) ? 2 : 1;
@@ -637,6 +640,9 @@
}
public long getRowSpan() {
+ if (field.getObuiappRowspan() != null) {
+ return field.getObuiappRowspan();
+ }
if
(property.getDomainType().getReference().getId().equals(TEXT_AD_REFERENCE_ID)) {
return 2;
}
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
