diff --git a/org.adempiere.base/src/org/compiere/model/MBPGroup.java b/org.adempiere.base/src/org/compiere/model/MBPGroup.java index 4e02ef7172..9d8ae48efc 100644 --- a/org.adempiere.base/src/org/compiere/model/MBPGroup.java +++ b/org.adempiere.base/src/org/compiere/model/MBPGroup.java @@ -39,7 +39,7 @@ public class MBPGroup extends X_C_BP_Group /** * */ - private static final long serialVersionUID = -5323639776872742839L; + private static final long serialVersionUID = 8897399796117872715L; /** * Get MBPGroup from Cache @@ -244,15 +244,5 @@ public class MBPGroup extends X_C_BP_Group return insert_Accounting("C_BP_Group_Acct", "C_AcctSchema_Default", null); return success; } // afterSave - - - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("C_BP_Group_Acct"); - } // beforeDelete - + } // MBPGroup diff --git a/org.adempiere.base/src/org/compiere/model/MBPartner.java b/org.adempiere.base/src/org/compiere/model/MBPartner.java index 913b1906ce..c6eea18f51 100644 --- a/org.adempiere.base/src/org/compiere/model/MBPartner.java +++ b/org.adempiere.base/src/org/compiere/model/MBPartner.java @@ -47,7 +47,7 @@ public class MBPartner extends X_C_BPartner /** * */ - private static final long serialVersionUID = -4308267492285903865L; + private static final long serialVersionUID = -5503105554864289337L; /** * Get Empty Template Business Partner @@ -945,17 +945,6 @@ public class MBPartner extends X_C_BPartner return success; } // afterSave - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("C_BP_Customer_Acct") - && delete_Accounting("C_BP_Vendor_Acct") - && delete_Accounting("C_BP_Employee_Acct"); - } // beforeDelete - /** * After Delete * @param success diff --git a/org.adempiere.base/src/org/compiere/model/MBankAccount.java b/org.adempiere.base/src/org/compiere/model/MBankAccount.java index 65fae5382d..54a6a578bc 100644 --- a/org.adempiere.base/src/org/compiere/model/MBankAccount.java +++ b/org.adempiere.base/src/org/compiere/model/MBankAccount.java @@ -34,7 +34,7 @@ public class MBankAccount extends X_C_BankAccount /** * */ - private static final long serialVersionUID = -8742307130542608791L; + private static final long serialVersionUID = 2392818253347168347L; /** * Get BankAccount from Cache @@ -133,14 +133,5 @@ public class MBankAccount extends X_C_BankAccount return insert_Accounting("C_BankAccount_Acct", "C_AcctSchema_Default", null); return success; } // afterSave - - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("C_BankAccount_Acct"); - } // beforeDelete } // MBankAccount diff --git a/org.adempiere.base/src/org/compiere/model/MCashBook.java b/org.adempiere.base/src/org/compiere/model/MCashBook.java index c5915e8c73..d486d503e2 100644 --- a/org.adempiere.base/src/org/compiere/model/MCashBook.java +++ b/org.adempiere.base/src/org/compiere/model/MCashBook.java @@ -35,7 +35,7 @@ public class MCashBook extends X_C_CashBook /** * */ - private static final long serialVersionUID = 4602423783184037174L; + private static final long serialVersionUID = 3991585668643587699L; /** * Get MCashBook from Cache @@ -143,13 +143,4 @@ public class MCashBook extends X_C_CashBook return success; } // afterSave - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("C_Cashbook_Acct"); - } // beforeDelete - } // MCashBook diff --git a/org.adempiere.base/src/org/compiere/model/MCharge.java b/org.adempiere.base/src/org/compiere/model/MCharge.java index 13ec4cb005..2432e6a13e 100644 --- a/org.adempiere.base/src/org/compiere/model/MCharge.java +++ b/org.adempiere.base/src/org/compiere/model/MCharge.java @@ -39,7 +39,7 @@ public class MCharge extends X_C_Charge /** * */ - private static final long serialVersionUID = 8246481667219415012L; + private static final long serialVersionUID = -4628105180010713510L; /** * Get Charge Account @@ -150,13 +150,4 @@ public class MCharge extends X_C_Charge return success; } // afterSave - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("C_Charge_Acct"); - } // beforeDelete - } // MCharge diff --git a/org.adempiere.base/src/org/compiere/model/MProduct.java b/org.adempiere.base/src/org/compiere/model/MProduct.java index 68e99774c6..ce10511096 100644 --- a/org.adempiere.base/src/org/compiere/model/MProduct.java +++ b/org.adempiere.base/src/org/compiere/model/MProduct.java @@ -757,7 +757,7 @@ public class MProduct extends X_M_Product }*/ // - return delete_Accounting("M_Product_Acct"); + return true; } // beforeDelete @Override diff --git a/org.adempiere.base/src/org/compiere/model/MProductCategory.java b/org.adempiere.base/src/org/compiere/model/MProductCategory.java index d191bf9820..1c836a32d9 100644 --- a/org.adempiere.base/src/org/compiere/model/MProductCategory.java +++ b/org.adempiere.base/src/org/compiere/model/MProductCategory.java @@ -41,8 +41,7 @@ public class MProductCategory extends X_M_Product_Category /** * */ - private static final long serialVersionUID = -1290361229726779892L; - + private static final long serialVersionUID = 1239249591584452179L; /** * Get from Cache @@ -178,15 +177,6 @@ public class MProductCategory extends X_M_Product_Category return success; } // afterSave - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("M_Product_Category_Acct"); - } // beforeDelete - /** * FiFo Material Movement Policy * @return true if FiFo diff --git a/org.adempiere.base/src/org/compiere/model/MProject.java b/org.adempiere.base/src/org/compiere/model/MProject.java index 3854dcab3f..271caa4438 100644 --- a/org.adempiere.base/src/org/compiere/model/MProject.java +++ b/org.adempiere.base/src/org/compiere/model/MProject.java @@ -36,7 +36,7 @@ public class MProject extends X_C_Project /** * */ - private static final long serialVersionUID = 2151648902207548617L; + private static final long serialVersionUID = -6103964836289951325L; /** * Create new Project by copying @@ -442,15 +442,6 @@ public class MProject extends X_C_Project return success; } // afterSave - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("C_Project_Acct"); - } // beforeDelete - /** * After Delete * @param success diff --git a/org.adempiere.base/src/org/compiere/model/MTax.java b/org.adempiere.base/src/org/compiere/model/MTax.java index b328a4788f..4aff126572 100644 --- a/org.adempiere.base/src/org/compiere/model/MTax.java +++ b/org.adempiere.base/src/org/compiere/model/MTax.java @@ -41,8 +41,8 @@ public class MTax extends X_C_Tax /** * */ - private static final long serialVersionUID = 6423328193350641479L; - + private static final long serialVersionUID = 5871827364071851846L; + /** Cache */ private static CCache s_cache = new CCache(Table_Name, 5); /** Cache of Client */ @@ -317,13 +317,4 @@ public class MTax extends X_C_Tax return success; } // afterSave - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("C_Tax_Acct"); - } // beforeDelete - } // MTax diff --git a/org.adempiere.base/src/org/compiere/model/MWarehouse.java b/org.adempiere.base/src/org/compiere/model/MWarehouse.java index 0514055579..2f6d223310 100644 --- a/org.adempiere.base/src/org/compiere/model/MWarehouse.java +++ b/org.adempiere.base/src/org/compiere/model/MWarehouse.java @@ -41,7 +41,8 @@ public class MWarehouse extends X_M_Warehouse /** * */ - private static final long serialVersionUID = 7037547130625087045L; + private static final long serialVersionUID = 2696705459515717619L; + /** * Get from Cache * @param ctx context @@ -273,13 +274,4 @@ public class MWarehouse extends X_M_Warehouse return success; } // afterSave - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("M_Warehouse_Acct"); - } // beforeDelete - } // MWarehouse diff --git a/org.adempiere.base/src/org/compiere/model/MWithholding.java b/org.adempiere.base/src/org/compiere/model/MWithholding.java index 12a3a6a853..825a6869ca 100644 --- a/org.adempiere.base/src/org/compiere/model/MWithholding.java +++ b/org.adempiere.base/src/org/compiere/model/MWithholding.java @@ -31,7 +31,7 @@ public class MWithholding extends X_C_Withholding /** * */ - private static final long serialVersionUID = 7734620609620104180L; + private static final long serialVersionUID = 6368597644089198711L; /** * Standard Constructor @@ -69,13 +69,4 @@ public class MWithholding extends X_C_Withholding return success; } // afterSave - /** - * Before Delete - * @return true - */ - protected boolean beforeDelete () - { - return delete_Accounting("C_Withholding_Acct"); - } // beforeDelete - } // MWithholding diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java index 68ed51ce89..5ac0b8870a 100644 --- a/org.adempiere.base/src/org/compiere/model/PO.java +++ b/org.adempiere.base/src/org/compiere/model/PO.java @@ -3793,6 +3793,7 @@ public abstract class PO * @param acctTable accounting sub table * @return true */ + @Deprecated // see IDEMPIERE-2088 protected boolean delete_Accounting(String acctTable) { return true;