details: /erp/devel/pi/rev/6d605d17991c
changeset: 8575:6d605d17991c
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Oct 20 12:56:48 2010 +0200
summary: Fixes issue 14923: If there is not warehouse defined, taxes are not
properly calculated
diffstat:
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 14 +++++----
1 files changed, 8 insertions(+), 6 deletions(-)
diffs (24 lines):
diff -r 6aa65b673861 -r 6d605d17991c
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java Tue Oct
19 17:18:06 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java Wed Oct
20 12:56:48 2010 +0200
@@ -75,12 +75,14 @@
.getOrganizationStructureProvider(vars.getClient());
if (!strADOrgID.equals(strWarehouseOrg)) {
Organization org = OBDal.getInstance().get(Organization.class,
strADOrgID);
- Organization warehouseOrg =
OBDal.getInstance().get(Organization.class, strWarehouseOrg);
- if (!osp.isInNaturalTree(org, warehouseOrg) &&
!osp.isInNaturalTree(warehouseOrg, org))
- strWarehouseForOrg = SLOrderProductData.getWarehouseOfOrg(this,
vars.getClient(),
- strADOrgID);
- if (!strWarehouseForOrg.equals(""))
- strWharehouse = strWarehouseForOrg;
+ if (strWarehouseOrg != null) {
+ Organization warehouseOrg =
OBDal.getInstance().get(Organization.class, strWarehouseOrg);
+ if (!osp.isInNaturalTree(org, warehouseOrg) &&
!osp.isInNaturalTree(warehouseOrg, org))
+ strWarehouseForOrg = SLOrderProductData.getWarehouseOfOrg(this,
vars.getClient(),
+ strADOrgID);
+ if (!strWarehouseForOrg.equals(""))
+ strWharehouse = strWarehouseForOrg;
+ }
}
String strTabId = vars.getStringParameter("inpTabId");
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
