details: https://code.openbravo.com/erp/stable/2.50/rev/43d3fb799242 changeset: 9813:43d3fb799242 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Feb 01 12:43:05 2012 +0100 summary: Fixes issue 19538: Wrong behaviour in Payment Aging Balance.
details: https://code.openbravo.com/erp/stable/2.50/rev/05214b70653b changeset: 9814:05214b70653b user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Feb 06 11:35:51 2012 +0100 summary: Fixes issue 19658: Goods Receipt when 'creating lines from' only prints attributes information in english. diffstat: src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 6 ++++-- src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diffs (44 lines): diff -r 611b141d4335 -r 05214b70653b src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql Tue Feb 07 04:50:07 2012 +0000 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql Mon Feb 06 11:35:51 2012 +0100 @@ -149,7 +149,9 @@ (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) 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, + as SECQTY, l.M_PRODUCT_UOM_ID as SEC_PRODUCT_UOM_ID, 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, (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 LOCATOR FROM C_UOM uom left join C_UOM_TRL uomt on uom.C_UOM_ID = uomt.C_UOM_ID @@ -166,7 +168,7 @@ AND l.M_Product_ID=p.M_Product_ID AND l.C_Order_ID = ? GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,l.qtydelivered, - l.C_UOM_ID,uom.UOMSymbol, uomt.UOMSymbol,l.M_Product_ID,p.NAME,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.Line,l.C_OrderLine_ID, l.DESCRIPTION, l.QUANTITYORDER, l.M_PRODUCT_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID HAVING (l.QtyOrdered-SUM(COALESCE(m.Qty,0))) <> 0 ORDER BY NAME, l.Line ]]> diff -r 611b141d4335 -r 05214b70653b src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql Tue Feb 07 04:50:07 2012 +0000 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql Mon Feb 06 11:35:51 2012 +0100 @@ -100,7 +100,7 @@ <Parameter name="isSettle" optional="true" type="argument" after="DP.IsValid='Y'" text="AND C_DEBT_PAYMENT_STATUS(DP.C_Settlement_Cancel_ID, DP.CANCEL_PROCESSED, DP.GENERATE_PROCESSED, DP.ISPAID, DP.ISVALID, DP.C_CASHLINE_ID, DP.C_BANKSTATEMENTLINE_ID) IN"/> <Parameter name="cbankaccount" optional="true" after="DP.IsValid='Y'"><![CDATA[ AND DP.C_BANKACCOUNT_ID = ? ]]></Parameter> - <Parameter name="adOrgId" optional="true" after="DP.IsValid='Y'"><![CDATA[ AND dp.ad_org_id = ? ]]></Parameter> + <Parameter name="adOrgId" optional="true" after="DP.IsValid='Y'"><![CDATA[ AND ad_isorgincluded(dp.ad_org_id, ?, dp.ad_client_id) <> -1 ]]></Parameter> <Parameter name="ord" type="replace" optional="true" after="ORDER BY " text="1"></Parameter> </SqlMethod> <SqlMethod name="selectNoBpartner" type="preparedStatement" return="multiple"> @@ -177,7 +177,7 @@ <Parameter name="isSettle" optional="true" type="argument" after="DP.IsValid='Y'" text="AND C_DEBT_PAYMENT_STATUS(DP.C_Settlement_Cancel_ID, DP.CANCEL_PROCESSED, DP.GENERATE_PROCESSED, DP.ISPAID, DP.ISVALID, DP.C_CASHLINE_ID, DP.C_BANKSTATEMENTLINE_ID) IN"/> <Parameter name="cbankaccount" optional="true" after="DP.IsValid='Y'"><![CDATA[ AND DP.C_BANKACCOUNT_ID = ? ]]></Parameter> - <Parameter name="adOrgId" optional="true" after="DP.IsValid='Y'"><![CDATA[ AND dp.ad_org_id = ? ]]></Parameter> + <Parameter name="adOrgId" optional="true" after="DP.IsValid='Y'"><![CDATA[ AND ad_isorgincluded(dp.ad_org_id, ?, dp.ad_client_id) <> -1 ]]></Parameter> <Parameter name="ord" type="replace" optional="true" after="ORDER BY " text="1"></Parameter> </SqlMethod> <SqlMethod name="set" type="constant" return="multiple"> ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
