details: https://code.openbravo.com/erp/devel/pi/rev/6bed909ec4be
changeset: 22807:6bed909ec4be
user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at>
openbravo.com>
date: Tue Apr 01 17:31:00 2014 +0530
summary: Fixes Issue 25989, Fixes Issue 25733
25989: Lot information not populated in Sales Invoices using Generate Invoices
process regarding Sales Orders
25733: Not homogeneous behaviour in Sales management flow
diffstat:
src-db/database/model/functions/C_INVOICE_CREATE.xml | 4
++--
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 4
++--
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 9a75b3707537 -r 6bed909ec4be
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml Tue Apr 01
12:52:18 2014 +0200
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml Tue Apr 01
17:31:00 2014 +0530
@@ -127,7 +127,7 @@
ol.Line,
ol.DirectShip,
ol.PriceStd,
- COALESCE(ol.m_attributesetinstance_id, sl.m_attributesetinstance_id)
AS m_attributesetinstance_id,
+ sl.m_attributesetinstance_id,
ol.taxbaseamt,
ol.gross_unit_price,
ol.grosspricestd,
@@ -900,7 +900,7 @@
sh.movementDate,
ol.PriceStd,
ol.gross_unit_price,
- COALESCE(ol.m_attributesetinstance_id,
sl.m_attributesetinstance_id) AS m_attributesetinstance_id,
+ sl.m_attributesetinstance_id,
ol.taxbaseamt, o.fin_paymentmethod_id,
pl.istaxincluded,
ol.grosspricestd,
diff -r 9a75b3707537 -r 6bed909ec4be
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Tue Apr 01 12:52:18 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Tue Apr 01 17:31:00 2014 +0530
@@ -301,7 +301,7 @@
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,
COALESCE(l.M_ATTRIBUTESETINSTANCE_ID, il.M_ATTRIBUTESETINSTANCE_ID) AS
M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id,
+ (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, il.M_ATTRIBUTESETINSTANCE_ID,
l.ad_org_id,
l.taxbaseamt, COALESCE(l.A_Asset_ID, o.A_Asset_ID) as A_Asset_ID,
COALESCE(l.C_Project_ID, o.C_Project_ID) as C_Project_ID,
COALESCE(l.C_Costcenter_ID, o.C_Costcenter_ID) as C_Costcenter_ID,
COALESCE(l.User1_ID, o.User1_ID) as User1_ID, COALESCE(l.User2_ID, o.User2_ID)
as User2_ID, l.explode, 'Y' as isOrder
FROM C_ORDERLINE l left join (SELECT M_InOutLine.* FROM M_InOutLine,
M_InOut
@@ -314,7 +314,7 @@
AND l.M_Product_ID=p.M_Product_ID
GROUP BY
l.QtyOrdered,l.qtydelivered,l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID,
l.QTYINVOICED, il.M_InOutLine_ID, il.MovementQty, l.Description,
l.quantityOrder, il.quantityOrder,
- l.M_Product_UOM_ID, il.M_Product_UOM_ID,
COALESCE(l.M_ATTRIBUTESETINSTANCE_ID,
il.M_ATTRIBUTESETINSTANCE_ID),l.ad_org_id, cur.priceprecision,
+ l.M_Product_UOM_ID, il.M_Product_UOM_ID, il.M_ATTRIBUTESETINSTANCE_ID,
l.ad_org_id, cur.priceprecision,
l.taxbaseamt, COALESCE(l.A_Asset_ID, o.A_Asset_ID),
COALESCE(l.C_Project_ID, o.C_Project_ID), COALESCE(l.C_Costcenter_ID,
o.C_Costcenter_ID),
COALESCE(l.User1_ID, o.User1_ID), COALESCE(l.User2_ID, o.User2_ID),
l.explode
HAVING ( (l.explode='Y') OR ((l.QtyOrdered-COALESCE(l.QTYINVOICED ,0))
<> 0))
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
