details: https://code.openbravo.com/erp/stable/2.50/rev/c978db09cc26
changeset: 9894:c978db09cc26
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Tue Sep 04 10:39:26 2012 +0200
summary: Fixes issue 21504: The create lines from pop-up of Goods Receipt
do not show the value of the attribute in invoice lines
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql |
13 ++++++---
1 files changed, 9 insertions(+), 4 deletions(-)
diffs (44 lines):
diff -r 0a548ca8374d -r c978db09cc26
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
Mon Sep 03 18:21:23 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
Tue Sep 04 10:39:26 2012 +0200
@@ -278,7 +278,8 @@
AND C_UOM_CONVERSION.C_UOM_TO_ID = l.C_UOM_ID),1))
as SECQTY, l.M_PRODUCT_UOM_ID as SEC_PRODUCT_UOM_ID,
(SELECT C_UOM.NAME FROM M_PRODUCT_UOM, C_UOM WHERE M_PRODUCT_UOM_ID =
l.M_PRODUCT_UOM_ID AND M_PRODUCT_UOM.C_UOM_ID = C_UOM.C_UOM_ID) as SECUOMSYMBOL,
- COALESCE(l.M_PRODUCT_UOM_ID,null,'0') as HAVESEC,'' as HAVESECUOM,''
AS LOCATOR
+ COALESCE(l.M_PRODUCT_UOM_ID,null,'0') as HAVESEC,'' as HAVESECUOM,''
AS LOCATOR,l.M_ATTRIBUTESETINSTANCE_ID AS M_ATTRIBUTESETINSTANCE_ID,
+ (SELECT M_ATTRIBUTESETINSTANCE.DESCRIPTION FROM M_ATTRIBUTESETINSTANCE
WHERE l.M_ATTRIBUTESETINSTANCE_ID =
M_ATTRIBUTESETINSTANCE.M_ATTRIBUTESETINSTANCE_ID) as ATTRIBUTESETINSTANCENAME
FROM C_INVOICELINE l left join M_MATCHINV mi on
l.C_InvoiceLine_ID=mi.C_InvoiceLine_ID,
C_INVOICE i, C_UOM uom, M_PRODUCT p
WHERE i.C_INVOICE_ID = l.C_INVOICE_ID
@@ -290,7 +291,7 @@
AND l.M_Product_ID=p.M_Product_ID
AND l.C_Invoice_ID = ?
GROUP BY i.C_Invoice_ID, i.DocumentNo, DateInvoiced, GrandTotal,
l.QtyInvoiced,
- l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,
l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID, l.DESCRIPTION,l.QUANTITYORDER,
l.M_PRODUCT_UOM_ID
+ l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,
l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID, l.DESCRIPTION,l.QUANTITYORDER,
l.M_PRODUCT_UOM_ID,l.M_ATTRIBUTESETINSTANCE_ID
HAVING (l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))) <> 0
ORDER BY NAME, l.Line
]]>
@@ -395,7 +396,10 @@
AND C_UOM_CONVERSION.C_UOM_TO_ID = l.C_UOM_ID),1))
as SECQTY, l.M_PRODUCT_UOM_ID as SEC_PRODUCT_UOM_ID,
(SELECT C_UOM.NAME FROM M_PRODUCT_UOM, C_UOM WHERE M_PRODUCT_UOM_ID =
l.M_PRODUCT_UOM_ID AND M_PRODUCT_UOM.C_UOM_ID = C_UOM.C_UOM_ID) as SECUOMSYMBOL,
- COALESCE(l.M_PRODUCT_UOM_ID,null,'0') as HAVESEC,'' as HAVESECUOM,''
AS LOCATOR
+ COALESCE(l.M_PRODUCT_UOM_ID,null,'0') as HAVESEC,'' as HAVESECUOM,''
AS LOCATOR,
+ l.M_ATTRIBUTESETINSTANCE_ID AS M_ATTRIBUTESETINSTANCE_ID,
+ (SELECT M_ATTRIBUTESETINSTANCE.DESCRIPTION FROM M_ATTRIBUTESETINSTANCE
+ WHERE l.M_ATTRIBUTESETINSTANCE_ID =
M_ATTRIBUTESETINSTANCE.M_ATTRIBUTESETINSTANCE_ID) as ATTRIBUTESETINSTANCENAME
FROM C_UOM uom left join C_UOM_TRL uomt on uom.C_UOM_ID = uomt.C_UOM_ID
AND uomt.AD_Language = ?,
C_INVOICELINE l left join M_MATCHINV mi on
l.C_InvoiceLine_ID=mi.C_InvoiceLine_ID,
@@ -409,7 +413,8 @@
AND l.M_Product_ID=p.M_Product_ID
AND l.C_Invoice_ID = ?
GROUP BY i.C_Invoice_ID, i.DocumentNo, DateInvoiced, GrandTotal,
l.QtyInvoiced,
- l.C_UOM_ID,uom.UOMSymbol, uomt.UOMSymbol,l.M_Product_ID,p.NAME,
l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID, l.DESCRIPTION, l.QUANTITYORDER,
l.M_PRODUCT_UOM_ID
+ l.C_UOM_ID,uom.UOMSymbol, uomt.UOMSymbol,l.M_Product_ID,p.NAME,
l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID,
+ l.DESCRIPTION, l.QUANTITYORDER,
l.M_PRODUCT_UOM_ID,l.M_ATTRIBUTESETINSTANCE_ID
HAVING (l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))) <> 0
ORDER BY NAME, l.Line
]]>
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
