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

IDEMPIERE-683 window "invoice schedule" not shows records in Report. Base on patch from Richard Morales Herrera.

This commit is contained in:
Heng Sin Low 2013-04-27 08:03:53 +08:00
parent 1e00ab52ff
commit 58effe2266
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.adempiere.base/src/org/compiere/print/DataEngine.java
View File

@ -423,10 +423,7 @@ public class DataEngine
groupByColumns.add(m_synonym+".Name"); groupByColumns.add(m_synonym+".Name");
orderName = m_synonym + "Name"; orderName = m_synonym + "Name";
// => x JOIN AD_Ref_List A ON (x.KeyColumn=A.Value AND A.AD_Reference_ID=123) // => x JOIN AD_Ref_List A ON (x.KeyColumn=A.Value AND A.AD_Reference_ID=123)
if (IsMandatory) sqlFROM.append(" LEFT OUTER JOIN ");
sqlFROM.append(" INNER JOIN ");
else
sqlFROM.append(" LEFT OUTER JOIN ");
sqlFROM.append("AD_Ref_List ").append(m_synonym).append(" ON (") sqlFROM.append("AD_Ref_List ").append(m_synonym).append(" ON (")
.append(lookupSQL).append("=").append(m_synonym).append(".Value") .append(lookupSQL).append("=").append(m_synonym).append(".Value")
.append(" AND ").append(m_synonym).append(".AD_Reference_ID=").append(AD_Reference_Value_ID).append(")"); .append(" AND ").append(m_synonym).append(".AD_Reference_ID=").append(AD_Reference_Value_ID).append(")");
@ -440,18 +437,12 @@ public class DataEngine
// LEFT OUTER JOIN AD_Ref_List XA ON (AD_Table.EntityType=XA.Value AND XA.AD_Reference_ID=245) // LEFT OUTER JOIN AD_Ref_List XA ON (AD_Table.EntityType=XA.Value AND XA.AD_Reference_ID=245)
// LEFT OUTER JOIN AD_Ref_List_Trl A ON (XA.AD_Ref_List_ID=A.AD_Ref_List_ID AND A.AD_Language='de_DE') // LEFT OUTER JOIN AD_Ref_List_Trl A ON (XA.AD_Ref_List_ID=A.AD_Ref_List_ID AND A.AD_Language='de_DE')
if (IsMandatory) sqlFROM.append(" LEFT OUTER JOIN ");
sqlFROM.append(" INNER JOIN ");
else
sqlFROM.append(" LEFT OUTER JOIN ");
sqlFROM.append(" AD_Ref_List X").append(m_synonym).append(" ON (") sqlFROM.append(" AD_Ref_List X").append(m_synonym).append(" ON (")
.append(lookupSQL).append("=X") .append(lookupSQL).append("=X")
.append(m_synonym).append(".Value AND X").append(m_synonym).append(".AD_Reference_ID=").append(AD_Reference_Value_ID) .append(m_synonym).append(".Value AND X").append(m_synonym).append(".AD_Reference_ID=").append(AD_Reference_Value_ID)
.append(")"); .append(")");
if (IsMandatory) sqlFROM.append(" LEFT OUTER JOIN ");
sqlFROM.append(" INNER JOIN ");
else
sqlFROM.append(" LEFT OUTER JOIN ");
sqlFROM.append(" AD_Ref_List_Trl ").append(m_synonym).append(" ON (X") sqlFROM.append(" AD_Ref_List_Trl ").append(m_synonym).append(" ON (X")
.append(m_synonym).append(".AD_Ref_List_ID=").append(m_synonym).append(".AD_Ref_List_ID") .append(m_synonym).append(".AD_Ref_List_ID=").append(m_synonym).append(".AD_Ref_List_ID")
.append(" AND ").append(m_synonym).append(".AD_Language='").append(m_language.getAD_Language()).append("')"); .append(" AND ").append(m_synonym).append(".AD_Language='").append(m_language.getAD_Language()).append("')");