diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Role.java b/org.adempiere.base/src/org/compiere/model/I_AD_Role.java index ab6fe4d37e..36fbd07052 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_Role.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_Role.java @@ -18,12 +18,11 @@ package org.compiere.model; import java.math.BigDecimal; import java.sql.Timestamp; -import org.compiere.model.*; import org.compiere.util.KeyNamePair; /** Generated Interface for AD_Role * @author Adempiere (generated) - * @version 360LTS.015 + * @version Release 3.6.0LTS */ public interface I_AD_Role { @@ -36,7 +35,7 @@ public interface I_AD_Role KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 6 - System - Client + /** AccessLevel = - System - Client */ BigDecimal accessLevel = BigDecimal.valueOf(6); @@ -76,6 +75,15 @@ public interface I_AD_Role */ public int getAD_Role_ID(); + /** Column name AD_Role_UU */ + public static final String COLUMNNAME_AD_Role_UU = "AD_Role_UU"; + + /** Set AD_Role_UU */ + public void setAD_Role_UU (String AD_Role_UU); + + /** Get AD_Role_UU */ + public String getAD_Role_UU(); + /** Column name AD_Tree_Menu_ID */ public static final String COLUMNNAME_AD_Tree_Menu_ID = "AD_Tree_Menu_ID"; @@ -133,24 +141,6 @@ public interface I_AD_Role /** Get Allow Info BPartner */ public boolean isAllow_Info_BPartner(); - /** Column name Allow_Info_CashJournal */ - public static final String COLUMNNAME_Allow_Info_CashJournal = "Allow_Info_CashJournal"; - - /** Set Allow Info CashJournal */ - public void setAllow_Info_CashJournal (boolean Allow_Info_CashJournal); - - /** Get Allow Info CashJournal */ - public boolean isAllow_Info_CashJournal(); - - /** Column name Allow_Info_CRP */ - public static final String COLUMNNAME_Allow_Info_CRP = "Allow_Info_CRP"; - - /** Set Allow Info CRP */ - public void setAllow_Info_CRP (boolean Allow_Info_CRP); - - /** Get Allow Info CRP */ - public boolean isAllow_Info_CRP(); - /** Column name Allow_Info_InOut */ public static final String COLUMNNAME_Allow_Info_InOut = "Allow_Info_InOut"; @@ -169,15 +159,6 @@ public interface I_AD_Role /** Get Allow Info Invoice */ public boolean isAllow_Info_Invoice(); - /** Column name Allow_Info_MRP */ - public static final String COLUMNNAME_Allow_Info_MRP = "Allow_Info_MRP"; - - /** Set Allow Info MRP */ - public void setAllow_Info_MRP (boolean Allow_Info_MRP); - - /** Get Allow Info MRP */ - public boolean isAllow_Info_MRP(); - /** Column name Allow_Info_Order */ public static final String COLUMNNAME_Allow_Info_Order = "Allow_Info_Order"; @@ -441,6 +422,19 @@ public interface I_AD_Role */ public boolean isManual(); + /** Column name IsMasterRole */ + public static final String COLUMNNAME_IsMasterRole = "IsMasterRole"; + + /** Set Master Role. + * A master role cannot be assigned to users, it is intended to define access to menu option and documents and inherit to other roles + */ + public void setIsMasterRole (boolean IsMasterRole); + + /** Get Master Role. + * A master role cannot be assigned to users, it is intended to define access to menu option and documents and inherit to other roles + */ + public boolean isMasterRole(); + /** Column name IsMenuAutoExpand */ public static final String COLUMNNAME_IsMenuAutoExpand = "IsMenuAutoExpand"; diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Role.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role.java index ef96d7d83b..66072cb9b8 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_Role.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_Role.java @@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair; /** Generated Model for AD_Role * @author Adempiere (generated) - * @version 360LTS.015 - $Id$ */ + * @version Release 3.6.0LTS - $Id$ */ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent { /** * */ - private static final long serialVersionUID = 20120412L; + private static final long serialVersionUID = 20120921L; /** Standard Constructor */ public X_AD_Role (Properties ctx, int AD_Role_ID, String trxName) @@ -46,16 +46,10 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent setAllow_Info_Asset (true); // Y setAllow_Info_BPartner (true); -// Y - setAllow_Info_CashJournal (true); -// Y - setAllow_Info_CRP (true); // Y setAllow_Info_InOut (true); // Y setAllow_Info_Invoice (true); -// Y - setAllow_Info_MRP (true); // Y setAllow_Info_Order (true); // Y @@ -80,7 +74,10 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent // N setIsDiscountAllowedOnTotal (false); setIsDiscountUptoLimitPrice (false); - setIsManual (false); + setIsManual (true); +// Y + setIsMasterRole (false); +// N setIsMenuAutoExpand (false); // N setIsPersonalAccess (false); @@ -154,6 +151,20 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent return ii.intValue(); } + /** Set AD_Role_UU. + @param AD_Role_UU AD_Role_UU */ + public void setAD_Role_UU (String AD_Role_UU) + { + set_Value (COLUMNNAME_AD_Role_UU, AD_Role_UU); + } + + /** Get AD_Role_UU. + @return AD_Role_UU */ + public String getAD_Role_UU () + { + return (String)get_Value(COLUMNNAME_AD_Role_UU); + } + public org.compiere.model.I_AD_Tree getAD_Tree_Menu() throws RuntimeException { return (org.compiere.model.I_AD_Tree)MTable.get(getCtx(), org.compiere.model.I_AD_Tree.Table_Name) @@ -273,48 +284,6 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent return false; } - /** Set Allow Info CashJournal. - @param Allow_Info_CashJournal Allow Info CashJournal */ - public void setAllow_Info_CashJournal (boolean Allow_Info_CashJournal) - { - set_Value (COLUMNNAME_Allow_Info_CashJournal, Boolean.valueOf(Allow_Info_CashJournal)); - } - - /** Get Allow Info CashJournal. - @return Allow Info CashJournal */ - public boolean isAllow_Info_CashJournal () - { - Object oo = get_Value(COLUMNNAME_Allow_Info_CashJournal); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - - /** Set Allow Info CRP. - @param Allow_Info_CRP Allow Info CRP */ - public void setAllow_Info_CRP (boolean Allow_Info_CRP) - { - set_Value (COLUMNNAME_Allow_Info_CRP, Boolean.valueOf(Allow_Info_CRP)); - } - - /** Get Allow Info CRP. - @return Allow Info CRP */ - public boolean isAllow_Info_CRP () - { - Object oo = get_Value(COLUMNNAME_Allow_Info_CRP); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - /** Set Allow Info InOut. @param Allow_Info_InOut Allow Info InOut */ public void setAllow_Info_InOut (boolean Allow_Info_InOut) @@ -357,27 +326,6 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent return false; } - /** Set Allow Info MRP. - @param Allow_Info_MRP Allow Info MRP */ - public void setAllow_Info_MRP (boolean Allow_Info_MRP) - { - set_Value (COLUMNNAME_Allow_Info_MRP, Boolean.valueOf(Allow_Info_MRP)); - } - - /** Get Allow Info MRP. - @return Allow Info MRP */ - public boolean isAllow_Info_MRP () - { - Object oo = get_Value(COLUMNNAME_Allow_Info_MRP); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - /** Set Allow Info Order. @param Allow_Info_Order Allow Info Order */ public void setAllow_Info_Order (boolean Allow_Info_Order) @@ -822,6 +770,30 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent return false; } + /** Set Master Role. + @param IsMasterRole + A master role cannot be assigned to users, it is intended to define access to menu option and documents and inherit to other roles + */ + public void setIsMasterRole (boolean IsMasterRole) + { + set_Value (COLUMNNAME_IsMasterRole, Boolean.valueOf(IsMasterRole)); + } + + /** Get Master Role. + @return A master role cannot be assigned to users, it is intended to define access to menu option and documents and inherit to other roles + */ + public boolean isMasterRole () + { + Object oo = get_Value(COLUMNNAME_IsMasterRole); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set Auto expand menu. @param IsMenuAutoExpand If ticked, the menu is automatically expanded diff --git a/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/RoleElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/RoleElementHandler.java index 319856ce80..c992ba168b 100644 --- a/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/RoleElementHandler.java +++ b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/RoleElementHandler.java @@ -173,7 +173,7 @@ public class RoleElementHandler extends AbstractElementHandler { m_Role.setAllow_Info_Account(Boolean.valueOf(atts.getValue("AllowInfoAccount"))); m_Role.setAllow_Info_Asset(Boolean.valueOf(atts.getValue("AllowInfoAsset"))); m_Role.setAllow_Info_BPartner(Boolean.valueOf(atts.getValue("AllowInfoBPartner"))); - m_Role.setAllow_Info_CashJournal(Boolean.valueOf(atts.getValue("AllowInfoCashJournal"))); + // m_Role.setAllow_Info_CashJournal(Boolean.valueOf(atts.getValue("AllowInfoCashJournal"))); m_Role.setAllow_Info_InOut(Boolean.valueOf(atts.getValue("AllowInfoInOut"))); m_Role.setAllow_Info_Invoice(Boolean.valueOf(atts.getValue("AllowInfoInvoice"))); m_Role.setAllow_Info_Order(Boolean.valueOf(atts.getValue("AllowInfoOrder"))); @@ -181,8 +181,8 @@ public class RoleElementHandler extends AbstractElementHandler { m_Role.setAllow_Info_Product(Boolean.valueOf(atts.getValue("AllowInfoProduct"))); m_Role.setAllow_Info_Resource(Boolean.valueOf(atts.getValue("AllowInfoResource"))); m_Role.setAllow_Info_Schedule(Boolean.valueOf(atts.getValue("AllowInfoSchedule"))); - m_Role.setAllow_Info_Schedule(Boolean.valueOf(atts.getValue("AllowInfoCRP"))); - m_Role.setAllow_Info_Schedule(Boolean.valueOf(atts.getValue("AllowInfoMRP"))); + //m_Role.setAllow_Info_CRP(Boolean.valueOf(atts.getValue("AllowInfoCRP"))); + //m_Role.setAllow_Info_MRP(Boolean.valueOf(atts.getValue("AllowInfoMRP"))); if (m_Role.save(getTrxName(ctx)) == true) { @@ -504,7 +504,7 @@ public class RoleElementHandler extends AbstractElementHandler { atts.addAttribute("", "", "AllowInfoAccount", "CDATA", Boolean.toString(m_Role.isAllow_Info_Account())); atts.addAttribute("", "", "AllowInfoAsset", "CDATA", Boolean.toString(m_Role.isAllow_Info_Asset())); atts.addAttribute("", "", "AllowInfoBPartner", "CDATA", Boolean.toString(m_Role.isAllow_Info_BPartner())); - atts.addAttribute("", "", "AllowInfoCashJournal", "CDATA", Boolean.toString(m_Role.isAllow_Info_CashJournal())); + // atts.addAttribute("", "", "AllowInfoCashJournal", "CDATA", Boolean.toString(m_Role.isAllow_Info_CashJournal())); atts.addAttribute("", "", "AllowInfoInOut", "CDATA", Boolean.toString(m_Role.isAllow_Info_InOut())); atts.addAttribute("", "", "AllowInfoInvoice", "CDATA", Boolean.toString(m_Role.isAllow_Info_Invoice())); atts.addAttribute("", "", "AllowInfoOrder", "CDATA", Boolean.toString(m_Role.isAllow_Info_Order())); @@ -512,8 +512,8 @@ public class RoleElementHandler extends AbstractElementHandler { atts.addAttribute("", "", "AllowInfoProduct", "CDATA", Boolean.toString(m_Role.isAllow_Info_Product())); atts.addAttribute("", "", "AllowInfoResource", "CDATA", Boolean.toString(m_Role.isAllow_Info_Resource())); atts.addAttribute("", "", "AllowInfoSchedule", "CDATA", Boolean.toString(m_Role.isAllow_Info_Schedule())); - atts.addAttribute("", "", "AllowInfoCRP", "CDATA", Boolean.toString(m_Role.isAllow_Info_CRP())); - atts.addAttribute("", "", "AllowInfoMRP", "CDATA", Boolean.toString(m_Role.isAllow_Info_MRP())); + // atts.addAttribute("", "", "AllowInfoCRP", "CDATA", Boolean.toString(m_Role.isAllow_Info_CRP())); + // atts.addAttribute("", "", "AllowInfoMRP", "CDATA", Boolean.toString(m_Role.isAllow_Info_MRP())); return atts; } diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java index d778e761e0..5c14a1df1c 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java @@ -453,14 +453,14 @@ public final class AMenu extends CFrame AEnv.addMenuItem("InfoSchedule", null, null, mView, this); } //FR [ 1966328 ] - if (MRole.getDefault().isAllow_Info_MRP()) - { - AEnv.addMenuItem("InfoMRP", "Info", null, mView, this); - } - if (MRole.getDefault().isAllow_Info_CRP()) - { - AEnv.addMenuItem("InfoCRP", "Info", null, mView, this); - } +// if (MRole.getDefault().isAllow_Info_MRP()) +// { +// AEnv.addMenuItem("InfoMRP", "Info", null, mView, this); +// } +// if (MRole.getDefault().isAllow_Info_CRP()) +// { +// AEnv.addMenuItem("InfoCRP", "Info", null, mView, this); +// } mView.addSeparator(); if (MRole.getDefault().isAllow_Info_Order()) { @@ -478,10 +478,10 @@ public final class AMenu extends CFrame { AEnv.addMenuItem("InfoPayment", "Info", null, mView, this); } - if (MRole.getDefault().isAllow_Info_CashJournal()) - { - AEnv.addMenuItem("InfoCashLine", "Info", null, mView, this); - } +// if (MRole.getDefault().isAllow_Info_CashJournal()) +// { +// AEnv.addMenuItem("InfoCashLine", "Info", null, mView, this); +// } if (MRole.getDefault().isAllow_Info_Resource()) { AEnv.addMenuItem("InfoAssignment", "Info", null, mView, this); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java index 4edaa405bd..6474485315 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java @@ -387,14 +387,14 @@ public final class APanel extends CPanel AEnv.addMenuItem("InfoSchedule", null, null, mView, this); } //FR [ 1966328 ] - if (MRole.getDefault().isAllow_Info_MRP()) - { - AEnv.addMenuItem("InfoMRP", "Info", null, mView, this); - } - if (MRole.getDefault().isAllow_Info_CRP()) - { - AEnv.addMenuItem("InfoCRP", "Info", null, mView, this); - } +// if (MRole.getDefault().isAllow_Info_MRP()) +// { +// AEnv.addMenuItem("InfoMRP", "Info", null, mView, this); +// } +// if (MRole.getDefault().isAllow_Info_CRP()) +// { +// AEnv.addMenuItem("InfoCRP", "Info", null, mView, this); +// } mView.addSeparator(); if (MRole.getDefault().isAllow_Info_Order()) { @@ -412,10 +412,10 @@ public final class APanel extends CPanel { AEnv.addMenuItem("InfoPayment", "Info", null, mView, this); } - if (MRole.getDefault().isAllow_Info_CashJournal()) - { - AEnv.addMenuItem("InfoCashLine", "Info", null, mView, this); - } +// if (MRole.getDefault().isAllow_Info_CashJournal()) +// { +// AEnv.addMenuItem("InfoCashLine", "Info", null, mView, this); +// } if (MRole.getDefault().isAllow_Info_Resource()) { AEnv.addMenuItem("InfoAssignment", "Info", null, mView, this); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java index cb74544c3e..48dd5fb435 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java @@ -190,10 +190,10 @@ public class FormFrame extends CFrame { AEnv.addMenuItem("InfoPayment", "Info", null, mView, this); } - if (MRole.getDefault().isAllow_Info_CashJournal()) - { - AEnv.addMenuItem("InfoCashLine", "Info", null, mView, this); - } +// if (MRole.getDefault().isAllow_Info_CashJournal()) +// { +// AEnv.addMenuItem("InfoCashLine", "Info", null, mView, this); +// } if (MRole.getDefault().isAllow_Info_Resource()) { AEnv.addMenuItem("InfoAssignment", "Info", null, mView, this); diff --git a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java index 09edc4e2df..189c138db9 100644 --- a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java +++ b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java @@ -543,14 +543,14 @@ public class Viewer extends CFrame AEnv.addMenuItem("InfoSchedule", null, null, mView, this); } //FR [ 1966328 ] - if (MRole.getDefault().isAllow_Info_MRP()) - { - AEnv.addMenuItem("InfoMRP", "Info", null, mView, this); - } - if (MRole.getDefault().isAllow_Info_CRP()) - { - AEnv.addMenuItem("InfoCRP", "Info", null, mView, this); - } +// if (MRole.getDefault().isAllow_Info_MRP()) +// { +// AEnv.addMenuItem("InfoMRP", "Info", null, mView, this); +// } +// if (MRole.getDefault().isAllow_Info_CRP()) +// { +// AEnv.addMenuItem("InfoCRP", "Info", null, mView, this); +// } mView.addSeparator(); if (MRole.getDefault().isAllow_Info_Order()) { @@ -568,10 +568,10 @@ public class Viewer extends CFrame { AEnv.addMenuItem("InfoPayment", "Info", null, mView, this); } - if (MRole.getDefault().isAllow_Info_CashJournal()) - { - AEnv.addMenuItem("InfoCashLine", "Info", null, mView, this); - } +// if (MRole.getDefault().isAllow_Info_CashJournal()) +// { +// AEnv.addMenuItem("InfoCashLine", "Info", null, mView, this); +// } if (MRole.getDefault().isAllow_Info_Resource()) { AEnv.addMenuItem("InfoAssignment", "Info", null, mView, this); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPViews.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPViews.java index d903f0d438..86e4bd5104 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPViews.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPViews.java @@ -116,14 +116,14 @@ public class DPViews extends DashboardPanel implements EventListener { btnViewItem.addEventListener(Events.ON_CLICK, this); vbox.appendChild(btnViewItem); } - if (MRole.getDefault().isAllow_Info_CashJournal()) - { - ToolBarButton btnViewItem = new ToolBarButton("InfoCashLine"); - btnViewItem.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "InfoCashLine"))); - btnViewItem.setImage("/images/Info16.png"); - btnViewItem.addEventListener(Events.ON_CLICK, this); - vbox.appendChild(btnViewItem); - } +// if (MRole.getDefault().isAllow_Info_CashJournal()) +// { +// ToolBarButton btnViewItem = new ToolBarButton("InfoCashLine"); +// btnViewItem.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "InfoCashLine"))); +// btnViewItem.setImage("/images/Info16.png"); +// btnViewItem.addEventListener(Events.ON_CLICK, this); +// vbox.appendChild(btnViewItem); +// } if (MRole.getDefault().isAllow_Info_Resource()) { ToolBarButton btnViewItem = new ToolBarButton("InfoAssignment");