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

IDEMPIERE-5724 Cannot add Related Info Window to Info Product (#1838)

This commit is contained in:
Carlos Ruiz 2023-05-20 16:11:18 +02:00 committed by GitHub
parent df06938191
commit e945e7e3c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
View File

@ -53,8 +53,10 @@ import org.adempiere.webui.panel.InvoiceHistory;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.compiere.minigrid.ColumnInfo; import org.compiere.minigrid.ColumnInfo;
import org.compiere.minigrid.EmbedWinInfo;
import org.compiere.model.GridField; import org.compiere.model.GridField;
import org.compiere.model.MDocType; import org.compiere.model.MDocType;
import org.compiere.model.MInfoWindow;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.util.DB; import org.compiere.util.DB;
@ -316,7 +318,7 @@ public class InfoProductWindow extends InfoWindow {
Tabs tabs = new Tabs(); Tabs tabs = new Tabs();
tabbedPane.appendChild(tabs); tabbedPane.appendChild(tabs);
Tab tab = new Tab(Util.cleanAmp(Msg.translate(Env.getCtx(), "Warehouse"))); Tab tab = new Tab(Util.cleanAmp(Msg.translate(Env.getCtx(), "WarehouseStock")));
tabs.appendChild(tab); tabs.appendChild(tab);
Tabpanel desktopTabPanel = new Tabpanel(); Tabpanel desktopTabPanel = new Tabpanel();
ZKUpdateUtil.setHeight(desktopTabPanel, "100%"); ZKUpdateUtil.setHeight(desktopTabPanel, "100%");
@ -397,8 +399,8 @@ public class InfoProductWindow extends InfoWindow {
ZKUpdateUtil.setHeight(south, detailHeight + "px"); ZKUpdateUtil.setHeight(south, detailHeight + "px");
south.setCollapsible(true); south.setCollapsible(true);
south.setSplittable(true); south.setSplittable(true);
south.setTitle(Msg.translate(Env.getCtx(), "WarehouseStock")); south.setTitle(Msg.translate(Env.getCtx(), "Related Information"));
south.setTooltiptext(Msg.translate(Env.getCtx(), "WarehouseStock")); south.setTooltiptext(Msg.translate(Env.getCtx(), "Related Information"));
south.setSclass("south-collapsible-with-title"); south.setSclass("south-collapsible-with-title");
if (ClientInfo.maxHeight(ClientInfo.MEDIUM_HEIGHT-1)) if (ClientInfo.maxHeight(ClientInfo.MEDIUM_HEIGHT-1))
{ {
@ -446,6 +448,22 @@ public class InfoProductWindow extends InfoWindow {
relatedTbl.repaint(); relatedTbl.repaint();
productpriceTbl.repaint(); productpriceTbl.repaint();
m_tableAtp.repaint(); m_tableAtp.repaint();
// add related info windows
if (embeddedWinList.size() > 0) {
for (EmbedWinInfo embeddedWin : embeddedWinList) {
if (embeddedWin.getInfoTbl() instanceof WListbox) {
tab = new Tab(embeddedWin.getInfowin().get_Translation(MInfoWindow.COLUMNNAME_Name));
tabs.appendChild(tab);
desktopTabPanel = new Tabpanel();
ZKUpdateUtil.setHeight(desktopTabPanel, "100%");
desktopTabPanel.appendChild( (WListbox) embeddedWin.getInfoTbl() );
tabPanels.appendChild(desktopTabPanel);
((WListbox)embeddedWin.getInfoTbl()).repaint();
}
}
}// render embedded
} }
/** /**