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

Fix bug on InvoiceGenerate: 

- process is consolidating by order bill location, but was not ordering by the consolidating column
This commit is contained in:
Carlos Ruiz 2011-03-08 10:53:33 -05:00
parent af5bcc0a16
commit 5071651358
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java
View File

@ -131,7 +131,7 @@ public class InvoiceGenerate extends SvrProcess
+ "WHERE C_Order.DocStatus='CO' AND C_Order.IsSOTrx='Y' " + "WHERE C_Order.DocStatus='CO' AND C_Order.IsSOTrx='Y' "
+ "AND C_Order.C_Order_ID = T_Selection.T_Selection_ID " + "AND C_Order.C_Order_ID = T_Selection.T_Selection_ID "
+ "AND T_Selection.AD_PInstance_ID=? " + "AND T_Selection.AD_PInstance_ID=? "
+ "ORDER BY C_Order.M_Warehouse_ID, C_Order.PriorityRule, C_Order.C_BPartner_ID, C_Order.C_Order_ID"; + "ORDER BY C_Order.M_Warehouse_ID, C_Order.PriorityRule, C_Order.C_BPartner_ID, C_Order.Bill_Location_ID, C_Order.C_Order_ID";
} }
else else
{ {
@ -148,7 +148,7 @@ public class InvoiceGenerate extends SvrProcess
+ "WHERE o.C_Order_ID=ol.C_Order_ID AND ol.QtyOrdered<>ol.QtyInvoiced) " + "WHERE o.C_Order_ID=ol.C_Order_ID AND ol.QtyOrdered<>ol.QtyInvoiced) "
+ "AND o.C_DocType_ID IN (SELECT C_DocType_ID FROM C_DocType " + "AND o.C_DocType_ID IN (SELECT C_DocType_ID FROM C_DocType "
+ "WHERE DocBaseType='SOO' AND DocSubTypeSO NOT IN ('ON','OB','WR')) " + "WHERE DocBaseType='SOO' AND DocSubTypeSO NOT IN ('ON','OB','WR')) "
+ "ORDER BY M_Warehouse_ID, PriorityRule, C_BPartner_ID, C_Order_ID"; + "ORDER BY M_Warehouse_ID, PriorityRule, C_BPartner_ID, Bill_Location_ID, C_Order_ID";
} }
// sql += " FOR UPDATE"; // sql += " FOR UPDATE";