details: https://code.openbravo.com/erp/stable/2.50/rev/2d9f4530fd60
changeset: 9641:2d9f4530fd60
user: Jon AlegrÃa <jon.alegria <at> openbravo.com>
date: Thu Sep 01 10:28:41 2011 +0200
summary: Fixes issue 0018367: Create lines from should use
ad_column_identifier to show
the product name
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java |
22 ++--
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql |
40 ++++++--
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql |
43 +++++++--
3 files changed, 72 insertions(+), 33 deletions(-)
diffs (truncated from 459 to 300 lines):
diff -r 1c0b0f860ccf -r 2d9f4530fd60
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Thu Sep
01 10:18:29 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Thu Sep
01 10:28:41 2011 +0200
@@ -1463,9 +1463,9 @@
for (int k = 0; k < ids.length; k++) {
if (strType.equals("SHIPMENT")) {
if (isSOTrx.equals("Y"))
- data = CreateFromInvoiceData.selectFromShipmentUpdateSOTrx(conn,
this, ids[k]);
+ data = CreateFromInvoiceData.selectFromShipmentUpdateSOTrx(conn,
this, vars.getLanguage(), ids[k]);
else
- data = CreateFromInvoiceData.selectFromShipmentUpdate(conn, this,
ids[k]);
+ data = CreateFromInvoiceData.selectFromShipmentUpdate(conn, this,
vars.getLanguage(), ids[k]);
dataAux = CreateFromInvoiceData
.selectPriceList(conn, this, strDateInvoiced, strPriceList);
if (dataAux == null || dataAux.length == 0) {
@@ -1478,9 +1478,9 @@
} else {
strPO = vars.getStringParameter("inpPurchaseOrder");
if (isSOTrx.equals("Y"))
- data = CreateFromInvoiceData.selectFromPOUpdateSOTrx(conn, this,
ids[k]);
+ data = CreateFromInvoiceData.selectFromPOUpdateSOTrx(conn, this,
vars.getLanguage(), ids[k]);
else
- data = CreateFromInvoiceData.selectFromPOUpdate(conn, this,
ids[k]);
+ data = CreateFromInvoiceData.selectFromPOUpdate(conn, this,
vars.getLanguage(), ids[k]);
}
if (data != null) {
for (int i = 0; i < data.length; i++) {
@@ -1609,13 +1609,13 @@
if (strType.equals("INVOICE")) {
strInvoice = vars.getStringParameter("inpInvoice");
if (!isSOTrx.equals("Y"))
- data = CreateFromShipmentData.selectFromInvoiceUpdate(conn, this,
ids[k]);
+ data = CreateFromShipmentData.selectFromInvoiceUpdate(conn, this,
vars.getLanguage(), ids[k]);
} else {
strPO = vars.getStringParameter("inpPurchaseOrder");
if (isSOTrx.equals("Y"))
- data = CreateFromShipmentData.selectFromPOUpdateSOTrx(conn, this,
ids[k]);
+ data = CreateFromShipmentData.selectFromPOUpdateSOTrx(conn, this,
vars.getLanguage(), ids[k]);
else
- data = CreateFromShipmentData.selectFromPOUpdate(conn, this,
ids[k]);
+ data = CreateFromShipmentData.selectFromPOUpdate(conn, this,
vars.getLanguage(), ids[k]);
}
if (data != null) {
for (int i = 0; i < data.length; i++) {
@@ -1834,15 +1834,15 @@
if (strType.equals("INVOICE")) {
strInvoice = vars.getStringParameter("inpInvoice");
if (isSOTrx.equals("Y"))
- data = CreateFromShipmentData.selectFromInvoiceTrxUpdate(conn,
this, ids[k]);
+ data = CreateFromShipmentData.selectFromInvoiceTrxUpdate(conn,
this, vars.getLanguage(), ids[k]);
else
- data = CreateFromShipmentData.selectFromInvoiceUpdate(conn, this,
ids[k]);
+ data = CreateFromShipmentData.selectFromInvoiceUpdate(conn, this,
vars.getLanguage(), ids[k]);
} else {
strPO = vars.getStringParameter("inpPurchaseOrder");
if (isSOTrx.equals("Y"))
- data = CreateFromShipmentData.selectFromPOUpdateSOTrx(conn, this,
ids[k]);
+ data = CreateFromShipmentData.selectFromPOUpdateSOTrx(conn, this,
vars.getLanguage(), ids[k]);
else
- data = CreateFromShipmentData.selectFromPOUpdate(conn, this,
ids[k]);
+ data = CreateFromShipmentData.selectFromPOUpdate(conn, this,
vars.getLanguage(), ids[k]);
}
if (data != null) {
for (int i = 0; i < data.length; i++) {
diff -r 1c0b0f860ccf -r 2d9f4530fd60
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Thu Sep 01 10:18:29 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Thu Sep 01 10:28:41 2011 +0200
@@ -87,7 +87,7 @@
<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
@@ -105,6 +105,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"/>
@@ -136,7 +137,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-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.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
@@ -159,6 +160,7 @@
</Sql>
<Field name="rownum" value="count"/>
<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"/>
@@ -170,7 +172,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
@@ -189,6 +191,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"/>
@@ -200,7 +203,8 @@
<Sql>
<![CDATA[
SELECT (CASE WHEN B.M_InOutLine_ID IS NULL THEN A.QTY ELSE B.QTY END) AS
ID,
- A.C_UOM_ID,uom.UOMSymbol, A.M_Product_ID,p.NAME,
A.C_OrderLine_ID,A.Line, uom.stdprecision AS stdprecision, cur.priceprecision,
+ A.C_UOM_ID,uom.UOMSymbol,
A.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(A.m_product_id), to_char(?)) as NAME,
+ A.C_OrderLine_ID,A.Line, uom.stdprecision AS stdprecision,
cur.priceprecision,
B.M_InOutLine_ID, A.Description, (CASE WHEN B.M_InOutLine_ID IS NULL
THEN A.quantityOrder ELSE B.quantityOrder END) AS quantityOrder,
(CASE WHEN B.M_InOutLine_ID IS NULL THEN A.M_Product_UOM_ID ELSE
B.M_Product_UOM_ID END) AS M_Product_UOM_ID, A.M_ATTRIBUTESETINSTANCE_ID,
A.ad_org_id,
A.taxbaseamt
@@ -227,6 +231,7 @@
ORDER BY A.Line
]]>
</Sql>
+ <Parameter name="adLanguage"/>
<Parameter name="cOrderlineId" optional="true" type="argument" after="AND
A.M_Product_ID=p.M_Product_ID" text=" AND A.C_OrderLine_ID IN "/>
</SqlMethod>
<SqlMethod name="selectFromPOUpdateSOTrx" type="preparedStatement"
connection="true" return="multiple">
@@ -234,7 +239,7 @@
<Sql>
<![CDATA[
SELECT (CASE WHEN il.M_INOUTLINE_ID IS NULL THEN
(l.QtyOrdered-COALESCE(l.QTYINVOICED ,0)) ELSE il.MOVEMENTQTY END) AS ID,
- l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.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 NAME,
l.C_OrderLine_ID,l.Line, max(uom.stdprecision) AS stdprecision,
cur.priceprecision, il.M_InOutLine_ID as M_InOutLine_ID, l.Description,
(CASE WHEN il.M_INOUTLINE_ID IS NULL THEN
l.quantityOrder*C_DIVIDE((l.QtyOrdered-COALESCE(l.QTYINVOICED
,0)),(l.QtyOrdered)) ELSE il.quantityOrder END) AS quantityOrder,
(CASE WHEN il.M_INOUTLINE_ID IS NULL THEN l.M_Product_UOM_ID ELSE
il.M_Product_UOM_ID END) AS M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID,
l.ad_org_id,
@@ -255,6 +260,7 @@
]]>
</Sql>
<Field name="rownum" value="count"/>
+ <Parameter name="adLanguage"/>
<Parameter name="cOrderlineId" optional="true" type="argument" after=" AND
l.M_Product_ID=p.M_Product_ID " text=" AND l.C_OrderLine_ID IN "/>
</SqlMethod>
<SqlMethod name="selectFromShipment" type="preparedStatement"
return="multiple">
@@ -263,7 +269,8 @@
<![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,
@@ -284,6 +291,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"/>
@@ -320,7 +328,8 @@
<![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
@@ -340,6 +349,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"/>
@@ -378,7 +388,8 @@
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
@@ -400,6 +411,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="adLanguage"/>
@@ -412,7 +424,8 @@
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 = ? ,
@@ -433,6 +446,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="adLanguage"/>
@@ -442,7 +456,8 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT (l.MovementQty-SUM(COALESCE(mi.Qty,0))) AS ID,
l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME, l.M_InOutLine_ID,l.Line,
+ SELECT (l.MovementQty-SUM(COALESCE(mi.Qty,0))) AS ID,
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 NAME, l.M_InOutLine_ID,l.Line,
l.C_OrderLine_ID, max(uom.STDPRECISION) as stdprecision, l.Description,
l.quantityOrder*C_DIVIDE((l.MovementQty-SUM(COALESCE(mi.Qty,0))),l.MovementQty)
as quantityOrder,
l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id
FROM M_INOUTLINE l left join M_MATCHINV mi on
l.M_InOutLine_ID=mi.M_InOutLine_ID,
@@ -453,13 +468,15 @@
ORDER BY l.Line
]]>
</Sql>
+ <Parameter name="adLanguage"/>
<Parameter name="cInOutLineId" optional="true" type="argument" after="AND
l.M_Product_ID=p.M_Product_ID" text=" AND l.M_InOutLine_ID IN "/>
</SqlMethod>
<SqlMethod name="selectFromShipmentUpdateSOTrx" type="preparedStatement"
connection="true" return="multiple">
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT l.MovementQty AS ID, l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,p.NAME, l.M_InOutLine_ID,l.Line,
+ SELECT l.MovementQty AS ID, 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 NAME, l.M_InOutLine_ID,l.Line,
l.C_OrderLine_ID, max(uom.STDPRECISION) as stdprecision,
l.Description,l.quantityOrder, l.M_Product_UOM_ID,
l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id
FROM C_UOM uom, M_INOUTLINE l, M_PRODUCT p
@@ -471,6 +488,7 @@
]]>
</Sql>
<Field name="rownum" value="count"/>
+ <Parameter name="adLanguage"/>
<Parameter name="cOrderlineId" optional="true" type="argument" after="AND
l.isinvoiced = 'N' " text=" AND l.M_InOutLine_ID IN "/>
</SqlMethod>
<SqlMethod name="set" type="constant" return="multiple">
diff -r 1c0b0f860ccf -r 2d9f4530fd60
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
Thu Sep 01 10:18:29 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
Thu Sep 01 10:28:41 2011 +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,
@@ -57,6 +58,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"/>
@@ -92,7 +94,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
@@ -110,6 +113,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"/>
@@ -140,7 +144,7 @@
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
