details: https://code.openbravo.com/erp/devel/pi/rev/b689f78c1ee2 changeset: 22047:b689f78c1ee2 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Feb 11 16:30:11 2014 +0530 summary: Fixes Issue 25463: Wrong error when posting a purchase invoice When there is no conversion between invoice's currency and Product - Purchasing tab currency, wrong error message is shown
details: https://code.openbravo.com/erp/devel/pi/rev/1433b33bc29c changeset: 22048:1433b33bc29c user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Feb 12 08:20:39 2014 +0530 summary: Fixes Issue 25641: Inactive warehouses can be selected in sales flow. diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 3 ++- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner_data.xsql | 2 ++ src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 9 ++++++++- 4 files changed, 13 insertions(+), 3 deletions(-) diffs (84 lines): diff -r 2d05b68d4f4f -r 1433b33bc29c src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 18 07:58:51 2014 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Feb 12 08:20:39 2014 +0530 @@ -30455,7 +30455,7 @@ <!--2202--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID> <!--2202--> <AD_REFERENCE_VALUE_ID><![CDATA[263693E51C7847BF90C897ADB830E2BB]]></AD_REFERENCE_VALUE_ID> <!--2202--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH> -<!--2202--> <DEFAULTVALUE><![CDATA[@SQL=select m_warehouse_id from ad_org_warehouse where ad_org_id = @ad_org_id@ group by m_warehouse_id, priority having min(priority) = priority +<!--2202--> <DEFAULTVALUE><![CDATA[@SQL=select m_warehouse_id from ad_org_warehouse ow where ad_org_id = @ad_org_id@ and (select isactive from m_warehouse where m_warehouse_id=ow.m_warehouse_id)='Y' group by m_warehouse_id, priority having min(priority) = priority ]]></DEFAULTVALUE> <!--2202--> <ISKEY><![CDATA[N]]></ISKEY> <!--2202--> <ISPARENT><![CDATA[N]]></ISPARENT> diff -r 2d05b68d4f4f -r 1433b33bc29c src-db/database/sourcedata/OBUISEL_SELECTOR.xml --- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Tue Feb 18 07:58:51 2014 +0100 +++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Wed Feb 12 08:20:39 2014 +0530 @@ -759,7 +759,8 @@ <!--F42A1DD1B941461EB3B9AD07A534D91E--> <POPUPTEXTMATCHSTYLE><![CDATA[substring]]></POPUPTEXTMATCHSTYLE> <!--F42A1DD1B941461EB3B9AD07A534D91E--> <HQL><![CDATA[select w.id as id, w.name as name from Warehouse w -where @additional_filters@]]></HQL> +where @additional_filters@ +and w.active=true]]></HQL> <!--F42A1DD1B941461EB3B9AD07A534D91E--> <ENTITY_ALIAS><![CDATA[w]]></ENTITY_ALIAS> <!--F42A1DD1B941461EB3B9AD07A534D91E--> <CUSTOM_QUERY><![CDATA[Y]]></CUSTOM_QUERY> <!--F42A1DD1B941461EB3B9AD07A534D91E--></OBUISEL_SELECTOR> diff -r 2d05b68d4f4f -r 1433b33bc29c src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner_data.xsql --- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner_data.xsql Tue Feb 18 07:58:51 2014 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner_data.xsql Wed Feb 12 08:20:39 2014 +0530 @@ -49,6 +49,7 @@ <![CDATA[ SELECT MAX(M_WAREHOUSE_ID) AS ID FROM M_WAREHOUSE_SHIPPER WHERE M_WAREHOUSE_SHIPPER.C_BPARTNER_ID = ? + AND (SELECT ISACTIVE FROM M_WAREHOUSE WHERE M_WAREHOUSE_ID=M_WAREHOUSE_SHIPPER.M_WAREHOUSE_ID)='Y' ]]> </Sql> <Parameter name="cBpartnerId"/> @@ -59,6 +60,7 @@ <![CDATA[ select m_warehouse_id AS ID from ad_org_warehouse where ad_org_id = ? + and (select isactive from m_warehouse where m_warehouse_id=ad_org_warehouse.m_warehouse_id)='Y' group by m_warehouse_id, priority having min(priority) = priority ]]> diff -r 2d05b68d4f4f -r 1433b33bc29c src/org/openbravo/erpCommon/ad_forms/DocInvoice.java --- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Tue Feb 18 07:58:51 2014 +0100 +++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Wed Feb 12 08:20:39 2014 +0530 @@ -11,7 +11,7 @@ * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): Openbravo SLU - * Contributions are Copyright (C) 2001-2013 Openbravo S.L.U. + * Contributions are Copyright (C) 2001-2014 Openbravo S.L.U. ****************************************************************************** */ package org.openbravo.erpCommon.ad_forms; @@ -29,6 +29,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.openbravo.base.secureApp.VariablesSecureApp; +import org.openbravo.client.kernel.RequestContext; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.data.FieldProvider; @@ -37,6 +38,7 @@ import org.openbravo.erpCommon.utility.CashVATUtil; import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.erpCommon.utility.SequenceIdData; +import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.common.currency.ConversionRateDoc; import org.openbravo.model.common.currency.Currency; import org.openbravo.model.common.invoice.Invoice; @@ -1129,6 +1131,11 @@ } catch (ServletException e) { log4jDocInvoice.warn(e); + if (e.getMessage().contains("@NoConversionRate@")) { + setMessageResult(Utility.translateError(conn, RequestContext.get().getVariablesSecureApp(), + OBContext.getOBContext().getLanguage().getId(), e.getMessage())); + throw new IllegalStateException(); + } } } // updateProductInfo ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
