details: /erp/devel/pi/rev/919cfa2a9e68
changeset: 7124:919cfa2a9e68
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Fri Apr 23 15:40:23 2010 +0530
summary: Fixes Issue 12842: Currency value not assigned in Requsition header
page.
diffstat:
src-db/database/sourcedata/AD_VAL_RULE.xml | 2
+-
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java | 5
+++--
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql | 7
++++---
3 files changed, 8 insertions(+), 6 deletions(-)
diffs (52 lines):
diff -r a14284c69f01 -r 919cfa2a9e68 src-db/database/sourcedata/AD_VAL_RULE.xml
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Apr 23 10:00:29
2010 +0200
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Apr 23 15:40:23
2010 +0530
@@ -1202,7 +1202,7 @@
<!--1004400000--> <NAME><![CDATA[C_Currency of PriceList]]></NAME>
<!--1004400000--> <DESCRIPTION><![CDATA[Sets the currency of the
pricelist]]></DESCRIPTION>
<!--1004400000--> <TYPE><![CDATA[S]]></TYPE>
-<!--1004400000--> <CODE><![CDATA[C_Currency.C_Currency_ID IN (SELECT
C_Currency_ID FROM M_Pricelist WHERE M_Pricelist_ID =
@M_Pricelist_ID@)]]></CODE>
+<!--1004400000--> <CODE><![CDATA[C_Currency.C_Currency_ID IN (SELECT
C_Currency_ID FROM M_Pricelist WHERE ISACTIVE='Y')]]></CODE>
<!--1004400000--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--1004400000--></AD_VAL_RULE>
diff -r a14284c69f01 -r 919cfa2a9e68
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java
Fri Apr 23 10:00:29 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java
Fri Apr 23 15:40:23 2010 +0530
@@ -66,12 +66,13 @@
XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument();
- String strPriceList = SLRequisitionBPartnerData.select(this, strBPartner);
+ SLRequisitionBPartnerData[] data = SLRequisitionBPartnerData.select(this,
strBPartner);
StringBuffer resultado = new StringBuffer();
resultado.append("var calloutName='SL_Requisition_BPartner';\n\n");
resultado.append("var respuesta = new Array(");
- resultado.append("new Array(\"inpmPricelistId\", \"" + strPriceList +
"\")");
+ resultado.append("new Array(\"inpmPricelistId\", \"" +
data[0].poPricelistId + "\"),");
+ resultado.append("new Array(\"inpcCurrencyId\", \"" + data[0].cCurrencyId
+ "\")");
resultado.append(");");
xmlDocument.setParameter("array", resultado.toString());
xmlDocument.setParameter("frameName", "appFrame");
diff -r a14284c69f01 -r 919cfa2a9e68
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql
Fri Apr 23 10:00:29 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql
Fri Apr 23 15:40:23 2010 +0530
@@ -18,13 +18,14 @@
************************************************************************
-->
<SqlClass name="SLRequisitionBPartnerData"
package="org.openbravo.erpCommon.ad_callouts">
- <SqlMethod name="select" type="preparedStatement" return="string" default="">
+ <SqlMethod name="select" type="preparedStatement" return="multiple"
default="">
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT p.PO_PriceList_ID
- FROM C_BPartner p
+ SELECT p.PO_PriceList_ID, m.c_currency_id
+ FROM C_BPartner p,M_Pricelist m
WHERE p.C_BPartner_ID = ?
+ AND m.M_Pricelist_ID = p.PO_PriceList_ID
]]>
</Sql>
<Parameter name="cBpartnerId"/>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
