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

IDEMPIERE-1750:Restore M_ProductionPlan backward compatibility

This commit is contained in:
hieplq 2016-02-01 22:42:42 +07:00
parent 7cbee09a69
commit 7d437aee54
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
org.adempiere.base/src/org/compiere/acct/Doc_Production.java
View File

@ -76,11 +76,23 @@ public class Doc_Production extends Doc
private DocLine[] loadLines(X_M_Production prod)
{
ArrayList<DocLine> list = new ArrayList<DocLine>();
// Production
// -- ProductionLine - the real level
String sqlPL = "SELECT * FROM M_ProductionLine pl "
+ "WHERE pl.M_Production_ID=? "
+ "ORDER BY pl.Line";
String sqlPL = null;
if (prod.isUseProductionPlan()){
// Production
// -- ProductionLine - the real level
sqlPL = "SELECT * FROM "
+ " M_ProductionLine pro_line INNER JOIN M_ProductionPlan plan ON pro_line.M_ProductionPlan_id = plan.M_ProductionPlan_id "
+ " INNER JOIN M_Production pro ON pro.M_Production_id = plan.M_Production_id "
+ " WHERE pro.M_Production_ID=? "
+ " ORDER BY pro_line.Line";
}else{
// Production
// -- ProductionLine - the real level
sqlPL = "SELECT * FROM M_ProductionLine pl "
+ "WHERE pl.M_Production_ID=? "
+ "ORDER BY pl.Line";
}
PreparedStatement pstmtPL = null;
ResultSet rsPL = null;
try