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

IDEMPIERE-524 Product Info Windows, Description Tab does not show DocumentNote

This commit is contained in:
Hesham S. Ahmed 2012-12-20 11:25:51 -05:00
parent ceb17510e3
commit 506e1eb6fd
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java
View File

@ -437,8 +437,26 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
pstmt = DB.prepareStatement(sql, null);
pstmt.setString(1, (String)obj);
rs = pstmt.executeQuery();
fieldDescription.setText("");
warehouseTbl.loadTable(rs);
}
catch (Exception e)
{
log.log(Level.WARNING, sql, e);
}
finally
{
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
m_M_Product_ID = getSelectedRowKey();
sql = "SELECT DocumentNote FROM M_Product WHERE M_Product_ID = ?;";
try
{
pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, m_M_Product_ID);
fieldDescription.setText("");
rs = pstmt.executeQuery();
if(rs.next())
if(rs.getString("DocumentNote") != null)
@ -453,9 +471,7 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
m_M_Product_ID = getSelectedRowKey();
sql = m_sqlSubstitute;
log.finest(sql);
try {

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
View File

@ -673,8 +673,26 @@ public class InfoProductPanel extends InfoPanel implements EventListener<Event>
pstmt = DB.prepareStatement(sql, null);
pstmt.setString(1, (String)obj);
rs = pstmt.executeQuery();
fieldDescription.setText("");
warehouseTbl.loadTable(rs);
}
catch (Exception e)
{
log.log(Level.WARNING, sql, e);
}
finally
{
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
m_M_Product_ID = getSelectedRowKey();
sql = "SELECT DocumentNote FROM M_Product WHERE M_Product_ID = ?;";
try
{
pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, m_M_Product_ID);
fieldDescription.setText("");
rs = pstmt.executeQuery();
if(rs.next())
if(rs.getString("DocumentNote") != null)
@ -690,8 +708,6 @@ public class InfoProductPanel extends InfoPanel implements EventListener<Event>
rs = null; pstmt = null;
}
m_M_Product_ID = getSelectedRowKey();
sql = m_sqlSubstitute;
log.finest(sql);
try {