details: https://code.openbravo.com/erp/devel/pi/rev/f18674b4824a
changeset: 16238:f18674b4824a
user: Jon AlegrÃa <jon.alegria <at> openbravo.com>
date: Fri Apr 27 12:38:53 2012 +0200
summary: Fixes issue 0020204: Create lines from should use
ad_column_identifier to show
the product name.
Added several changes missing in several sql files, to complete de feature
request.
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java |
2 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql |
31 ++++++---
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql |
31 ++++++---
3 files changed, 42 insertions(+), 22 deletions(-)
diffs (truncated from 302 to 300 lines):
diff -r 0d30cd20c9f8 -r f18674b4824a
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Fri Apr
27 12:10:26 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Fri Apr
27 12:38:53 2012 +0200
@@ -1481,7 +1481,7 @@
data = CreateFromInvoiceData.selectFromPOUpdateSOTrx(conn, this,
vars.getLanguage(),
ids[k]);
else
- data = CreateFromInvoiceData.selectFromPOUpdate(conn, this,
strKey, vars.getLanguage(),
+ data = CreateFromInvoiceData.selectFromPOUpdate(conn, this,
vars.getLanguage(), strKey,
ids[k]);
}
if (data != null) {
diff -r 0d30cd20c9f8 -r f18674b4824a
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Fri Apr 27 12:10:26 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Fri Apr 27 12:38:53 2012 +0200
@@ -33,7 +33,7 @@
FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID =
CO.C_ORDERLINE_ID
WHERE CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id
GROUP BY CI.C_orderline_id , CO.QtyORDERED),0) AS QTY,
- l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME,
+ l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(l.m_product_id), to_char(?)) AS RELATION_NAME,
l.C_OrderLine_ID,l.Line, l.ad_org_id, '' as STDPRECISION,
'' as M_InOutLine_ID, '' AS PriceActual, '' AS PriceList, '' AS
PriceLimit, '' AS Description, '' as PriceStd,
'' AS QUANTITYORDER, '' AS M_Product_UOM_ID, '' AS
M_ATTRIBUTESETINSTANCE_ID, '' AS M_Offer_ID, '' AS PricePrecision,
@@ -63,6 +63,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="piId"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="o.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="o.AD_Org_ID IN (" text="'1'"/>
@@ -99,7 +100,8 @@
<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,o.DocumentNo AS NAMEORDER,
- l.QtyOrdered-COALESCE(l.QTYINVOICED,0) AS QTY,
l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME,
+ l.QtyOrdered-COALESCE(l.QTYINVOICED,0) AS QTY,
l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,
+ Ad_Column_Identifier(to_char('M_Product'), to_char(l.m_product_id),
to_char(?)) AS RELATION_NAME,
l.C_OrderLine_ID,l.Line, l.ad_Org_id, l.taxbaseamt
FROM C_INVOICE_CANDIDATE_V ic, C_UOM uom, C_ORDER o, C_ORDERLINE l,
M_PRODUCT p
WHERE l.C_UOM_ID=uom.C_UOM_ID
@@ -117,6 +119,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="ic.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="ic.AD_Org_ID IN (" text="'1'"/>
<Parameter name="poId"/>
@@ -153,7 +156,7 @@
WHERE CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id
GROUP BY CI.C_orderline_id , CO.QtyORDERED),0) AS QTY,
l.C_UOM_ID, COALESCE(uomt.UOMSYMBOL, uom.UOMSymbol) AS UOMSymbol,
- l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_OrderLine_ID,l.Line,
l.taxbaseamt
+ l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(l.m_product_id), to_char(?)) AS RELATION_NAME, l.C_OrderLine_ID,l.Line,
l.taxbaseamt
FROM C_UOM uom left join C_UOM_TRL uomt on uom.C_UOM_ID =
uomt.C_UOM_ID
and uomt.AD_Language = ?,
C_ORDERLINE l left join M_MATCHPO m on
l.C_OrderLine_ID=m.C_OrderLine_ID
@@ -183,9 +186,10 @@
<Field name="rownum" value="count"/>
<Parameter name="adLanguage"/>
<Parameter name="piId"/>
+ <Parameter name="adLanguage"/>
+ <Parameter name="adLanguage"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="o.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="o.AD_Org_ID IN (" text="'1'"/>
- <Parameter name="adLanguage"/>
<Parameter name="poId"/>
<Parameter name="piId"/>
</SqlMethod>
@@ -195,7 +199,7 @@
<![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,o.DocumentNo AS NAMEORDER,
l.QtyOrdered-COALESCE(l.QTYINVOICED,0) AS QTY, l.C_UOM_ID,
COALESCE(uomt.UOMSymbol, uom.UOMSymbol) AS UOMSymbol,
- l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_OrderLine_ID,l.Line,
l.taxbaseamt
+ l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(l.m_product_id), to_char(?)) AS RELATION_NAME, l.C_OrderLine_ID,l.Line,
l.taxbaseamt
FROM C_UOM uom left join C_UOM_TRL uomt on uom.C_UOM_ID = uomt.C_UOM_ID
and uomt.AD_Language = ?,
C_INVOICE_CANDIDATE_V ic, C_ORDER o, C_ORDERLINE l, M_PRODUCT p
@@ -214,6 +218,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="adLanguage"/>
+ <Parameter name="adLanguage"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="ic.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="ic.AD_Org_ID IN (" text="'1'"/>
<Parameter name="adLanguage"/>
@@ -300,7 +305,7 @@
<![CDATA[
SELECT s.M_InOut_ID AS ID, Ad_Column_Identifier(to_char('M_InOut'),
to_char(s.M_InOut_ID), to_char(?)) AS NAME,
s.DocumentNo AS NAMESHIPMENT,
- (l.MovementQty-SUM(COALESCE(mi.Qty,0))) AS QTY,
l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME||' '||(CASE WHEN ma.serno IS
NOT NULL THEN TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS
RELATION_NAME,
+ (l.MovementQty-SUM(COALESCE(mi.Qty,0))) AS QTY,
l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(l.m_product_id), to_char(?))||' '||(CASE WHEN ma.serno IS NOT NULL THEN
TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS RELATION_NAME,
l.M_InOutLine_ID,l.Line, l.M_InOutLine_ID as C_OrderLine_ID
FROM M_INOUTLINE l left join M_ATTRIBUTESETINSTANCE ma on
l.M_ATTRIBUTESETINSTANCE_ID = ma.M_ATTRIBUTESETINSTANCE_ID
left join M_MATCHINV mi on
l.M_InOutLine_ID=mi.M_InOutLine_ID,
@@ -321,6 +326,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="adLanguage"/>
+ <Parameter name="adLanguage"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="s.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="s.AD_Org_ID IN (" text="'1'"/>
<Parameter name="mInoutId"/>
@@ -357,7 +363,7 @@
<![CDATA[
SELECT s.M_InOut_ID AS ID, Ad_Column_Identifier(to_char('M_InOut'),
to_char(s.M_InOut_ID), to_char(?)) AS NAME,
s.DocumentNo AS NAMESHIPMENT,
- l.MovementQty AS QTY, l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,p.NAME||' '||(CASE WHEN ma.serno IS NOT NULL THEN TO_CHAR('('||'
'||ma.serno||' '||')') ELSE TO_CHAR('') END) AS RELATION_NAME,
l.M_InOutLine_ID,l.Line,
+ l.MovementQty AS QTY, l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(l.m_product_id), to_char(?))||' '||(CASE WHEN ma.serno IS NOT NULL THEN
TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS RELATION_NAME,
l.M_InOutLine_ID,l.Line,
l.M_InOutLine_ID as C_OrderLine_ID
FROM M_INOUTLINE l left join M_ATTRIBUTESETINSTANCE ma on
l.M_ATTRIBUTESETINSTANCE_ID = ma.M_ATTRIBUTESETINSTANCE_ID,
M_INOUT s, C_UOM uom, M_PRODUCT p
@@ -377,6 +383,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="adLanguage"/>
+ <Parameter name="adLanguage"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="s.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="s.AD_Org_ID IN (" text="'1'"/>
<Parameter name="mInoutId"/>
@@ -421,7 +428,7 @@
SELECT s.M_InOut_ID AS ID, Ad_Column_Identifier(to_char('M_InOut'),
to_char(s.M_InOut_ID), to_char(?)) AS NAME,
s.DocumentNo AS NAMESHIPMENT,
(l.MovementQty-SUM(COALESCE(mi.Qty,0))) AS QTY, l.C_UOM_ID,
COALESCE(uomt.UOMSymbol, uom.UOMSymbol) AS UOMSymbol,
- l.M_Product_ID,p.NAME||' '||(CASE WHEN ma.serno IS NOT NULL THEN
TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS RELATION_NAME,
l.M_InOutLine_ID,l.Line, l.M_InOutLine_ID as C_OrderLine_ID
+ l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(l.m_product_id), to_char(?))||' '||(CASE WHEN ma.serno IS NOT NULL THEN
TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS RELATION_NAME,
l.M_InOutLine_ID,l.Line, l.M_InOutLine_ID as C_OrderLine_ID
FROM M_INOUTLINE l left join M_ATTRIBUTESETINSTANCE ma on
l.M_ATTRIBUTESETINSTANCE_ID = ma.M_ATTRIBUTESETINSTANCE_ID
left join M_MATCHINV mi on
l.M_InOutLine_ID=mi.M_InOutLine_ID,
C_UOM uom left join C_UOM_TRL uomt on uom.C_UOM_ID
= uomt.C_UOM_ID
@@ -443,9 +450,10 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="adLanguage"/>
+ <Parameter name="adLanguage"/>
+ <Parameter name="adLanguage"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="s.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="s.AD_Org_ID IN (" text="'1'"/>
- <Parameter name="adLanguage"/>
<Parameter name="mInoutId"/>
</SqlMethod>
<SqlMethod name="selectFromShipmentTrlSOTrx" type="preparedStatement"
return="multiple">
@@ -455,7 +463,7 @@
SELECT s.M_InOut_ID AS ID, Ad_Column_Identifier(to_char('M_InOut'),
to_char(s.M_InOut_ID), to_char(?)) AS NAME,
s.DocumentNo AS NAMESHIPMENT,
l.MovementQty AS QTY, l.C_UOM_ID,COALESCE(uomt.UOMSymbol,
uom.UOMSymbol) AS UOMSymbol,
- l.M_Product_ID,p.NAME||' '|| (CASE WHEN ma.serno IS NOT NULL THEN
TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS RELATION_NAME,
l.M_InOutLine_ID,l.Line, l.M_InOutLine_ID as C_OrderLine_ID
+ l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(l.m_product_id), to_char(?))||' '|| (CASE WHEN ma.serno IS NOT NULL
THEN TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS
RELATION_NAME, l.M_InOutLine_ID,l.Line, l.M_InOutLine_ID as C_OrderLine_ID
FROM M_INOUTLINE l left join M_ATTRIBUTESETINSTANCE ma on
l.M_ATTRIBUTESETINSTANCE_ID = ma.M_ATTRIBUTESETINSTANCE_ID,
C_UOM uom left join C_UOM_TRL uomt on uom.C_UOM_ID
= uomt.C_UOM_ID
and
uomt.AD_Language = ? ,
@@ -476,9 +484,10 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="adLanguage"/>
+ <Parameter name="adLanguage"/>
+ <Parameter name="adLanguage"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="s.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="s.AD_Org_ID IN (" text="'1'"/>
- <Parameter name="adLanguage"/>
<Parameter name="mInoutId"/>
</SqlMethod>
<SqlMethod name="selectFromShipmentUpdate" type="preparedStatement"
connection="true" return="multiple">
diff -r 0d30cd20c9f8 -r f18674b4824a
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
Fri Apr 27 12:10:26 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
Fri Apr 27 12:38:53 2012 +0200
@@ -28,7 +28,8 @@
<Sql>
<![CDATA[
SELECT o.C_ORDER_ID, Ad_Column_Identifier(TO_CHAR('C_Order'),
TO_CHAR(o.c_order_id), TO_CHAR(?)) AS NAME,
- l.QtyOrdered-SUM(COALESCE(m.Qty,0)) AS QTY, l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,p.NAME AS RELATION_NAME,
+ l.QtyOrdered-SUM(COALESCE(m.Qty,0)) AS QTY, l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,
+ Ad_Column_Identifier(TO_CHAR('M_Product'), TO_CHAR(l.m_product_id),
TO_CHAR(?)) AS RELATION_NAME,
l.C_OrderLine_ID,l.Line, l.ad_org_id, '' as C_InvoiceLine_ID, '' as
M_InOutLine_ID, '' AS BREAKDOWN, '' AS STDPRECISION,
'' AS C_UOM_ID_Conversion, '' AS QUANTITYORDER, '' AS
M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID AS M_ATTRIBUTESETINSTANCE_ID,
l.C_OrderLine_ID AS ID, '' AS C_Invoice_ID, l.DESCRIPTION AS
DESCRIPTION,
@@ -59,6 +60,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="o.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="o.AD_Org_ID IN (" text="'1'"/>
<Parameter name="poId"/>
@@ -94,7 +96,8 @@
<Sql>
<![CDATA[
SELECT o.C_ORDER_ID, Ad_Column_Identifier(TO_CHAR('C_Order'),
TO_CHAR(o.c_order_id), TO_CHAR(?)) AS NAME,
- l.QtyOrdered-COALESCE(l.qtydelivered,0) AS QTY,
l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME,
+ l.QtyOrdered-COALESCE(l.qtydelivered,0) AS QTY,
l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,
+ Ad_Column_Identifier(TO_CHAR('M_Product'), TO_CHAR(l.m_product_id),
TO_CHAR(?)) AS RELATION_NAME,
l.C_OrderLine_ID,l.Line, l.C_OrderLine_ID AS ID, l.DESCRIPTION AS
DESCRIPTION
FROM M_INOUT_CANDIDATE_V ic, C_ORDER o, C_UOM uom, C_ORDERLINE l,
M_PRODUCT p
WHERE o.C_ORDER_ID = l.C_ORDER_ID
@@ -112,6 +115,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="ic.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="ic.AD_Org_ID IN (" text="'1'"/>
<Parameter name="poId"/>
@@ -142,7 +146,7 @@
<![CDATA[
SELECT o.C_ORDER_ID, Ad_Column_Identifier(TO_CHAR('C_Order'),
TO_CHAR(o.c_order_id), TO_CHAR(?)) AS NAME,
l.QtyOrdered-SUM(COALESCE(m.Qty,0)) AS QTY,
l.C_UOM_ID,COALESCE(uomt.UOMSymbol, uom.UOMSymbol) AS UOMSymbol, l.M_Product_ID,
- p.NAME AS RELATION_NAME, l.C_OrderLine_ID, l.Line, l.C_OrderLine_ID AS
ID, l.DESCRIPTION AS DESCRIPTION,
+ Ad_Column_Identifier(TO_CHAR('M_Product'), TO_CHAR(l.m_product_id),
TO_CHAR(?)) AS RELATION_NAME, l.C_OrderLine_ID, l.Line, l.C_OrderLine_ID AS ID,
l.DESCRIPTION AS DESCRIPTION,
((l.QtyOrdered-SUM(COALESCE(m.Qty,0)))/COALESCE(
(SELECT MULTIPLYRATE FROM C_UOM_CONVERSION WHERE
C_UOM_CONVERSION.C_UOM_ID =
(SELECT C_UOM.C_UOM_ID 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)
@@ -173,9 +177,10 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="o.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="o.AD_Org_ID IN (" text="'1'"/>
- <Parameter name="language"/>
<Parameter name="poId"/>
</SqlMethod>
<SqlMethod name="selectFromPOTrlSOTrx" type="preparedStatement"
return="multiple">
@@ -184,7 +189,7 @@
<![CDATA[
SELECT o.C_ORDER_ID, Ad_Column_Identifier(TO_CHAR('C_Order'),
TO_CHAR(o.c_order_id), TO_CHAR(?)) AS NAME,
l.QtyOrdered-COALESCE(l.qtydelivered,0) AS QTY, l.C_UOM_ID,
COALESCE(uomt.UOMSymbol, uom.UOMSymbol) AS UOMSymbol,
- l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_OrderLine_ID, l.Line,
l.C_OrderLine_ID AS ID, l.DESCRIPTION AS DESCRIPTION
+ l.M_Product_ID,Ad_Column_Identifier(TO_CHAR('M_Product'),
TO_CHAR(l.m_product_id), TO_CHAR(?)) AS RELATION_NAME, l.C_OrderLine_ID,
l.Line, l.C_OrderLine_ID AS ID, l.DESCRIPTION AS DESCRIPTION
FROM C_UOM uom left join C_UOM_TRL uomt on uom.C_UOM_ID = uomt.C_UOM_ID
and uomt.AD_Language = ?,
M_INOUT_CANDIDATE_V ic, C_ORDER o, C_ORDERLINE l, M_PRODUCT p
@@ -203,9 +208,10 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="ic.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="ic.AD_Org_ID IN (" text="'1'"/>
- <Parameter name="language"/>
<Parameter name="poId"/>
</SqlMethod>
<SqlMethod name="selectFromPOUpdate" type="preparedStatement"
connection="true" return="multiple">
@@ -263,7 +269,8 @@
<![CDATA[
SELECT i.C_Invoice_ID, Ad_Column_Identifier(TO_CHAR('C_Invoice'),
TO_CHAR(i.C_Invoice_ID), TO_CHAR(?)) AS NAME,
l.QtyInvoiced-SUM(COALESCE(mi.Qty,0)) AS QTY, l.C_UOM_ID,uom.UOMSymbol,
- l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_InvoiceLine_ID,l.Line,
l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID, l.DESCRIPTION AS DESCRIPTION,
+ l.M_Product_ID,Ad_Column_Identifier(TO_CHAR('M_Product'),
TO_CHAR(l.m_product_id), TO_CHAR(?)) AS RELATION_NAME,
+ l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID,
l.DESCRIPTION AS DESCRIPTION,
(l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))/COALESCE(
(SELECT MULTIPLYRATE FROM C_UOM_CONVERSION WHERE
C_UOM_CONVERSION.C_UOM_ID =
(SELECT C_UOM.C_UOM_ID 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)
@@ -289,6 +296,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="i.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="i.AD_Org_ID IN (" text="'1'"/>
<Parameter name="cInvoiceId"/>
@@ -299,7 +307,8 @@
<![CDATA[
SELECT i.C_Invoice_ID, Ad_Column_Identifier(TO_CHAR('C_Invoice'),
TO_CHAR(i.C_Invoice_ID), TO_CHAR(?)) AS NAME,
l.QtyInvoiced-SUM(COALESCE(mi.MOVEMENTQTY,0)) AS QTY,
l.C_UOM_ID,uom.UOMSymbol,
- l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_InvoiceLine_ID,l.Line,
l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID,
+ l.M_Product_ID,Ad_Column_Identifier(TO_CHAR('M_Product'),
TO_CHAR(l.m_product_id), TO_CHAR(?)) AS RELATION_NAME,
+ l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID,
l.DESCRIPTION AS DESCRIPTION
FROM C_INVOICELINE l left join M_INOUTLINE mi on l.M_INOUTLINE_ID =
mi.M_INOUTLINE_ID,
C_INVOICE i, C_UOM uom, M_PRODUCT p
@@ -317,6 +326,7 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="i.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="i.AD_Org_ID IN (" text="'1'"/>
<Parameter name="cInvoiceId"/>
@@ -375,7 +385,7 @@
<![CDATA[
SELECT i.C_Invoice_ID, Ad_Column_Identifier(TO_CHAR('C_Invoice'),
TO_CHAR(i.C_Invoice_ID), TO_CHAR(?)) AS NAME,
l.QtyInvoiced-SUM(COALESCE(mi.Qty,0)) AS QTY,
l.C_UOM_ID,COALESCE(uomt.UOMSymbol, uom.UOMSymbol) AS UOMSymbol,
- l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_InvoiceLine_ID,l.Line,
l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID,
+ l.M_Product_ID,Ad_Column_Identifier(TO_CHAR('M_Product'),
TO_CHAR(l.m_product_id), TO_CHAR(?)) AS RELATION_NAME,
l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID,
l.DESCRIPTION AS DESCRIPTION,
(l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))/COALESCE(
(SELECT MULTIPLYRATE FROM C_UOM_CONVERSION WHERE
C_UOM_CONVERSION.C_UOM_ID =
@@ -404,9 +414,10 @@
</Sql>
<Field name="rownum" value="count"/>
<Parameter name="language"/>
+ <Parameter name="language"/>
+ <Parameter name="language"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="i.AD_Client_ID IN (" text="'1'"/>
<Parameter name="adOrgClient" type="replace" optional="true"
after="i.AD_Org_ID IN (" text="'1'"/>
- <Parameter name="language"/>
<Parameter name="cInvoiceId"/>
------------------------------------------------------------------------------
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
