diff --git a/org.adempiere.base/src/org/compiere/model/MAsset.java b/org.adempiere.base/src/org/compiere/model/MAsset.java index e4ab6df078..6665f745ee 100644 --- a/org.adempiere.base/src/org/compiere/model/MAsset.java +++ b/org.adempiere.base/src/org/compiere/model/MAsset.java @@ -601,7 +601,7 @@ public class MAsset extends X_A_Asset public int getProductR_MailText_ID() { // IDEMPIERE-197 Stabilize Fixed Assets // AssetDelivery is requiring this missing column - // Adding this method to compile correctly and future research, + // TODO: Adding this method to compile correctly and future research, // but the process AssetDelivery will fail with error "** Product Mail Text" return 0; } @@ -609,7 +609,7 @@ public class MAsset extends X_A_Asset public boolean isDownloadable() { // IDEMPIERE-197 Stabilize Fixed Assets // AssetServlet is requiring this missing column - // Adding this method to compile correctly and future research + // TODO: Adding this method to compile correctly and future research return false; } } diff --git a/org.adempiere.base/src/org/compiere/model/MAssetType.java b/org.adempiere.base/src/org/compiere/model/MAssetType.java index e70ed6c7c0..52dcb79f24 100644 --- a/org.adempiere.base/src/org/compiere/model/MAssetType.java +++ b/org.adempiere.base/src/org/compiere/model/MAssetType.java @@ -99,7 +99,7 @@ public class MAssetType extends X_A_Asset_Type public static boolean isFixedAsset(int A_Asset_ID) { final String whereClause = MAsset.COLUMNNAME_A_Asset_ID+"=?" - +" AND "+MAsset.COLUMNNAME_A_Asset_Type+"=?"; + +" AND "+MAsset.COLUMNNAME_A_AssetType+"=?"; return new Query(Env.getCtx(), MAsset.Table_Name, whereClause, null) .setParameters(new Object[]{A_Asset_ID, A_ASSET_TYPE_MFX}) diff --git a/org.adempiere.base/src/org/compiere/model/MDepreciation.java b/org.adempiere.base/src/org/compiere/model/MDepreciation.java index 0baf94cd4a..67a585a2fa 100644 --- a/org.adempiere.base/src/org/compiere/model/MDepreciation.java +++ b/org.adempiere.base/src/org/compiere/model/MDepreciation.java @@ -459,4 +459,11 @@ public class MDepreciation extends X_A_Depreciation } return assetExp; } + + public int getFixMonthOffset() { + // IDEMPIERE-197 Stabilize Fixed Assets + // MDepreciationWorkfile is requiring this missing column + // TODO: Adding this method to compile correctly and future research + return 0; + } }