details: /erp/devel/pi/rev/3cc59dc273be
changeset: 7997:3cc59dc273be
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Fri Jul 30 10:15:06 2010 +0530
summary: Fixes Issue 13944: Completed Sales Orders still appear on 'Create
Lines From' and 'Generate Invoices from Orders'
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 5
+++--
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql | 7
++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diffs (43 lines):
diff -r eb76ac1b1a84 -r 3cc59dc273be
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Fri Jul 30 01:27:59 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Fri Jul 30 10:15:06 2010 +0530
@@ -114,12 +114,13 @@
<Sql>
<![CDATA[
SELECT o.C_ORDER_ID as ID, Ad_Column_Identifier(to_char('C_Order'),
to_char(o.c_order_id), to_char(?)) AS NAME
- FROM C_INVOICE_CANDIDATE_V ic, C_ORDER o
+ FROM C_INVOICE_CANDIDATE_V ic, C_ORDER o
WHERE o.C_ORDER_ID = ic.C_ORDER_ID
AND ic.AD_Client_ID IN ('1')
AND ic.AD_Org_ID IN ('1')
AND ic.C_BPartner_ID = ?
- AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I') OR
(ic.term <> 'N' AND (ic.term IN ('O','S') AND (ic.qtyordered = ic.qtydelivered)
)) )
+ AND o.C_Order_Id = ic.C_Order_Id
+ AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I' AND
(SELECT SUM(ol.QTYORDERED)-SUM(ol.QTYINVOICED) FROM C_ORDERLINE ol WHERE
ol.C_ORDER_ID = o.C_ORDER_ID) <> 0) OR (ic.term <> 'N' AND (ic.term IN
('O','S') AND (ic.qtyordered = ic.qtydelivered) )) )
GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal
ORDER BY NAME
]]>
diff -r eb76ac1b1a84 -r 3cc59dc273be
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
Fri Jul 30 01:27:59 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
Fri Jul 30 10:15:06 2010 +0530
@@ -28,16 +28,17 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT C_Order_ID, o.Name as adorgname, COALESCE(dttrl.Name, dt.Name) as
cdoctypename, DocumentNo, bp.Name as cbpartnername, DateOrdered,
+ SELECT ic.C_Order_ID, o.Name as adorgname, COALESCE(dttrl.Name, dt.Name)
as cdoctypename, ic.DocumentNo, bp.Name as cbpartnername, ic.DateOrdered,
amountlines, notinvoicedlines, l.Name as TermName, l.Value as TermValue,
pendinglines as pendinglines, '' as amountlinesgross, '' as
notinvoicedlinesgross,
'' as pendinglinesgross, ic.qtyordered as qtyordered, ic.qtydelivered as
qtydelivered
- FROM C_Invoice_Candidate_v ic, AD_Org o, C_BPartner bp, AD_Ref_List l
left join AD_Ref_List_trl ltrl on l.AD_Ref_List_ID=ltrl.AD_Ref_List_ID and
ltrl.ad_language=?,
+ FROM C_Invoice_Candidate_v ic, C_ORDER ord, AD_Org o, C_BPartner bp,
AD_Ref_List l left join AD_Ref_List_trl ltrl on
l.AD_Ref_List_ID=ltrl.AD_Ref_List_ID and ltrl.ad_language=?,
C_DocType dt left join C_DocType_trl dttrl on
dt.C_DocType_ID=dttrl.C_DocType_ID AND dttrl.ad_language=?
WHERE ic.AD_Org_ID=o.AD_Org_ID
AND ic.C_BPartner_ID=bp.C_BPartner_ID
AND ic.C_DocType_ID=dt.C_DocType_ID
AND l.value = ic.term
- AND ic.term <> 'N'
+ AND ord.C_ORDER_ID=ic.C_ORDER_ID
+ AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I' AND
(SELECT SUM(ol.QTYORDERED)-SUM(ol.QTYINVOICED) FROM C_ORDERLINE ol WHERE
ol.C_ORDER_ID = ord.C_ORDER_ID) <> 0) OR (ic.term <> 'N' AND (ic.term IN
('O','S') AND (ic.qtyordered = ic.qtydelivered) )) )
AND AD_Reference_ID='150'
AND ic.ad_client_id in ('1')
AND ic.ad_org_id in ('1')
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
