details: /erp/stable/2.50/rev/1d7dfcf437a7
changeset: 9347:1d7dfcf437a7
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Wed Apr 06 17:22:43 2011 +0200
summary: Fixes bug 16645. Error creating shipments with negative quantites
details: /erp/stable/2.50/rev/78da9ccb3f5a
changeset: 9348:78da9ccb3f5a
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Fri Apr 08 15:04:11 2011 +0200
summary: Fixes bug 16728 Product Selector cleared after seach in PriceList
Report
details: /erp/stable/2.50/rev/89d9fe99bdde
changeset: 9349:89d9fe99bdde
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Fri Apr 08 15:05:10 2011 +0200
summary: Fixes bug 16698. PriceList Report does not properly filter if price
list is empty
diffstat:
src-db/database/model/functions/M_INOUT_CREATE.xml | 2 +
src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html | 4 +--
src/org/openbravo/erpCommon/ad_reports/ReportPricelist.java | 14 +++---------
3 files changed, 7 insertions(+), 13 deletions(-)
diffs (60 lines):
diff -r b4b65665f2f1 -r 89d9fe99bdde
src-db/database/model/functions/M_INOUT_CREATE.xml
--- a/src-db/database/model/functions/M_INOUT_CREATE.xml Thu Apr 07
12:55:31 2011 +0200
+++ b/src-db/database/model/functions/M_INOUT_CREATE.xml Fri Apr 08
15:05:10 2011 +0200
@@ -418,6 +418,8 @@
FETCH Cur_Storage INTO v_storage;
IF Cur_Storage%NOTFOUND THEN
NEXT_PRODUCT:=true;
+ CLOSE Cur_Storage;
+ Cur_Storage_ISOPEN:=false;
END IF;
IF(NOT NEXT_PRODUCT) THEN
v_QtyStorage:=v_storage.QtyOnHand;
diff -r b4b65665f2f1 -r 89d9fe99bdde
src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html Thu Apr
07 12:55:31 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html Fri Apr
08 15:05:10 2011 +0200
@@ -57,12 +57,10 @@
}
function validate() {
var frm = document.frmMain;
+ markCheckedAllElements(frm.inpmProductId_IN);
if (frm.inpmPricelistVersion.value == ""){
setWindowElementFocus(frm.inpmPricelistVersion);
}
- else{
- markCheckedAllElements(frm.inpmProductId_IN);
- }
return true;
}
diff -r b4b65665f2f1 -r 89d9fe99bdde
src/org/openbravo/erpCommon/ad_reports/ReportPricelist.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportPricelist.java Thu Apr
07 12:55:31 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportPricelist.java Fri Apr
08 15:05:10 2011 +0200
@@ -29,6 +29,7 @@
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.erpCommon.businessUtility.WindowTabs;
+import org.openbravo.erpCommon.info.SelectorUtilityData;
import org.openbravo.erpCommon.utility.ComboTableData;
import org.openbravo.erpCommon.utility.LeftTabsBar;
import org.openbravo.erpCommon.utility.NavigationBar;
@@ -141,16 +142,9 @@
xmlDocument.setParameter("mProductCategoryId", strProductCategory);
xmlDocument.setParameter("mPricelistVersionId", strPricelistversionId);
- try {
- ComboTableData comboTableData = new ComboTableData(vars, this, "LIST",
"MProductId_IN",
- "", "", Utility.getContext(this, vars, "#AccessibleOrgTree", ""),
Utility.getContext(
- this, vars, "#User_Client", ""), 0);
- Utility.fillSQLParameters(this, vars, null, comboTableData, "",
strmProductId);
- xmlDocument.setData("reportMProductId_IN", "liststructure",
comboTableData.select(false));
- comboTableData = null;
- } catch (Exception ex) {
- throw new ServletException(ex);
- }
+ xmlDocument.setData("reportMProductId_IN", "liststructure",
SelectorUtilityData.selectMproduct(
+ this, Utility.getContext(this, vars, "#AccessibleOrgTree", ""),
Utility.getContext(this,
+ vars, "#User_Client", ""), strmProductId));
try {
ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR",
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits