details: https://code.openbravo.com/erp/devel/pi/rev/b371ec37d9b4 changeset: 17925:b371ec37d9b4 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Sep 11 15:27:40 2012 +0200 summary: Fixed bug 21600: Depreciate flag in Asset Group window Depreciate field is displayed into the Asset Group window (removed from configScript) The Depreciate field inside the Assets window inherits from the selected Asset Category. The SL_Depreciate callout has been developed for managing this requirement.
details: https://code.openbravo.com/erp/devel/pi/rev/e75d1f34e9b4 changeset: 17926:e75d1f34e9b4 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Sep 11 18:13:02 2012 +0200 summary: Fixed bug 21602: Static flag in Assets window A new flag, called Static, is displayed into the Assets window If set to Yes, it prevents from moving the asset into the tree, which basically means changing its parent. diffstat: modules/org.openbravo.v3/src-db/database/configScript.xml | 4 - src-db/database/model/tables/A_ASSET.xml | 5 + src-db/database/sourcedata/AD_CALLOUT.xml | 9 ++ src-db/database/sourcedata/AD_COLUMN.xml | 37 ++++++++++ src-db/database/sourcedata/AD_ELEMENT.xml | 14 +++ src-db/database/sourcedata/AD_FIELD.xml | 29 +++++++- src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++ src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 +++ src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 ++ src/org/openbravo/erpCommon/ad_callouts/SL_Depreciate.java | 50 ++++++++++++++ src/org/openbravo/erpCommon/utility/WindowTreeChecks.java | 4 + src/org/openbravo/erpCommon/utility/WindowTree_data.xsql | 11 +++ 12 files changed, 191 insertions(+), 5 deletions(-) diffs (truncated from 331 to 300 lines): diff -r 61377c542f43 -r e75d1f34e9b4 modules/org.openbravo.v3/src-db/database/configScript.xml --- a/modules/org.openbravo.v3/src-db/database/configScript.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/modules/org.openbravo.v3/src-db/database/configScript.xml Tue Sep 11 18:13:02 2012 +0200 @@ -953,10 +953,6 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="6190"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="6298"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> diff -r 61377c542f43 -r e75d1f34e9b4 src-db/database/model/tables/A_ASSET.xml --- a/src-db/database/model/tables/A_ASSET.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/src-db/database/model/tables/A_ASSET.xml Tue Sep 11 18:13:02 2012 +0200 @@ -241,6 +241,10 @@ <default/> <onCreateDefault/> </column> + <column name="ISSTATIC" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> <foreign-key foreignTable="A_ASSET_GROUP" name="A_ASSET_A_ASSET_GROUP"> <reference local="A_ASSET_GROUP_ID" foreign="A_ASSET_GROUP_ID"/> </foreign-key> @@ -281,6 +285,7 @@ <check name="A_ASSET_ISDISPOSED_CHK"><![CDATA[ISDISPOSED IN ('Y', 'N')]]></check> <check name="A_ASSET_ISINPOSESSION_CHK"><![CDATA[ISINPOSESSION IN ('Y', 'N')]]></check> <check name="A_ASSET_ISOWNED_CHK"><![CDATA[ISOWNED IN ('Y', 'N')]]></check> + <check name="A_ASSET_ISSTATIC_CHK"><![CDATA[ISSTATIC IN ('Y', 'N')]]></check> <check name="A_ASSET_ISSUMMARY_CHK"><![CDATA[ISSUMMARY IN ('Y', 'N')]]></check> </table> </database> diff -r 61377c542f43 -r e75d1f34e9b4 src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Tue Sep 11 18:13:02 2012 +0200 @@ -817,6 +817,15 @@ <!--3C9DEC9042534CFA8C74B83D28CA777D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--3C9DEC9042534CFA8C74B83D28CA777D--></AD_CALLOUT> +<!--3CC0A308B32C4BC6A7E742DDB27F1CFE--><AD_CALLOUT> +<!--3CC0A308B32C4BC6A7E742DDB27F1CFE--> <AD_CALLOUT_ID><![CDATA[3CC0A308B32C4BC6A7E742DDB27F1CFE]]></AD_CALLOUT_ID> +<!--3CC0A308B32C4BC6A7E742DDB27F1CFE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3CC0A308B32C4BC6A7E742DDB27F1CFE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3CC0A308B32C4BC6A7E742DDB27F1CFE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3CC0A308B32C4BC6A7E742DDB27F1CFE--> <NAME><![CDATA[SL_Depreciate]]></NAME> +<!--3CC0A308B32C4BC6A7E742DDB27F1CFE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--3CC0A308B32C4BC6A7E742DDB27F1CFE--></AD_CALLOUT> + <!--3E7999A44EEA40FEBC71EACA93A51198--><AD_CALLOUT> <!--3E7999A44EEA40FEBC71EACA93A51198--> <AD_CALLOUT_ID><![CDATA[3E7999A44EEA40FEBC71EACA93A51198]]></AD_CALLOUT_ID> <!--3E7999A44EEA40FEBC71EACA93A51198--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 61377c542f43 -r e75d1f34e9b4 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Sep 11 18:13:02 2012 +0200 @@ -101247,6 +101247,7 @@ <!--8051--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--8051--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--8051--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--8051--> <AD_CALLOUT_ID><![CDATA[3CC0A308B32C4BC6A7E742DDB27F1CFE]]></AD_CALLOUT_ID> <!--8051--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--8051--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--8051--> <POSITION><![CDATA[13]]></POSITION> @@ -284334,6 +284335,42 @@ <!--B3147C45A604481080501E7C1099A662--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--B3147C45A604481080501E7C1099A662--></AD_COLUMN> +<!--B35E5E5548A143928E45AAB4057B37F6--><AD_COLUMN> +<!--B35E5E5548A143928E45AAB4057B37F6--> <AD_COLUMN_ID><![CDATA[B35E5E5548A143928E45AAB4057B37F6]]></AD_COLUMN_ID> +<!--B35E5E5548A143928E45AAB4057B37F6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--B35E5E5548A143928E45AAB4057B37F6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--B35E5E5548A143928E45AAB4057B37F6--> <NAME><![CDATA[Static]]></NAME> +<!--B35E5E5548A143928E45AAB4057B37F6--> <DESCRIPTION><![CDATA[Prevents from moving the record into the tree]]></DESCRIPTION> +<!--B35E5E5548A143928E45AAB4057B37F6--> <HELP><![CDATA[Prevents from moving the record into the tree]]></HELP> +<!--B35E5E5548A143928E45AAB4057B37F6--> <COLUMNNAME><![CDATA[IsStatic]]></COLUMNNAME> +<!--B35E5E5548A143928E45AAB4057B37F6--> <AD_TABLE_ID><![CDATA[539]]></AD_TABLE_ID> +<!--B35E5E5548A143928E45AAB4057B37F6--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> +<!--B35E5E5548A143928E45AAB4057B37F6--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> +<!--B35E5E5548A143928E45AAB4057B37F6--> <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISKEY><![CDATA[N]]></ISKEY> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--B35E5E5548A143928E45AAB4057B37F6--> <SEQNO><![CDATA[380]]></SEQNO> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--B35E5E5548A143928E45AAB4057B37F6--> <AD_ELEMENT_ID><![CDATA[66D79DCEE41D41588FCC2DB58A467EA3]]></AD_ELEMENT_ID> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--B35E5E5548A143928E45AAB4057B37F6--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--B35E5E5548A143928E45AAB4057B37F6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--B35E5E5548A143928E45AAB4057B37F6--> <POSITION><![CDATA[61]]></POSITION> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--B35E5E5548A143928E45AAB4057B37F6--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--B35E5E5548A143928E45AAB4057B37F6--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--B35E5E5548A143928E45AAB4057B37F6--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--B35E5E5548A143928E45AAB4057B37F6--></AD_COLUMN> + <!--B372776E011046A985A3BB951CEF0A9F--><AD_COLUMN> <!--B372776E011046A985A3BB951CEF0A9F--> <AD_COLUMN_ID><![CDATA[B372776E011046A985A3BB951CEF0A9F]]></AD_COLUMN_ID> <!--B372776E011046A985A3BB951CEF0A9F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 61377c542f43 -r e75d1f34e9b4 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Tue Sep 11 18:13:02 2012 +0200 @@ -24311,6 +24311,20 @@ <!--667AE26F6635E6A7E040007F01015B98--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--667AE26F6635E6A7E040007F01015B98--></AD_ELEMENT> +<!--66D79DCEE41D41588FCC2DB58A467EA3--><AD_ELEMENT> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <AD_ELEMENT_ID><![CDATA[66D79DCEE41D41588FCC2DB58A467EA3]]></AD_ELEMENT_ID> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <COLUMNNAME><![CDATA[IsStatic]]></COLUMNNAME> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <NAME><![CDATA[Static]]></NAME> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <PRINTNAME><![CDATA[Static]]></PRINTNAME> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <DESCRIPTION><![CDATA[Prevents from moving the record into the tree]]></DESCRIPTION> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <HELP><![CDATA[Prevents from moving the record into the tree]]></HELP> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--66D79DCEE41D41588FCC2DB58A467EA3--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--66D79DCEE41D41588FCC2DB58A467EA3--></AD_ELEMENT> + <!--66E1860A46E045D4BD7F018323FA10D4--><AD_ELEMENT> <!--66E1860A46E045D4BD7F018323FA10D4--> <AD_ELEMENT_ID><![CDATA[66E1860A46E045D4BD7F018323FA10D4]]></AD_ELEMENT_ID> <!--66E1860A46E045D4BD7F018323FA10D4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 61377c542f43 -r e75d1f34e9b4 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Tue Sep 11 18:13:02 2012 +0200 @@ -74521,7 +74521,6 @@ <!--6190--> <AD_COLUMN_ID><![CDATA[8115]]></AD_COLUMN_ID> <!--6190--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--6190--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--6190--> <DISPLAYLOGIC><![CDATA[@IsOwned@='Y']]></DISPLAYLOGIC> <!--6190--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--6190--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--6190--> <SEQNO><![CDATA[60]]></SEQNO> @@ -178130,6 +178129,34 @@ <!--1C749E67C7124E3BB1307755C3CF453E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--1C749E67C7124E3BB1307755C3CF453E--></AD_FIELD> +<!--1C78E6F992F44E50BC5CB9294881C03A--><AD_FIELD> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <AD_FIELD_ID><![CDATA[1C78E6F992F44E50BC5CB9294881C03A]]></AD_FIELD_ID> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <NAME><![CDATA[Static]]></NAME> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <DESCRIPTION><![CDATA[Prevents from moving the record into the tree]]></DESCRIPTION> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <HELP><![CDATA[Prevents from moving the record into the tree]]></HELP> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <AD_TAB_ID><![CDATA[800078]]></AD_TAB_ID> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <AD_COLUMN_ID><![CDATA[B35E5E5548A143928E45AAB4057B37F6]]></AD_COLUMN_ID> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <SEQNO><![CDATA[85]]></SEQNO> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--1C78E6F992F44E50BC5CB9294881C03A--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--1C78E6F992F44E50BC5CB9294881C03A--></AD_FIELD> + <!--1C8A629E52404C48B4CC703DB057E8F3--><AD_FIELD> <!--1C8A629E52404C48B4CC703DB057E8F3--> <AD_FIELD_ID><![CDATA[1C8A629E52404C48B4CC703DB057E8F3]]></AD_FIELD_ID> <!--1C8A629E52404C48B4CC703DB057E8F3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 61377c542f43 -r e75d1f34e9b4 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Sep 11 18:13:02 2012 +0200 @@ -16467,6 +16467,17 @@ <!--491DCBBBBAE544DDABD6F0F1979256B3--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--491DCBBBBAE544DDABD6F0F1979256B3--></AD_MESSAGE> +<!--492C1E7969764AD1BE52DCB41278B5BC--><AD_MESSAGE> +<!--492C1E7969764AD1BE52DCB41278B5BC--> <AD_MESSAGE_ID><![CDATA[492C1E7969764AD1BE52DCB41278B5BC]]></AD_MESSAGE_ID> +<!--492C1E7969764AD1BE52DCB41278B5BC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--492C1E7969764AD1BE52DCB41278B5BC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--492C1E7969764AD1BE52DCB41278B5BC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--492C1E7969764AD1BE52DCB41278B5BC--> <VALUE><![CDATA[StaticRecord]]></VALUE> +<!--492C1E7969764AD1BE52DCB41278B5BC--> <MSGTEXT><![CDATA[You are trying to move a static record into the tree. If you really want to do it, please unset the correspondent Static flag and try it again.]]></MSGTEXT> +<!--492C1E7969764AD1BE52DCB41278B5BC--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--492C1E7969764AD1BE52DCB41278B5BC--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--492C1E7969764AD1BE52DCB41278B5BC--></AD_MESSAGE> + <!--4A82705B500347DB93524E0EBAFAA4FA--><AD_MESSAGE> <!--4A82705B500347DB93524E0EBAFAA4FA--> <AD_MESSAGE_ID><![CDATA[4A82705B500347DB93524E0EBAFAA4FA]]></AD_MESSAGE_ID> <!--4A82705B500347DB93524E0EBAFAA4FA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 61377c542f43 -r e75d1f34e9b4 src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Tue Sep 11 18:13:02 2012 +0200 @@ -3833,6 +3833,18 @@ <!--8E86ECAC98194E5985A2E6B5DEC3C870--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> <!--8E86ECAC98194E5985A2E6B5DEC3C870--></AD_MODEL_OBJECT> +<!--91ED626A1F6445459119962799D17FA9--><AD_MODEL_OBJECT> +<!--91ED626A1F6445459119962799D17FA9--> <AD_MODEL_OBJECT_ID><![CDATA[91ED626A1F6445459119962799D17FA9]]></AD_MODEL_OBJECT_ID> +<!--91ED626A1F6445459119962799D17FA9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--91ED626A1F6445459119962799D17FA9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--91ED626A1F6445459119962799D17FA9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--91ED626A1F6445459119962799D17FA9--> <ACTION><![CDATA[C]]></ACTION> +<!--91ED626A1F6445459119962799D17FA9--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SL_Depreciate]]></CLASSNAME> +<!--91ED626A1F6445459119962799D17FA9--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--91ED626A1F6445459119962799D17FA9--> <AD_CALLOUT_ID><![CDATA[3CC0A308B32C4BC6A7E742DDB27F1CFE]]></AD_CALLOUT_ID> +<!--91ED626A1F6445459119962799D17FA9--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--91ED626A1F6445459119962799D17FA9--></AD_MODEL_OBJECT> + <!--9282C90A36A848ADBA7ACED8CDF02304--><AD_MODEL_OBJECT> <!--9282C90A36A848ADBA7ACED8CDF02304--> <AD_MODEL_OBJECT_ID><![CDATA[9282C90A36A848ADBA7ACED8CDF02304]]></AD_MODEL_OBJECT_ID> <!--9282C90A36A848ADBA7ACED8CDF02304--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 61377c542f43 -r e75d1f34e9b4 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Mon Sep 10 17:29:34 2012 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Tue Sep 11 18:13:02 2012 +0200 @@ -3790,6 +3790,16 @@ <!--4574500DD2314CE28AB179852DFD091C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--4574500DD2314CE28AB179852DFD091C--></AD_MODEL_OBJECT_MAPPING> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--><AD_MODEL_OBJECT_MAPPING> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[4A9AF7FBED4D4FE891EF7E2AAA389FBA]]></AD_MODEL_OBJECT_MAPPING_ID> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--> <AD_MODEL_OBJECT_ID><![CDATA[91ED626A1F6445459119962799D17FA9]]></AD_MODEL_OBJECT_ID> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--> <MAPPINGNAME><![CDATA[/ad_callouts/SL_Depreciate.html]]></MAPPINGNAME> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--></AD_MODEL_OBJECT_MAPPING> + <!--527057E70F3145A78A293DC1B0AD5E53--><AD_MODEL_OBJECT_MAPPING> <!--527057E70F3145A78A293DC1B0AD5E53--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[527057E70F3145A78A293DC1B0AD5E53]]></AD_MODEL_OBJECT_MAPPING_ID> <!--527057E70F3145A78A293DC1B0AD5E53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 61377c542f43 -r e75d1f34e9b4 src/org/openbravo/erpCommon/ad_callouts/SL_Depreciate.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Depreciate.java Tue Sep 11 18:13:02 2012 +0200 @@ -0,0 +1,50 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2012 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ + +package org.openbravo.erpCommon.ad_callouts; + +import javax.servlet.ServletException; + +import org.apache.commons.lang.StringUtils; +import org.openbravo.base.filter.IsIDFilter; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBDal; +import org.openbravo.model.financialmgmt.assetmgmt.AssetGroup; + +public class SL_Depreciate extends SimpleCallout { + private static final long serialVersionUID = 1L; + + @Override + protected void execute(CalloutInfo info) throws ServletException { + final String assetCategoryID = info.getStringParameter("inpaAssetGroupId", IsIDFilter.instance); + if (!StringUtils.isBlank(assetCategoryID)) { + info.addResult("inpisdepreciated", getDepreciatedFlag(assetCategoryID)); + } + } + + protected Boolean getDepreciatedFlag(final String assetCategoryID) { + OBContext.setAdminMode(); + try { + final AssetGroup assetCategory = OBDal.getInstance().get(AssetGroup.class, assetCategoryID); + return (assetCategory == null ? Boolean.FALSE : assetCategory.isDepreciate()); + } finally { + OBContext.restorePreviousMode(); + } + } +} diff -r 61377c542f43 -r e75d1f34e9b4 src/org/openbravo/erpCommon/utility/WindowTreeChecks.java --- a/src/org/openbravo/erpCommon/utility/WindowTreeChecks.java Mon Sep 10 17:29:34 2012 +0200 +++ b/src/org/openbravo/erpCommon/utility/WindowTreeChecks.java Tue Sep 11 18:13:02 2012 +0200 @@ -63,6 +63,10 @@ ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
