details: /erp/devel/pi/rev/ee3932c7d519
changeset: 11442:ee3932c7d519
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Sun Apr 03 17:21:32 2011 +0200
summary: Fixes issue 16625: Create invoices from orders is wrong
diffstat:
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql | 7
++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (24 lines):
diff -r fde0a5fe03ea -r ee3932c7d519
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
Sun Apr 03 15:12:24 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
Sun Apr 03 17:21:32 2011 +0200
@@ -60,16 +60,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,
amountlinesgross as amountlines, notinvoicedlinesgross as
notinvoicedlines, l.Name as TermName, l.Value as TermValue, pendinglinesgross
as pendinglines,
ic.qtyordered as qtyordered, ic.qtydelivered as qtydelivered,
(amountlinesgross-notinvoicedlinesgross) as linesinvoiced, amountlinesgross as
totalgross
- 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')
------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself;
WebMatrix provides all the features you need to develop and
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
