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

* [ 1643986 ] Generation of Invoice shoud be done in atomic transaction

This commit is contained in:
Heng Sin Low 2007-03-01 15:10:55 +00:00
parent 29f41ff0c7
commit a8675a8755
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
base/src/org/compiere/process/InvoiceGenerate.java
View File

@ -111,9 +111,11 @@ public class InvoiceGenerate extends SvrProcess
String sql = null;
if (p_Selection) // VInvoiceGen
{
sql = "SELECT * FROM C_Order "
+ "WHERE IsSelected='Y' AND DocStatus='CO' AND IsSOTrx='Y' "
+ "ORDER BY M_Warehouse_ID, PriorityRule, C_BPartner_ID, C_Order_ID";
sql = "SELECT C_Order.* FROM C_Order, T_Selection "
+ "WHERE C_Order.DocStatus='CO' AND C_Order.IsSOTrx='Y' "
+ "AND C_Order.C_Order_ID = T_Selection.T_Selection_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";
}
else
{
@ -137,13 +139,20 @@ public class InvoiceGenerate extends SvrProcess
{
pstmt = DB.prepareStatement (sql, get_TrxName());
int index = 1;
if (!p_Selection && p_AD_Org_ID != 0)
if (p_Selection)
{
pstmt.setInt(index, getAD_PInstance_ID());
}
else
{
if (p_AD_Org_ID != 0)
pstmt.setInt(index++, p_AD_Org_ID);
if (!p_Selection && p_C_BPartner_ID != 0)
if (p_C_BPartner_ID != 0)
pstmt.setInt(index++, p_C_BPartner_ID);
if (!p_Selection && p_C_Order_ID != 0)
if (p_C_Order_ID != 0)
pstmt.setInt(index++, p_C_Order_ID);
}
}
catch (Exception e)
{
log.log(Level.SEVERE, sql, e);