details: https://code.openbravo.com/erp/devel/main/rev/1368895208b6 changeset: 21702:1368895208b6 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Dec 12 16:45:11 2013 +0530 summary: Fixes Issue 0024872: The button 'Export to excel' is not working on the window SQL Query
Setting the content header as attachment. details: https://code.openbravo.com/erp/devel/main/rev/1f6d726779d5 changeset: 21703:1f6d726779d5 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu Dec 26 13:42:02 2013 +0100 summary: Related to issue 25308.Fix issue in pg databases. details: https://code.openbravo.com/erp/devel/main/rev/2cf255f462bf changeset: 21704:2cf255f462bf user: Victor Villar <victor.villar <at> openbravo.com> date: Thu Dec 26 13:48:16 2013 +0100 summary: Fixed issue 25402: It is not possible to validate a costing rule (same products in different lines error) diffstat: src-db/database/model/functions/C_GET_PRODUCT_TAXCATEGORY.xml | 5 ++++- src/org/openbravo/erpCommon/ad_forms/SQLExecutor.java | 1 + src/org/openbravo/materialmgmt/InventoryCountProcess.java | 2 ++ 3 files changed, 7 insertions(+), 1 deletions(-) diffs (38 lines): diff -r 34e7bab6fb21 -r 2cf255f462bf src-db/database/model/functions/C_GET_PRODUCT_TAXCATEGORY.xml --- a/src-db/database/model/functions/C_GET_PRODUCT_TAXCATEGORY.xml Thu Dec 26 12:10:37 2013 +0530 +++ b/src-db/database/model/functions/C_GET_PRODUCT_TAXCATEGORY.xml Thu Dec 26 13:48:16 2013 +0100 @@ -53,7 +53,10 @@ RETURN v_prodtaxcategory_id; END IF; BEGIN - v_Sql := 'SELECT ' || v_dbprefix || '_get_product_taxcategory' || '(''' || coalesce(p_product_id, '') || ''', ''' || coalesce(p_org_id, '') || ''', ''' || coalesce(p_date, '') || ''', ''' || coalesce(p_shipfrom, '') || ''', ''' || coalesce(p_shipto, '') || ''') FROM DUAL'; + v_Sql := 'SELECT ' || v_dbprefix || '_get_product_taxcategory' || '(''' || coalesce(p_product_id, '') || ''', ''' || coalesce(p_org_id, '') || ''', '; + v_sql := v_sql || CASE WHEN p_date IS NULL THEN 'NULL' ELSE '''' || p_date || '''' END || ', '; + v_sql := v_sql || CASE WHEN p_shipfrom IS NULL THEN 'NULL' ELSE '''' || p_shipfrom || '''' END || ', '; + v_sql := v_sql || CASE WHEN p_shipto IS NULL THEN 'NULL' ELSE '''' || p_shipto || '''' END || ') FROM DUAL'; EXECUTE IMMEDIATE v_Sql INTO v_taxcategory_id; EXCEPTION WHEN OTHERS THEN diff -r 34e7bab6fb21 -r 2cf255f462bf src/org/openbravo/erpCommon/ad_forms/SQLExecutor.java --- a/src/org/openbravo/erpCommon/ad_forms/SQLExecutor.java Thu Dec 26 12:10:37 2013 +0530 +++ b/src/org/openbravo/erpCommon/ad_forms/SQLExecutor.java Thu Dec 26 13:48:16 2013 +0100 @@ -205,6 +205,7 @@ xmlDocument.setData("structureHeader", dataHeader); response.setContentType("text/xls; charset=UTF-8"); + response.setHeader("Content-Disposition", "attachment"); PrintWriter out = response.getWriter(); if (log4j.isDebugEnabled()) log4j.debug("printPage - Printing document\n"); diff -r 34e7bab6fb21 -r 2cf255f462bf src/org/openbravo/materialmgmt/InventoryCountProcess.java --- a/src/org/openbravo/materialmgmt/InventoryCountProcess.java Thu Dec 26 12:10:37 2013 +0530 +++ b/src/org/openbravo/materialmgmt/InventoryCountProcess.java Thu Dec 26 13:48:16 2013 +0100 @@ -263,6 +263,8 @@ + ", '0') = coalesce(icl2." + InventoryCountLine.PROPERTY_ATTRIBUTESETVALUE + ", '0')"); where.append(" and coalesce(icl." + InventoryCountLine.PROPERTY_ORDERUOM + ", '0') = coalesce(icl2." + InventoryCountLine.PROPERTY_ORDERUOM + ", '0')"); + where.append(" and coalesce(icl." + InventoryCountLine.PROPERTY_UOM + + ", '0') = coalesce(icl2." + InventoryCountLine.PROPERTY_UOM + ", '0')"); where.append(" and icl." + InventoryCountLine.PROPERTY_STORAGEBIN + " = icl2." + InventoryCountLine.PROPERTY_STORAGEBIN); where.append(" and icl." + InventoryCountLine.PROPERTY_LINENO + " <> icl2." ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits