details: https://code.openbravo.com/erp/devel/pi/rev/d936e4752dc9 changeset: 13990:d936e4752dc9 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Oct 14 11:16:01 2011 +0200 summary: Fixed issue 18628. Added a column used to order datasets inside a module.
details: https://code.openbravo.com/erp/devel/pi/rev/47fef1b036b7 changeset: 13991:47fef1b036b7 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Oct 14 11:17:48 2011 +0200 summary: Fixed issue 18418. Added grid fields to the datasource so dates can be parsed correctly. diffstat: modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 5 +- src-db/database/model/tables/AD_DATASET.xml | 4 + src-db/database/sourcedata/AD_COLUMN.xml | 37 +++++++++- src-db/database/sourcedata/AD_FIELD.xml | 28 +++++++ src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql | 4 +- src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql | 2 +- 6 files changed, 75 insertions(+), 5 deletions(-) diffs (161 lines): diff -r bc03ed72e085 -r 47fef1b036b7 modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js --- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js Fri Oct 14 10:37:06 2011 +0200 +++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js Fri Oct 14 11:17:48 2011 +0200 @@ -69,7 +69,10 @@ this.selectorGridFields[i].canFilter = true; } } - + if(!this.dataSource.fields || !this.dataSource.fields.length || this.dataSource.fields.length===0){ + this.dataSource.fields = this.selectorGridFields; + this.dataSource.init(); + } this.selectorGrid = isc.OBGrid.create({ selector: this.selector, diff -r bc03ed72e085 -r 47fef1b036b7 src-db/database/model/tables/AD_DATASET.xml --- a/src-db/database/model/tables/AD_DATASET.xml Fri Oct 14 10:37:06 2011 +0200 +++ b/src-db/database/model/tables/AD_DATASET.xml Fri Oct 14 11:17:48 2011 +0200 @@ -65,6 +65,10 @@ <default/> <onCreateDefault/> </column> + <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="AD_DATASET_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> diff -r bc03ed72e085 -r 47fef1b036b7 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Oct 14 10:37:06 2011 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Oct 14 11:17:48 2011 +0200 @@ -217999,6 +217999,40 @@ <!--3AC29C75D39249F39073F6315334D235--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--3AC29C75D39249F39073F6315334D235--></AD_COLUMN> +<!--3AE62A8262C1481EB0AA36315B026371--><AD_COLUMN> +<!--3AE62A8262C1481EB0AA36315B026371--> <AD_COLUMN_ID><![CDATA[3AE62A8262C1481EB0AA36315B026371]]></AD_COLUMN_ID> +<!--3AE62A8262C1481EB0AA36315B026371--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3AE62A8262C1481EB0AA36315B026371--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3AE62A8262C1481EB0AA36315B026371--> <NAME><![CDATA[Sequence Number]]></NAME> +<!--3AE62A8262C1481EB0AA36315B026371--> <DESCRIPTION><![CDATA[The order of records in a specified document.]]></DESCRIPTION> +<!--3AE62A8262C1481EB0AA36315B026371--> <HELP><![CDATA[The Sequence indicates the order of records]]></HELP> +<!--3AE62A8262C1481EB0AA36315B026371--> <COLUMNNAME><![CDATA[Seqno]]></COLUMNNAME> +<!--3AE62A8262C1481EB0AA36315B026371--> <AD_TABLE_ID><![CDATA[08A203FD84AA412BB38882A1EDDD1A83]]></AD_TABLE_ID> +<!--3AE62A8262C1481EB0AA36315B026371--> <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID> +<!--3AE62A8262C1481EB0AA36315B026371--> <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH> +<!--3AE62A8262C1481EB0AA36315B026371--> <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE(MAX(SEQNO),0)+10 AS DefaultValue FROM AD_DATASET]]></DEFAULTVALUE> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISKEY><![CDATA[N]]></ISKEY> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--3AE62A8262C1481EB0AA36315B026371--> <SEQNO><![CDATA[170]]></SEQNO> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--3AE62A8262C1481EB0AA36315B026371--> <AD_ELEMENT_ID><![CDATA[566]]></AD_ELEMENT_ID> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--3AE62A8262C1481EB0AA36315B026371--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--3AE62A8262C1481EB0AA36315B026371--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--3AE62A8262C1481EB0AA36315B026371--> <POSITION><![CDATA[17]]></POSITION> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--3AE62A8262C1481EB0AA36315B026371--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--3AE62A8262C1481EB0AA36315B026371--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--3AE62A8262C1481EB0AA36315B026371--></AD_COLUMN> + <!--3B0B06935CE4426AB45EA841B598C5CB--><AD_COLUMN> <!--3B0B06935CE4426AB45EA841B598C5CB--> <AD_COLUMN_ID><![CDATA[3B0B06935CE4426AB45EA841B598C5CB]]></AD_COLUMN_ID> <!--3B0B06935CE4426AB45EA841B598C5CB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -233921,6 +233955,7 @@ <!--608CA57238D146F9A5019B1574916FC5--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--608CA57238D146F9A5019B1574916FC5--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--608CA57238D146F9A5019B1574916FC5--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--608CA57238D146F9A5019B1574916FC5--> <POSITION><![CDATA[16]]></POSITION> <!--608CA57238D146F9A5019B1574916FC5--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--608CA57238D146F9A5019B1574916FC5--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--608CA57238D146F9A5019B1574916FC5--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -247543,7 +247578,7 @@ <!--7ED4235BAC474A13B9059BCE003BCAEF--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--7ED4235BAC474A13B9059BCE003BCAEF--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--7ED4235BAC474A13B9059BCE003BCAEF--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--7ED4235BAC474A13B9059BCE003BCAEF--> <POSITION><![CDATA[0]]></POSITION> +<!--7ED4235BAC474A13B9059BCE003BCAEF--> <POSITION><![CDATA[15]]></POSITION> <!--7ED4235BAC474A13B9059BCE003BCAEF--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--7ED4235BAC474A13B9059BCE003BCAEF--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--7ED4235BAC474A13B9059BCE003BCAEF--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r bc03ed72e085 -r 47fef1b036b7 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Fri Oct 14 10:37:06 2011 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Oct 14 11:17:48 2011 +0200 @@ -192379,6 +192379,34 @@ <!--E631ADB38CF6400BA9EC80FA38CABC51--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> <!--E631ADB38CF6400BA9EC80FA38CABC51--></AD_FIELD> +<!--E650C949221B4DB4B75054E6D42685B1--><AD_FIELD> +<!--E650C949221B4DB4B75054E6D42685B1--> <AD_FIELD_ID><![CDATA[E650C949221B4DB4B75054E6D42685B1]]></AD_FIELD_ID> +<!--E650C949221B4DB4B75054E6D42685B1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E650C949221B4DB4B75054E6D42685B1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E650C949221B4DB4B75054E6D42685B1--> <NAME><![CDATA[Sequence Number]]></NAME> +<!--E650C949221B4DB4B75054E6D42685B1--> <DESCRIPTION><![CDATA[The order of records in a specified document.]]></DESCRIPTION> +<!--E650C949221B4DB4B75054E6D42685B1--> <HELP><![CDATA[The Sequence indicates the order of records]]></HELP> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--E650C949221B4DB4B75054E6D42685B1--> <AD_TAB_ID><![CDATA[C53967BA96E64FC6B2E4166A7C945168]]></AD_TAB_ID> +<!--E650C949221B4DB4B75054E6D42685B1--> <AD_COLUMN_ID><![CDATA[3AE62A8262C1481EB0AA36315B026371]]></AD_COLUMN_ID> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--E650C949221B4DB4B75054E6D42685B1--> <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--E650C949221B4DB4B75054E6D42685B1--> <SEQNO><![CDATA[90]]></SEQNO> +<!--E650C949221B4DB4B75054E6D42685B1--> <SORTNO><![CDATA[1]]></SORTNO> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--E650C949221B4DB4B75054E6D42685B1--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--E650C949221B4DB4B75054E6D42685B1--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--E650C949221B4DB4B75054E6D42685B1--> <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO> +<!--E650C949221B4DB4B75054E6D42685B1--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--E650C949221B4DB4B75054E6D42685B1--> <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE> +<!--E650C949221B4DB4B75054E6D42685B1--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--E650C949221B4DB4B75054E6D42685B1--></AD_FIELD> + <!--E6B11717184B4246A844EB26D129C8E8--><AD_FIELD> <!--E6B11717184B4246A844EB26D129C8E8--> <AD_FIELD_ID><![CDATA[E6B11717184B4246A844EB26D129C8E8]]></AD_FIELD_ID> <!--E6B11717184B4246A844EB26D129C8E8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r bc03ed72e085 -r 47fef1b036b7 src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql --- a/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql Fri Oct 14 10:37:06 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql Fri Oct 14 11:17:48 2011 +0200 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2008-2010 Openbravo SLU + * All portions are Copyright (C) 2008-2011 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -62,7 +62,7 @@ WHERE AD_MODULE.AD_MODULE_ID = AD_DATASET.AD_MODULE_ID AND AD_MODULE.AD_MODULE_ID IN ('1') AND (AD_DATASET.ACCESSLEVEL IN ('3','1') OR (? = '0' AND AD_DATASET.ACCESSLEVEL IN ('3','6'))) - ORDER BY AD_MODULE.AD_MODULE_ID, AD_DATASET.AD_DATASET_ID + ORDER BY AD_MODULE.AD_MODULE_ID, AD_DATASET.SEQNO, AD_DATASET.AD_DATASET_ID ]]> </Sql> <Parameter name="modules" optional="true" type="replace" after="AD_MODULE_ID IN " text="('1')"/> diff -r bc03ed72e085 -r 47fef1b036b7 src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql --- a/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql Fri Oct 14 10:37:06 2011 +0200 +++ b/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql Fri Oct 14 11:17:48 2011 +0200 @@ -79,7 +79,7 @@ WHERE AD_Module_ID = M.AD_Module_ID AND IsIncluded = 'Y') as display, m.Status, m.help, m.author, m.url, CASE WHEN COALESCE(AD_ORGMODULE.VERSION,M.VERSION) <> M.VERSION THEN 'Y' ELSE '' END AS Update_Available, - seqno + m.seqno FROM AD_Module M left join AD_DATASET on M.ad_module_id = AD_DATASET.ad_module_id LEFT JOIN AD_ORGMODULE ON M.AD_MODULE_ID = AD_ORGMODULE.AD_MODULE_ID WHERE M.TYPE = 'M' ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2d-oct _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
