details: https://code.openbravo.com/erp/devel/pi/rev/30de8abef686
changeset: 21198:30de8abef686
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Thu Sep 26 02:19:19 2013 +0200
summary: Fixes issue 24156: Create Shipments from Order:
Organization filter incorrect
diffstat:
src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.java | 13
++++++---
1 files changed, 9 insertions(+), 4 deletions(-)
diffs (24 lines):
diff -r 19a6d9616141 -r 30de8abef686
src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.java
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.java Thu Sep
26 01:34:23 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.java Thu Sep
26 02:19:19 2013 +0200
@@ -125,11 +125,16 @@
} else {
xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual").createXmlDocument();
- data = GenerateShipmentsmanualData.select(this, vars.getLanguage(),
+ data = GenerateShipmentsmanualData.select(
+ this,
+ vars.getLanguage(),
Utility.getContext(this, vars, "#User_Client",
"GenerateShipmentsmanual"),
- Utility.getContext(this, vars, "#User_Org",
"GenerateShipmentsmanual"), strC_BPartner_ID,
- strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"),
- Tree.getMembers(this, strTreeOrg, strAD_Org_ID));
+ Utility.getContext(this, vars, "#User_Org",
"GenerateShipmentsmanual"),
+ strC_BPartner_ID,
+ strDateFrom,
+ DateTimeData.nDaysAfter(this, strDateTo, "1"),
+ (strAD_Org_ID == null || strAD_Org_ID.isEmpty()) ?
Tree.getMembers(this, strTreeOrg,
+ strAD_Org_ID) : "'" + strAD_Org_ID + "'");
}
ToolBar toolbar = new ToolBar(this, vars.getLanguage(),
"GenerateShipmentsmanual", false, "",
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
