midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5932 Update English top-level menu names and window names to better support new user adoption (#2133) 

* IDEMPIERE-5932 Update English top-level menu names and window names to better support new user adoption

* - fix minor typo

* - implement suggestions from Heng Sin
- fix favourites showing the name as tooltip instead of the description

---------

Co-authored-by: Chuck Boecking <chuck@chuboe.com>
This commit is contained in:
Carlos Ruiz 2023-12-14 09:26:11 +01:00 committed by GitHub
parent bbb5aa8562
commit 062741070d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 252 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
migration/iD11/oracle/202312080607_IDEMPIERE-5932.sql Normal file
View File

@ -0,0 +1,122 @@
-- IDEMPIERE-5932 - better menu and window names
SELECT register_migration_script('202312080607_IDEMPIERE-5932.sql') FROM dual;
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Dec 8, 2023, 6:07:00 AM CST
UPDATE AD_Menu SET Name='Quote-to-Invoice (Sales) ',Updated=TO_TIMESTAMP('2023-12-08 06:07:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=166
;
-- Dec 8, 2023, 6:07:22 AM CST
UPDATE AD_Menu SET Name='Requisition-to-Invoice (Purchasing)',Updated=TO_TIMESTAMP('2023-12-08 06:07:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=203
;
-- Dec 8, 2023, 6:08:15 AM CST
UPDATE AD_Menu SET Name='Open Items (Financial Movements and Aging)',Updated=TO_TIMESTAMP('2023-12-08 06:08:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=236
;
-- Dec 8, 2023, 6:08:21 AM CST
UPDATE AD_Process SET Name='Open Items (Aging)', Description='Open Items (Invoice and Aging) List', Help='Displays all unpaid invoices for a given Business Partner and date range.', Updated=TO_TIMESTAMP('2023-12-08 06:08:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=145
;
-- Dec 8, 2023, 6:08:39 AM CST
UPDATE AD_Menu SET Name='Material Management and Pricing',Updated=TO_TIMESTAMP('2023-12-08 06:08:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=183
;
-- Dec 8, 2023, 6:10:46 AM CST
UPDATE AD_Menu SET Name='Performance Analysis and Accounting',Updated=TO_TIMESTAMP('2023-12-08 06:10:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=278
;
-- Dec 8, 2023, 6:11:40 AM CST
UPDATE AD_Window SET Name='Bill of Materials and Formula',Updated=TO_TIMESTAMP('2023-12-08 06:11:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=53006
;
-- Dec 8, 2023, 6:11:46 AM CST
UPDATE AD_Window SET Name='Report and Process',Updated=TO_TIMESTAMP('2023-12-08 06:11:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=165
;
-- Dec 8, 2023, 6:11:52 AM CST
UPDATE AD_Window SET Name='Warehouse and Locators',Updated=TO_TIMESTAMP('2023-12-08 06:11:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=139
;
-- Dec 8, 2023, 6:11:57 AM CST
UPDATE AD_Window SET Name='Window, Tab and Field',Updated=TO_TIMESTAMP('2023-12-08 06:11:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=102
;
-- Dec 8, 2023, 6:12:46 AM CST
UPDATE AD_Window SET Name='Inventory Decrease/Increase', Description='Enter Inventory Decrease/Increase (for example Internal Use of Inventory)', Updated=TO_TIMESTAMP('2023-12-08 06:12:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=341
;
-- Dec 8, 2023, 6:13:01 AM CST
UPDATE AD_Window SET Name='Payment and Receipt',Updated=TO_TIMESTAMP('2023-12-08 06:13:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=195
;
-- Dec 8, 2023, 6:15:33 AM CST
UPDATE AD_Window SET Name='Sales Invoice and Credit/Debit Note', Description='Customer Sales Invoice and Credit/Debit Note', Updated=TO_TIMESTAMP('2023-12-08 06:15:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=167
;
-- Dec 8, 2023, 6:15:56 AM CST
UPDATE AD_Window SET Name='Purchase Invoice and Credit/Debit Note', Description='Vendor Purchase Invoice and Credit/Debit Note', Updated=TO_TIMESTAMP('2023-12-08 06:15:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=183
;
-- Dec 8, 2023, 6:16:25 AM CST
UPDATE AD_Window SET Name='Account Element (Chart of Accounts)',Updated=TO_TIMESTAMP('2023-12-08 06:16:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=118
;
-- Dec 8, 2023, 6:17:30 AM CST
UPDATE AD_Process SET Name='Bill of Material and Formula Cost Roll-Up',Updated=TO_TIMESTAMP('2023-12-08 06:17:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=53062
;
-- Dec 8, 2023, 6:17:36 AM CST
UPDATE AD_Menu SET Name='Bill of Material and Formulas', Description='Bill of Material and Formulas',Updated=TO_TIMESTAMP('2023-12-08 06:17:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53022
;
-- Dec 8, 2023, 6:17:41 AM CST
UPDATE AD_Workflow SET Name='Bill of Material and Formula Setup',Updated=TO_TIMESTAMP('2023-12-08 06:17:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50002
;
-- Dec 8, 2023, 6:17:46 AM CST
UPDATE AD_Form SET Name='BOM and Formula Info',Updated=TO_TIMESTAMP('2023-12-08 06:17:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=53001
;
-- Dec 8, 2023, 6:17:54 AM CST
UPDATE AD_Process SET Name='Cost Workflow and Process Details',Updated=TO_TIMESTAMP('2023-12-08 06:17:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=53060
;
-- Dec 8, 2023, 6:17:59 AM CST
UPDATE AD_Form SET Name='Generate Shipments and Invoices (manual)',Updated=TO_TIMESTAMP('2023-12-08 06:17:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=53010
;
-- Dec 8, 2023, 6:18:09 AM CST
UPDATE AD_Menu SET Name='Human Resource and Payroll', Description='Human Resource and Payroll',Updated=TO_TIMESTAMP('2023-12-08 06:18:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53108
;
-- Dec 8, 2023, 6:18:26 AM CST
UPDATE AD_Process SET Name='Invoice Detail and Margin',Updated=TO_TIMESTAMP('2023-12-08 06:18:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=152
;
-- Dec 8, 2023, 6:18:50 AM CST
UPDATE AD_Process SET Name='Multi Level BOM and Formula Detail',Updated=TO_TIMESTAMP('2023-12-08 06:18:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=53006
;
-- Dec 8, 2023, 6:21:16 AM CST
UPDATE AD_Form SET Name='Order Receipt and Issue', Description='Order Receipt and Issue',Updated=TO_TIMESTAMP('2023-12-08 06:21:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=53007
;
-- Dec 8, 2023, 6:21:22 AM CST
UPDATE AD_Process SET Name='Print and Release Order',Updated=TO_TIMESTAMP('2023-12-08 06:21:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=53034
;
-- Dec 8, 2023, 6:23:10 AM CST
UPDATE AD_Process SET Name='Create Window, Tab and Field from Table', Description='Create Window, Tab and Field record of the Table',Updated=TO_TIMESTAMP('2023-12-08 06:23:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=200118
;
-- Dec 8, 2023, 6:23:15 AM CST
UPDATE AD_Process SET Name='Create and Invite',Updated=TO_TIMESTAMP('2023-12-08 06:23:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=261
;
-- Dec 8, 2023, 6:23:18 AM CST
UPDATE AD_Process SET Name='Invite and Remind',Updated=TO_TIMESTAMP('2023-12-08 06:23:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=262
;

119
migration/iD11/postgresql/202312080607_IDEMPIERE-5932.sql Normal file
View File

@ -0,0 +1,119 @@
-- IDEMPIERE-5932 - better menu and window names
SELECT register_migration_script('202312080607_IDEMPIERE-5932.sql') FROM dual;
-- Dec 8, 2023, 6:07:00 AM CST
UPDATE AD_Menu SET Name='Quote-to-Invoice (Sales) ',Updated=TO_TIMESTAMP('2023-12-08 06:07:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=166
;
-- Dec 8, 2023, 6:07:22 AM CST
UPDATE AD_Menu SET Name='Requisition-to-Invoice (Purchasing)',Updated=TO_TIMESTAMP('2023-12-08 06:07:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=203
;
-- Dec 8, 2023, 6:08:15 AM CST
UPDATE AD_Menu SET Name='Open Items (Financial Movements and Aging)',Updated=TO_TIMESTAMP('2023-12-08 06:08:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=236
;
-- Dec 8, 2023, 6:08:21 AM CST
UPDATE AD_Process SET Name='Open Items (Aging)', Description='Open Items (Invoice and Aging) List', Help='Displays all unpaid invoices for a given Business Partner and date range.', Updated=TO_TIMESTAMP('2023-12-08 06:08:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=145
;
-- Dec 8, 2023, 6:08:39 AM CST
UPDATE AD_Menu SET Name='Material Management and Pricing',Updated=TO_TIMESTAMP('2023-12-08 06:08:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=183
;
-- Dec 8, 2023, 6:10:46 AM CST
UPDATE AD_Menu SET Name='Performance Analysis and Accounting',Updated=TO_TIMESTAMP('2023-12-08 06:10:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=278
;
-- Dec 8, 2023, 6:11:40 AM CST
UPDATE AD_Window SET Name='Bill of Materials and Formula',Updated=TO_TIMESTAMP('2023-12-08 06:11:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=53006
;
-- Dec 8, 2023, 6:11:46 AM CST
UPDATE AD_Window SET Name='Report and Process',Updated=TO_TIMESTAMP('2023-12-08 06:11:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=165
;
-- Dec 8, 2023, 6:11:52 AM CST
UPDATE AD_Window SET Name='Warehouse and Locators',Updated=TO_TIMESTAMP('2023-12-08 06:11:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=139
;
-- Dec 8, 2023, 6:11:57 AM CST
UPDATE AD_Window SET Name='Window, Tab and Field',Updated=TO_TIMESTAMP('2023-12-08 06:11:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=102
;
-- Dec 8, 2023, 6:12:46 AM CST
UPDATE AD_Window SET Name='Inventory Decrease/Increase', Description='Enter Inventory Decrease/Increase (for example Internal Use of Inventory)', Updated=TO_TIMESTAMP('2023-12-08 06:12:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=341
;
-- Dec 8, 2023, 6:13:01 AM CST
UPDATE AD_Window SET Name='Payment and Receipt',Updated=TO_TIMESTAMP('2023-12-08 06:13:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=195
;
-- Dec 8, 2023, 6:15:33 AM CST
UPDATE AD_Window SET Name='Sales Invoice and Credit/Debit Note', Description='Customer Sales Invoice and Credit/Debit Note', Updated=TO_TIMESTAMP('2023-12-08 06:15:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=167
;
-- Dec 8, 2023, 6:15:56 AM CST
UPDATE AD_Window SET Name='Purchase Invoice and Credit/Debit Note', Description='Vendor Purchase Invoice and Credit/Debit Note', Updated=TO_TIMESTAMP('2023-12-08 06:15:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=183
;
-- Dec 8, 2023, 6:16:25 AM CST
UPDATE AD_Window SET Name='Account Element (Chart of Accounts)',Updated=TO_TIMESTAMP('2023-12-08 06:16:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=118
;
-- Dec 8, 2023, 6:17:30 AM CST
UPDATE AD_Process SET Name='Bill of Material and Formula Cost Roll-Up',Updated=TO_TIMESTAMP('2023-12-08 06:17:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=53062
;
-- Dec 8, 2023, 6:17:36 AM CST
UPDATE AD_Menu SET Name='Bill of Material and Formulas', Description='Bill of Material and Formulas',Updated=TO_TIMESTAMP('2023-12-08 06:17:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53022
;
-- Dec 8, 2023, 6:17:41 AM CST
UPDATE AD_Workflow SET Name='Bill of Material and Formula Setup',Updated=TO_TIMESTAMP('2023-12-08 06:17:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=50002
;
-- Dec 8, 2023, 6:17:46 AM CST
UPDATE AD_Form SET Name='BOM and Formula Info',Updated=TO_TIMESTAMP('2023-12-08 06:17:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=53001
;
-- Dec 8, 2023, 6:17:54 AM CST
UPDATE AD_Process SET Name='Cost Workflow and Process Details',Updated=TO_TIMESTAMP('2023-12-08 06:17:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=53060
;
-- Dec 8, 2023, 6:17:59 AM CST
UPDATE AD_Form SET Name='Generate Shipments and Invoices (manual)',Updated=TO_TIMESTAMP('2023-12-08 06:17:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=53010
;
-- Dec 8, 2023, 6:18:09 AM CST
UPDATE AD_Menu SET Name='Human Resource and Payroll', Description='Human Resource and Payroll',Updated=TO_TIMESTAMP('2023-12-08 06:18:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53108
;
-- Dec 8, 2023, 6:18:26 AM CST
UPDATE AD_Process SET Name='Invoice Detail and Margin',Updated=TO_TIMESTAMP('2023-12-08 06:18:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=152
;
-- Dec 8, 2023, 6:18:50 AM CST
UPDATE AD_Process SET Name='Multi Level BOM and Formula Detail',Updated=TO_TIMESTAMP('2023-12-08 06:18:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=53006
;
-- Dec 8, 2023, 6:21:16 AM CST
UPDATE AD_Form SET Name='Order Receipt and Issue', Description='Order Receipt and Issue',Updated=TO_TIMESTAMP('2023-12-08 06:21:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Form_ID=53007
;
-- Dec 8, 2023, 6:21:22 AM CST
UPDATE AD_Process SET Name='Print and Release Order',Updated=TO_TIMESTAMP('2023-12-08 06:21:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=53034
;
-- Dec 8, 2023, 6:23:10 AM CST
UPDATE AD_Process SET Name='Create Window, Tab and Field from Table', Description='Create Window, Tab and Field record of the Table',Updated=TO_TIMESTAMP('2023-12-08 06:23:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=200118
;
-- Dec 8, 2023, 6:23:15 AM CST
UPDATE AD_Process SET Name='Create and Invite',Updated=TO_TIMESTAMP('2023-12-08 06:23:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=261
;
-- Dec 8, 2023, 6:23:18 AM CST
UPDATE AD_Process SET Name='Invite and Remind',Updated=TO_TIMESTAMP('2023-12-08 06:23:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=262
;

12
org.adempiere.base/src/org/compiere/model/MTreeFavorite.java
View File

@ -30,11 +30,10 @@ import org.compiere.util.Util;
*/
public class MTreeFavorite extends X_AD_Tree_Favorite
{
/**
*
*/
private static final long serialVersionUID = 6849737702264230347L;
private static final long serialVersionUID = 1468891496751650494L;
public static final String SQL_GET_TREE_FAVORITE_ID = "SELECT AD_Tree_Favorite_ID FROM AD_Tree_Favorite WHERE IsActive='Y' AND AD_User_ID=?";
@ -110,6 +109,7 @@ public class MTreeFavorite extends X_AD_Tree_Favorite
int parentID = rs.getInt(2);
int seqNo = rs.getInt(3);
String name = rs.getString(4);
String description = null;
boolean isSummary = (rs.getString(5).equals("Y"));
boolean isCollapsible = rs.getString(7).equals("Y");
boolean isFavourite = rs.getString("IsFavourite").equals("Y");
@ -126,12 +126,13 @@ public class MTreeFavorite extends X_AD_Tree_Favorite
if (access != null)
{
name = menu.getDisplayedName();
description = menu.get_Translation(MMenu.COLUMNNAME_Description);
img = menu.getAction();
}
}
if (access != null || isSummary)
addToTree(nodeID, parentID, seqNo, name, menuID, img, isSummary, isCollapsible, isFavourite);
addToTree(nodeID, parentID, seqNo, name, description, menuID, img, isSummary, isCollapsible, isFavourite);
}
}
catch (SQLException e)
@ -154,16 +155,17 @@ public class MTreeFavorite extends X_AD_Tree_Favorite
* @param parentID
* @param seqNo
* @param name
* @param description
* @param menuID
* @param imgSrc
* @param isSummary
* @param isCollapsible
* @param isFavourite
*/
private void addToTree( int favNodeID, int parentID, int seqNo, String name, int menuID, String imgSrc, boolean isSummary, boolean isCollapsible,
private void addToTree( int favNodeID, int parentID, int seqNo, String name, String description, int menuID, String imgSrc, boolean isSummary, boolean isCollapsible,
boolean isFavourite)
{
MTreeNode child = new MTreeNode(favNodeID, seqNo, name, name, parentID, menuID, imgSrc, isSummary, isCollapsible, isFavourite);
MTreeNode child = new MTreeNode(favNodeID, seqNo, name, description, parentID, menuID, imgSrc, isSummary, isCollapsible, isFavourite);
MTreeNode parent = null;
if (root != null)

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
View File

@ -306,20 +306,23 @@ public class DPFavourites extends DashboardPanel implements EventListener<Event>
public static void addNodeInTree(FavoriteSimpleTreeModel treeModel, Tree tree, DefaultTreeNode<Object> parentDTN, MTreeFavoriteNode favNode)
{
String name = null;
String description = null;
String action = null;
if (favNode.getAD_Menu_ID() > 0)
{
MMenu menu = (MMenu) MTable.get(Env.getCtx(), MMenu.Table_ID).getPO(favNode.getAD_Menu_ID(), null);
name = menu.getDisplayedName();
description = menu.get_Translation(MMenu.COLUMNNAME_Description);
action = menu.getAction();
}
else
{
name = favNode.getName();
description = name;
}
MTreeNode mtnNew = new MTreeNode( favNode.getAD_Tree_Favorite_Node_ID(), favNode.getSeqNo(), name, name, favNode.getParent_ID(), favNode.getAD_Menu_ID(),
MTreeNode mtnNew = new MTreeNode( favNode.getAD_Tree_Favorite_Node_ID(), favNode.getSeqNo(), name, description, favNode.getParent_ID(), favNode.getAD_Menu_ID(),
action, favNode.isSummary(), favNode.isCollapsible(), favNode.isFavourite());
DefaultTreeNode<Object> newNode = new DefaultTreeNode<Object>(mtnNew);