diff --git a/base/src/org/compiere/model/MRoleMenu.java b/base/src/org/compiere/model/MRoleMenu.java index a7d5a8f4e7..8ccdae54a9 100644 --- a/base/src/org/compiere/model/MRoleMenu.java +++ b/base/src/org/compiere/model/MRoleMenu.java @@ -21,6 +21,7 @@ */ package org.compiere.model; +import java.sql.ResultSet; import java.util.Properties; import org.compiere.model.X_U_RoleMenu; @@ -38,4 +39,8 @@ public class MRoleMenu extends X_U_RoleMenu super(ctx, U_RoleMenu_ID, trxName); } + public MRoleMenu(Properties ctx, ResultSet rs, String trxName) { + super(ctx, rs, trxName); + } + } diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/BankManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/BankManager.java index 56071d09d5..74004d8778 100644 --- a/posterita/posterita/src/main/org/posterita/businesslogic/BankManager.java +++ b/posterita/posterita/src/main/org/posterita/businesslogic/BankManager.java @@ -43,7 +43,7 @@ import org.posterita.core.CheckDuplicateEntities; import org.posterita.exceptions.BankAlreadyExistException; import org.posterita.exceptions.OperationException; import org.posterita.lib.UdiConstants; -import org.posterita.model.MBank; +import org.compiere.model.MBank; import org.posterita.util.PoManager; diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/POSClientManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/POSClientManager.java index 38947aca6d..22583a0956 100644 --- a/posterita/posterita/src/main/org/posterita/businesslogic/POSClientManager.java +++ b/posterita/posterita/src/main/org/posterita/businesslogic/POSClientManager.java @@ -69,7 +69,7 @@ import org.posterita.factory.GenericSystemObjectsFactory; import org.posterita.factory.POSMenuFactory; import org.posterita.factory.SystemObjectsFactory; import org.posterita.lib.UdiConstants; -import org.posterita.model.MBank; +import org.compiere.model.MBank; import org.posterita.model.MWebMenu; import org.posterita.util.PoManager; diff --git a/posterita/posterita/src/main/org/posterita/factory/MenuGenerator.java b/posterita/posterita/src/main/org/posterita/factory/MenuGenerator.java index 6dbfe133a7..345a225e10 100644 --- a/posterita/posterita/src/main/org/posterita/factory/MenuGenerator.java +++ b/posterita/posterita/src/main/org/posterita/factory/MenuGenerator.java @@ -26,7 +26,7 @@ import org.compiere.model.X_U_RoleMenu; import org.compiere.util.Env; import org.posterita.businesslogic.MenuManager; import org.posterita.exceptions.OperationException; -import org.posterita.model.MRoleMenu; +import org.compiere.model.MRoleMenu; import org.posterita.util.PoManager; diff --git a/posterita/posterita/src/main/org/posterita/keyname/BankKeyNamePair.java b/posterita/posterita/src/main/org/posterita/keyname/BankKeyNamePair.java index e2e209e727..cf49e09e4a 100644 --- a/posterita/posterita/src/main/org/posterita/keyname/BankKeyNamePair.java +++ b/posterita/posterita/src/main/org/posterita/keyname/BankKeyNamePair.java @@ -27,7 +27,7 @@ import org.compiere.util.Env; import org.posterita.core.KeyNamePairUtil; import org.posterita.exceptions.OperationException; -import org.posterita.model.MBank; +import org.compiere.model.MBank; public class BankKeyNamePair extends KeyNamePairUtil diff --git a/posterita/posterita/src/main/org/posterita/model/MBank.java b/posterita/posterita/src/main/org/posterita/model/MBank.java deleted file mode 100644 index c5f6a6b2cb..0000000000 --- a/posterita/posterita/src/main/org/posterita/model/MBank.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Product: Posterita Web-Based POS and Adempiere Plugin - * Copyright (C) 2007 Posterita Ltd - * This file is part of POSterita - * - * POSterita is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Created on 07-Jul-2005 by alok - * - */ -package org.posterita.model; - -import java.sql.ResultSet; -import java.util.Properties; - -import org.compiere.model.X_C_Bank; - - -public class MBank extends X_C_Bank -{ - /** - * - */ - private static final long serialVersionUID = 1L; - - public MBank(Properties ctx, int C_Bank_ID, String m_trxName) - { - super(ctx, C_Bank_ID, m_trxName); - - } - public MBank(Properties ctx, ResultSet rs, String trxName) - { - super(ctx, rs, trxName); - } - - - - - -} diff --git a/posterita/posterita/src/main/org/posterita/model/MRevenueRecognition.java b/posterita/posterita/src/main/org/posterita/model/MRevenueRecognition.java deleted file mode 100644 index e9c7fb668a..0000000000 --- a/posterita/posterita/src/main/org/posterita/model/MRevenueRecognition.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Product: Posterita Web-Based POS and Adempiere Plugin - * Copyright (C) 2007 Posterita Ltd - * This file is part of POSterita - * - * POSterita is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Created on Jun 12, 2006 - */ - - -package org.posterita.model; - -import java.sql.ResultSet; -import java.util.Properties; - -import org.compiere.model.X_C_RevenueRecognition; - - -public class MRevenueRecognition extends X_C_RevenueRecognition -{ - /** - * - */ - private static final long serialVersionUID = 1L; - - public MRevenueRecognition(Properties ctx, int C_REVENUERECOGNITION_ID, String trxName) - { - super(ctx, C_REVENUERECOGNITION_ID, trxName); - } - - public MRevenueRecognition(Properties ctx, ResultSet rs, String trxName) - { - super(ctx, rs, trxName); - } - -} - - diff --git a/posterita/posterita/src/main/org/posterita/model/MRoleMenu.java b/posterita/posterita/src/main/org/posterita/model/MRoleMenu.java deleted file mode 100644 index 09e4c118c3..0000000000 --- a/posterita/posterita/src/main/org/posterita/model/MRoleMenu.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Product: Posterita Web-Based POS and Adempiere Plugin - * Copyright (C) 2007 Posterita Ltd - * This file is part of POSterita - * - * POSterita is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -package org.posterita.model; - -import java.sql.ResultSet; -import java.util.Properties; - -import org.compiere.model.X_U_RoleMenu; - - -public class MRoleMenu extends X_U_RoleMenu -{ - - public MRoleMenu(Properties ctx, int U_RoleMenu_ID, String trxName) - { - super(ctx, U_RoleMenu_ID, trxName); - } - - public MRoleMenu(Properties ctx, ResultSet rs, String trxName) - { - super(ctx, rs, trxName); - } - -} diff --git a/posterita/posterita/src/main/org/posterita/model/MWebMenu.java b/posterita/posterita/src/main/org/posterita/model/MWebMenu.java index 36f5639f34..3afe2cf1fb 100644 --- a/posterita/posterita/src/main/org/posterita/model/MWebMenu.java +++ b/posterita/posterita/src/main/org/posterita/model/MWebMenu.java @@ -28,7 +28,12 @@ import org.compiere.model.X_U_WebMenu; public class MWebMenu extends X_U_WebMenu { - public MWebMenu(Properties ctx, int U_WebMenu_ID, String trxName) + /** + * + */ + private static final long serialVersionUID = 1L; + + public MWebMenu(Properties ctx, int U_WebMenu_ID, String trxName) { super(ctx, U_WebMenu_ID, trxName); } diff --git a/posterita/posterita/src/main/org/posterita/taglib/BankName.java b/posterita/posterita/src/main/org/posterita/taglib/BankName.java index 4db36852c9..d541528e76 100644 --- a/posterita/posterita/src/main/org/posterita/taglib/BankName.java +++ b/posterita/posterita/src/main/org/posterita/taglib/BankName.java @@ -30,7 +30,7 @@ import org.apache.struts.taglib.bean.WriteTag; import org.apache.struts.util.RequestUtils; import org.posterita.core.TmkJSPEnv; -import org.posterita.model.MBank; +import org.compiere.model.MBank; public class BankName extends WriteTag {