details: https://code.openbravo.com/erp/devel/pi/rev/c97cb07f8600 changeset: 18214:c97cb07f8600 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Sep 12 11:57:41 2012 +0200 summary: [build time] Skip unneeded 2.50 code generation
details: https://code.openbravo.com/erp/devel/pi/rev/e0a40d78df47 changeset: 18215:e0a40d78df47 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Sep 12 13:21:22 2012 +0200 summary: [build time] Smartbuild detects changes in 2.50 preference details: https://code.openbravo.com/erp/devel/pi/rev/9585dd700f49 changeset: 18216:9585dd700f49 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Sep 12 16:01:45 2012 +0200 summary: [build time] Ask to rebuild in case of setting 2.50 preference through callout details: https://code.openbravo.com/erp/devel/pi/rev/a90ccc95e2e0 changeset: 18217:a90ccc95e2e0 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Sep 12 18:11:11 2012 +0200 summary: [build time] Allow to generate all 2.50 windows details: https://code.openbravo.com/erp/devel/pi/rev/6e8fd5e25c2b changeset: 18218:6e8fd5e25c2b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Sep 12 18:12:42 2012 +0200 summary: [build time] Removed incorrect entries in model object and mapping tables These entries were for generated windows which is not needed and caused a test to fail. related to issue 17491, related to issue 18343 details: https://code.openbravo.com/erp/devel/pi/rev/d29ca1c8f6da changeset: 18219:d29ca1c8f6da user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Oct 15 08:28:05 2012 +0200 summary: [build time] 2.250 property is not read directly from file, but passed as param diffstat: config/Openbravo.properties.template | 5 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 5 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 72 -- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 110 --- src-wad/src/org/openbravo/wad/Tabs_data.xsql | 44 +- src-wad/src/org/openbravo/wad/Wad.java | 343 +++++++-- src-wad/src/org/openbravo/wad/Wad_data.xsql | 13 +- src/build.xml | 4 +- 9 files changed, 332 insertions(+), 266 deletions(-) diffs (truncated from 876 to 300 lines): diff -r 3544a599e172 -r d29ca1c8f6da config/Openbravo.properties.template --- a/config/Openbravo.properties.template Mon Oct 15 21:29:59 2012 +0200 +++ b/config/Openbravo.properties.template Mon Oct 15 08:28:05 2012 +0200 @@ -199,3 +199,8 @@ # Setting this to true will enable extra (hidden) functionality used # automated test scripts. test.environment=false + +# allows to compile classic 2.50 windows for all available tab +# By default those all not generated anymore for tabs for which they are not needed +#wad.generateAllClassic250Windows=true + diff -r 3544a599e172 -r d29ca1c8f6da modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Mon Oct 15 21:29:59 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Mon Oct 15 08:28:05 2012 +0200 @@ -1254,7 +1254,7 @@ <!--FF8080812F10C577012F1138306C0027--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF8080812F10C577012F1138306C0027--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF8080812F10C577012F1138306C0027--> <VALUE><![CDATA[OBUIAPP_ExecuteInCallout]]></VALUE> -<!--FF8080812F10C577012F1138306C0027--> <MSGTEXT><![CDATA[This window is using some functionality which needs to be updated to work in Openbravo 3. A preference has been added so that this window is opened in classic mode until this problem is fixed. Contact with your System Administrator, or with the developer of the module to fix this. You now need to log out of the application, and login again, so that this window is shown in classic mode.]]></MSGTEXT> +<!--FF8080812F10C577012F1138306C0027--> <MSGTEXT><![CDATA[This window is using some functionality which needs to be updated to work in Openbravo 3. A preference has been added so that this window is opened in classic mode until this problem is fixed. Contact with your System Administrator, or with the developer of the module to fix this. You now need to ask your System Administrator to rebuild the system, after that this window is shown in classic mode.]]></MSGTEXT> <!--FF8080812F10C577012F1138306C0027--> <MSGTYPE><![CDATA[E]]></MSGTYPE> <!--FF8080812F10C577012F1138306C0027--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--FF8080812F10C577012F1138306C0027--></AD_MESSAGE> diff -r 3544a599e172 -r d29ca1c8f6da modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Mon Oct 15 21:29:59 2012 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Mon Oct 15 08:28:05 2012 +0200 @@ -1259,9 +1259,10 @@ messages.add(message); createNewPreferenceForWindow(tab.getWindow()); log.warn("An EXECUTE element has been found in the response of the callout " - + calloutClassName + ". A preference has been created for the window " + + calloutClassName + + ". A preference has been created for the window " + tab.getWindow().getName() - + "so that it's shown in classic mode until this problem is fixed."); + + "so that it's shown in classic mode until this problem is fixed. This requires to build the system to generate this classic window."); } } } else { diff -r 3544a599e172 -r d29ca1c8f6da src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Mon Oct 15 21:29:59 2012 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Mon Oct 15 08:28:05 2012 +0200 @@ -3174,18 +3174,6 @@ <!--2B209CEDF6564F9DBE160FC5D6AD5CF5--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> <!--2B209CEDF6564F9DBE160FC5D6AD5CF5--></AD_MODEL_OBJECT> -<!--2D23FFCB7884457D8C651CAB66F888CF--><AD_MODEL_OBJECT> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <AD_MODEL_OBJECT_ID><![CDATA[2D23FFCB7884457D8C651CAB66F888CF]]></AD_MODEL_OBJECT_ID> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <ACTION><![CDATA[W]]></ACTION> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <AD_TAB_ID><![CDATA[E166858871CA4F74BBC0E1BBDC5C9887]]></AD_TAB_ID> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.ComboReloadsE166858871CA4F74BBC0E1BBDC5C9887]]></CLASSNAME> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--2D23FFCB7884457D8C651CAB66F888CF--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> -<!--2D23FFCB7884457D8C651CAB66F888CF--></AD_MODEL_OBJECT> - <!--2D675A25948F4CCCA8C3C7B1906DD131--><AD_MODEL_OBJECT> <!--2D675A25948F4CCCA8C3C7B1906DD131--> <AD_MODEL_OBJECT_ID><![CDATA[2D675A25948F4CCCA8C3C7B1906DD131]]></AD_MODEL_OBJECT_ID> <!--2D675A25948F4CCCA8C3C7B1906DD131--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -3528,18 +3516,6 @@ <!--5BD1584795784B85B4E45757EC54CED7--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> <!--5BD1584795784B85B4E45757EC54CED7--></AD_MODEL_OBJECT> -<!--5DA04D2AE006454091F775BC272479A9--><AD_MODEL_OBJECT> -<!--5DA04D2AE006454091F775BC272479A9--> <AD_MODEL_OBJECT_ID><![CDATA[5DA04D2AE006454091F775BC272479A9]]></AD_MODEL_OBJECT_ID> -<!--5DA04D2AE006454091F775BC272479A9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--5DA04D2AE006454091F775BC272479A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--5DA04D2AE006454091F775BC272479A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--5DA04D2AE006454091F775BC272479A9--> <ACTION><![CDATA[W]]></ACTION> -<!--5DA04D2AE006454091F775BC272479A9--> <AD_TAB_ID><![CDATA[E166858871CA4F74BBC0E1BBDC5C9887]]></AD_TAB_ID> -<!--5DA04D2AE006454091F775BC272479A9--> <CLASSNAME><![CDATA[org.openbravo.erpWindows.Organization.DataSets]]></CLASSNAME> -<!--5DA04D2AE006454091F775BC272479A9--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> -<!--5DA04D2AE006454091F775BC272479A9--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> -<!--5DA04D2AE006454091F775BC272479A9--></AD_MODEL_OBJECT> - <!--5DA1703A5803C509E040007F01011435--><AD_MODEL_OBJECT> <!--5DA1703A5803C509E040007F01011435--> <AD_MODEL_OBJECT_ID><![CDATA[5DA1703A5803C509E040007F01011435]]></AD_MODEL_OBJECT_ID> <!--5DA1703A5803C509E040007F01011435--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -4027,54 +4003,6 @@ <!--AE4ED865065A432AB641E859FA02686F--> <NAME><![CDATA[jdbc/openbravo]]></NAME> <!--AE4ED865065A432AB641E859FA02686F--></AD_MODEL_OBJECT> -<!--AE66869F3A94350BE040007F0101424C--><AD_MODEL_OBJECT> -<!--AE66869F3A94350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A94350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A94350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A94350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A94350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A94350BE040007F0101424C--> <ACTION><![CDATA[W]]></ACTION> -<!--AE66869F3A94350BE040007F0101424C--> <AD_TAB_ID><![CDATA[FF80818132AF937F0132AFA84F97003A]]></AD_TAB_ID> -<!--AE66869F3A94350BE040007F0101424C--> <CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentIn.UsedCreditSource]]></CLASSNAME> -<!--AE66869F3A94350BE040007F0101424C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> -<!--AE66869F3A94350BE040007F0101424C--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> -<!--AE66869F3A94350BE040007F0101424C--></AD_MODEL_OBJECT> - -<!--AE66869F3A98350BE040007F0101424C--><AD_MODEL_OBJECT> -<!--AE66869F3A98350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A98350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A98350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A98350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A98350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A98350BE040007F0101424C--> <ACTION><![CDATA[W]]></ACTION> -<!--AE66869F3A98350BE040007F0101424C--> <AD_TAB_ID><![CDATA[FF80818132AF937F0132AFA84F97003A]]></AD_TAB_ID> -<!--AE66869F3A98350BE040007F0101424C--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.ComboReloadsFF80818132AF937F0132AFA84F97003A]]></CLASSNAME> -<!--AE66869F3A98350BE040007F0101424C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--AE66869F3A98350BE040007F0101424C--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> -<!--AE66869F3A98350BE040007F0101424C--></AD_MODEL_OBJECT> - -<!--AE66869F3A9A350BE040007F0101424C--><AD_MODEL_OBJECT> -<!--AE66869F3A9A350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A9A350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A9A350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A9A350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A9A350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A9A350BE040007F0101424C--> <ACTION><![CDATA[W]]></ACTION> -<!--AE66869F3A9A350BE040007F0101424C--> <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID> -<!--AE66869F3A9A350BE040007F0101424C--> <CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentOut.UsedCreditSource]]></CLASSNAME> -<!--AE66869F3A9A350BE040007F0101424C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> -<!--AE66869F3A9A350BE040007F0101424C--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> -<!--AE66869F3A9A350BE040007F0101424C--></AD_MODEL_OBJECT> - -<!--AE66869F3A9E350BE040007F0101424C--><AD_MODEL_OBJECT> -<!--AE66869F3A9E350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A9E350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A9E350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A9E350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A9E350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A9E350BE040007F0101424C--> <ACTION><![CDATA[W]]></ACTION> -<!--AE66869F3A9E350BE040007F0101424C--> <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID> -<!--AE66869F3A9E350BE040007F0101424C--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.ComboReloadsFF80818132AFC4050132AFC7F94A000A]]></CLASSNAME> -<!--AE66869F3A9E350BE040007F0101424C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--AE66869F3A9E350BE040007F0101424C--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> -<!--AE66869F3A9E350BE040007F0101424C--></AD_MODEL_OBJECT> - <!--B143F9E8D1D449CFAEC4B4E19422B524--><AD_MODEL_OBJECT> <!--B143F9E8D1D449CFAEC4B4E19422B524--> <AD_MODEL_OBJECT_ID><![CDATA[B143F9E8D1D449CFAEC4B4E19422B524]]></AD_MODEL_OBJECT_ID> <!--B143F9E8D1D449CFAEC4B4E19422B524--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3544a599e172 -r d29ca1c8f6da src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Mon Oct 15 21:29:59 2012 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Mon Oct 15 08:28:05 2012 +0200 @@ -3460,16 +3460,6 @@ <!--1006400008--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--1006400008--></AD_MODEL_OBJECT_MAPPING> -<!--000DF316738847A184523C2783E497C4--><AD_MODEL_OBJECT_MAPPING> -<!--000DF316738847A184523C2783E497C4--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[000DF316738847A184523C2783E497C4]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--000DF316738847A184523C2783E497C4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--000DF316738847A184523C2783E497C4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--000DF316738847A184523C2783E497C4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--000DF316738847A184523C2783E497C4--> <AD_MODEL_OBJECT_ID><![CDATA[5DA04D2AE006454091F775BC272479A9]]></AD_MODEL_OBJECT_ID> -<!--000DF316738847A184523C2783E497C4--> <MAPPINGNAME><![CDATA[/Organization/DataSets_Relation.html]]></MAPPINGNAME> -<!--000DF316738847A184523C2783E497C4--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> -<!--000DF316738847A184523C2783E497C4--></AD_MODEL_OBJECT_MAPPING> - <!--01412F42B3D34A7180FAA1C376390849--><AD_MODEL_OBJECT_MAPPING> <!--01412F42B3D34A7180FAA1C376390849--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[01412F42B3D34A7180FAA1C376390849]]></AD_MODEL_OBJECT_MAPPING_ID> <!--01412F42B3D34A7180FAA1C376390849--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -3970,16 +3960,6 @@ <!--6731CF66A74346DD8B665BBA524C4787--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--6731CF66A74346DD8B665BBA524C4787--></AD_MODEL_OBJECT_MAPPING> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--><AD_MODEL_OBJECT_MAPPING> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[697C5F8E51D44DC1A78A9663D8A7EF72]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--> <AD_MODEL_OBJECT_ID><![CDATA[5DA04D2AE006454091F775BC272479A9]]></AD_MODEL_OBJECT_ID> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--> <MAPPINGNAME><![CDATA[/Organization/DataSets_Edition.html]]></MAPPINGNAME> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--697C5F8E51D44DC1A78A9663D8A7EF72--></AD_MODEL_OBJECT_MAPPING> - <!--6A3D5AEE01EF478DBE950FCD06A4A954--><AD_MODEL_OBJECT_MAPPING> <!--6A3D5AEE01EF478DBE950FCD06A4A954--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[6A3D5AEE01EF478DBE950FCD06A4A954]]></AD_MODEL_OBJECT_MAPPING_ID> <!--6A3D5AEE01EF478DBE950FCD06A4A954--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -4240,86 +4220,6 @@ <!--ACF55029BBC7476AA1EB6C502EDE5BA9--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> <!--ACF55029BBC7476AA1EB6C502EDE5BA9--></AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A95350BE040007F0101424C--><AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A95350BE040007F0101424C--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AE66869F3A95350BE040007F0101424C]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--AE66869F3A95350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A95350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A95350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A95350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A94350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A95350BE040007F0101424C--> <MAPPINGNAME><![CDATA[/PaymentIn/UsedCreditSource_Relation.html]]></MAPPINGNAME> -<!--AE66869F3A95350BE040007F0101424C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> -<!--AE66869F3A95350BE040007F0101424C--></AD_MODEL_OBJECT_MAPPING> - -<!--AE66869F3A96350BE040007F0101424C--><AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A96350BE040007F0101424C--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AE66869F3A96350BE040007F0101424C]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--AE66869F3A96350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A96350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A96350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A96350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A94350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A96350BE040007F0101424C--> <MAPPINGNAME><![CDATA[/PaymentIn/UsedCreditSource_Edition.html]]></MAPPINGNAME> -<!--AE66869F3A96350BE040007F0101424C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--AE66869F3A96350BE040007F0101424C--></AD_MODEL_OBJECT_MAPPING> - -<!--AE66869F3A97350BE040007F0101424C--><AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A97350BE040007F0101424C--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AE66869F3A97350BE040007F0101424C]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--AE66869F3A97350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A97350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A97350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A97350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A94350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A97350BE040007F0101424C--> <MAPPINGNAME><![CDATA[/PaymentIn/UsedCreditSource_Excel.xls]]></MAPPINGNAME> -<!--AE66869F3A97350BE040007F0101424C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--AE66869F3A97350BE040007F0101424C--></AD_MODEL_OBJECT_MAPPING> - -<!--AE66869F3A99350BE040007F0101424C--><AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A99350BE040007F0101424C--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AE66869F3A99350BE040007F0101424C]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--AE66869F3A99350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A99350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A99350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A99350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A98350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A99350BE040007F0101424C--> <MAPPINGNAME><![CDATA[/ad_callouts/ComboReloadsFF80818132AF937F0132AFA84F97003A.html]]></MAPPINGNAME> -<!--AE66869F3A99350BE040007F0101424C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--AE66869F3A99350BE040007F0101424C--></AD_MODEL_OBJECT_MAPPING> - -<!--AE66869F3A9B350BE040007F0101424C--><AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A9B350BE040007F0101424C--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AE66869F3A9B350BE040007F0101424C]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--AE66869F3A9B350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A9B350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A9B350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A9B350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A9A350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A9B350BE040007F0101424C--> <MAPPINGNAME><![CDATA[/PaymentOut/UsedCreditSource_Relation.html]]></MAPPINGNAME> -<!--AE66869F3A9B350BE040007F0101424C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> -<!--AE66869F3A9B350BE040007F0101424C--></AD_MODEL_OBJECT_MAPPING> - -<!--AE66869F3A9C350BE040007F0101424C--><AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A9C350BE040007F0101424C--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AE66869F3A9C350BE040007F0101424C]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--AE66869F3A9C350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A9C350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A9C350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A9C350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A9A350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A9C350BE040007F0101424C--> <MAPPINGNAME><![CDATA[/PaymentOut/UsedCreditSource_Edition.html]]></MAPPINGNAME> -<!--AE66869F3A9C350BE040007F0101424C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--AE66869F3A9C350BE040007F0101424C--></AD_MODEL_OBJECT_MAPPING> - -<!--AE66869F3A9D350BE040007F0101424C--><AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A9D350BE040007F0101424C--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AE66869F3A9D350BE040007F0101424C]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--AE66869F3A9D350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A9D350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A9D350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A9D350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A9A350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A9D350BE040007F0101424C--> <MAPPINGNAME><![CDATA[/PaymentOut/UsedCreditSource_Excel.xls]]></MAPPINGNAME> -<!--AE66869F3A9D350BE040007F0101424C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--AE66869F3A9D350BE040007F0101424C--></AD_MODEL_OBJECT_MAPPING> - -<!--AE66869F3A9F350BE040007F0101424C--><AD_MODEL_OBJECT_MAPPING> -<!--AE66869F3A9F350BE040007F0101424C--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AE66869F3A9F350BE040007F0101424C]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--AE66869F3A9F350BE040007F0101424C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--AE66869F3A9F350BE040007F0101424C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--AE66869F3A9F350BE040007F0101424C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AE66869F3A9F350BE040007F0101424C--> <AD_MODEL_OBJECT_ID><![CDATA[AE66869F3A9E350BE040007F0101424C]]></AD_MODEL_OBJECT_ID> -<!--AE66869F3A9F350BE040007F0101424C--> <MAPPINGNAME><![CDATA[/ad_callouts/ComboReloadsFF80818132AFC4050132AFC7F94A000A.html]]></MAPPINGNAME> -<!--AE66869F3A9F350BE040007F0101424C--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--AE66869F3A9F350BE040007F0101424C--></AD_MODEL_OBJECT_MAPPING> - <!--AFEFA3ECE5E543C8BFCB049F0208577F--><AD_MODEL_OBJECT_MAPPING> <!--AFEFA3ECE5E543C8BFCB049F0208577F--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AFEFA3ECE5E543C8BFCB049F0208577F]]></AD_MODEL_OBJECT_MAPPING_ID> <!--AFEFA3ECE5E543C8BFCB049F0208577F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -4640,16 +4540,6 @@ <!--FAC7271D69F343BCA656BB3FDF81FD59--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> <!--FAC7271D69F343BCA656BB3FDF81FD59--></AD_MODEL_OBJECT_MAPPING> -<!--FF479B8708CB473F8C3D91DF17B68B0B--><AD_MODEL_OBJECT_MAPPING> -<!--FF479B8708CB473F8C3D91DF17B68B0B--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[FF479B8708CB473F8C3D91DF17B68B0B]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--FF479B8708CB473F8C3D91DF17B68B0B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--FF479B8708CB473F8C3D91DF17B68B0B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--FF479B8708CB473F8C3D91DF17B68B0B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--FF479B8708CB473F8C3D91DF17B68B0B--> <AD_MODEL_OBJECT_ID><![CDATA[5DA04D2AE006454091F775BC272479A9]]></AD_MODEL_OBJECT_ID> -<!--FF479B8708CB473F8C3D91DF17B68B0B--> <MAPPINGNAME><![CDATA[/Organization/DataSets_Excel.xls]]></MAPPINGNAME> -<!--FF479B8708CB473F8C3D91DF17B68B0B--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> -<!--FF479B8708CB473F8C3D91DF17B68B0B--></AD_MODEL_OBJECT_MAPPING> - <!--FF808181316C298101316C3F6E7F0013--><AD_MODEL_OBJECT_MAPPING> <!--FF808181316C298101316C3F6E7F0013--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[FF808181316C298101316C3F6E7F0013]]></AD_MODEL_OBJECT_MAPPING_ID> <!--FF808181316C298101316C3F6E7F0013--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3544a599e172 -r d29ca1c8f6da src-wad/src/org/openbravo/wad/Tabs_data.xsql --- a/src-wad/src/org/openbravo/wad/Tabs_data.xsql Mon Oct 15 21:29:59 2012 +0200 +++ b/src-wad/src/org/openbravo/wad/Tabs_data.xsql Mon Oct 15 08:28:05 2012 +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) 2001-2011 Openbravo SLU + * All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -58,7 +58,40 @@ </Sql> <Parameter name="name"/> </SqlMethod> - + + <SqlMethod name="selectTabDebugData" type="preparedStatement" return="single"> + <Sql> + SELECT AD_TAB.name as tabname, ad_tab.tablevel as tablevel + FROM ad_tab WHERE ad_tab_id = ? + </Sql> ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
