fixes bug 19100: Currency selector on Price list window should show full currencies name, not only ISO code
authorEduardo Argal Guibert <eduardo.argal@openbravo.com>
Thu, 17 Nov 2011 17:59:36 +0100
changeset 9747 0fc2ae369e8f
parent 9746 70cf0f2524a8
child 9748 1b99970df154
fixes bug 19100: Currency selector on Price list window should show full currencies name, not only ISO code
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java
src/org/openbravo/erpCommon/ad_forms/MonedaCombo_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java	Wed Nov 16 09:31:51 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java	Thu Nov 17 17:59:36 2011 +0100
@@ -103,7 +103,7 @@
     xmlDocument.setParameter("moduleTree", tree.toHtml());
     xmlDocument.setParameter("moduleTreeDescription", tree.descriptionToHtml());
 
-    xmlDocument.setData("reportCurrency", "liststructure", MonedaComboData.select(this));
+    xmlDocument.setData("reportCurrency", "liststructure", MonedaComboData.selectISO(this));
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
--- a/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java	Wed Nov 16 09:31:51 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java	Thu Nov 17 17:59:36 2011 +0100
@@ -137,7 +137,7 @@
 
       xmlDocument.setParameter("paramLocationId", "");
       xmlDocument.setParameter("paramLocationDescription", "");
-      xmlDocument.setData("reportCurrency", "liststructure", MonedaComboData.select(this));
+      xmlDocument.setData("reportCurrency", "liststructure", MonedaComboData.selectISO(this));
       xmlDocument.setData("reportOrgType", "liststructure", InitialOrgSetupData.selectOrgType(this,
           vars.getLanguage(), vars.getClient()));
       xmlDocument.setData("reportParentOrg", "liststructure", InitialOrgSetupData.selectParentOrg(
--- a/src/org/openbravo/erpCommon/ad_forms/MonedaCombo_data.xsql	Wed Nov 16 09:31:51 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/MonedaCombo_data.xsql	Thu Nov 17 17:59:36 2011 +0100
@@ -31,4 +31,11 @@
       FROM C_Currency ORDER BY 2
       </Sql>
    </SqlMethod>
+   <SqlMethod name="selectISO" type="preparedStatement" return="multiple">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql>
+      SELECT C_Currency_ID as id, iso_code as name
+      FROM C_Currency ORDER BY 2
+      </Sql>
+   </SqlMethod>
 </SqlClass>