Author: jleroux
Date: Tue Jan 18 14:09:31 2011
New Revision: 1060385
URL: http://svn.apache.org/viewvc?rev=1060385&view=rev
Log:
"Applied fix from trunk for revision: 1060368" (conflicts handled by hand)
------------------------------------------------------------------------
r1060368 | jleroux | 2011-01-18 14:41:15 +0100 (mar., 18 janv. 2011) | 7 lines
Fix a bunch of issues reported by Paul Foxworthy in OFBIZ-4114
* For calcHeaderAdj as it's not a service but a private method we should not
use return ServiceUtil.returnError here but BigDecimal.ZERO (return was missing
Paul reported)
* Same for createInvoiceTerms but not return as it returns void
* Fix all other cases by adding return as suggested by Paul
------------------------------------------------------------------------
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 18 14:09:31 2011
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,810
807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832880,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,92803
7,928166,928171,928180,928470,928477,929582,931594-931595,933157,935494,936817,941047,941431,941440,942884,943168,944895,945118,948017,950866,950870,950893,951005,951062,951098,951367,951381,951672,953294,953671,954135,954956,958343,958514,958521,960997,964558,965470,965916,966785,967098,978893,980641-980642,980935,981051,981104,981123,981288,983920,985718,985856,985902,990339,995686,996069,996078-996079,996563,997419-997420,997440,1003434,1003450,1004139,1037567,1040044,1042009,1042034,1042038,1042132,1042188,1042317,1042348,1042411,1043996-1043998,1050602,1056305,1057519,1058488,1059180,1060261
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,810
807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832880,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,92803
7,928166,928171,928180,928470,928477,929582,931594-931595,933157,935494,936817,941047,941431,941440,942884,943168,944895,945118,948017,950866,950870,950893,951005,951062,951098,951367,951381,951672,953294,953671,954135,954956,958343,958514,958521,960997,964558,965470,965916,966785,967098,978893,980641-980642,980935,981051,981104,981123,981288,983920,985718,985856,985902,990339,995686,996069,996078-996079,996563,997419-997420,997440,1003434,1003450,1004139,1037567,1040044,1042009,1042034,1042038,1042132,1042188,1042317,1042348,1042411,1043996-1043998,1050602,1056305,1057519,1058488,1059180,1060261,1060368
Modified:
ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1060385&r1=1060384&r2=1060385&view=diff
==============================================================================
---
ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
(original)
+++
ofbiz/branches/release09.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Tue Jan 18 14:09:31 2011
@@ -2083,13 +2083,12 @@ public class InvoiceServices {
Map createInvoiceItemResult = null;
try {
createInvoiceItemResult =
dispatcher.runSync("createInvoiceItem", createInvoiceItemContext);
- } catch ( GenericServiceException e ) {
- String errMsg =
UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceItemFromOrder",locale)
+ ": " + e.toString();
- Debug.logError(e, errMsg, module);
- ServiceUtil.returnError(errMsg);
+ } catch (GenericServiceException e) {
+ Debug.logError(e, "Service/other problem creating
InvoiceItem from order header adjustment", module);
+ return adjAmount;
}
if (ServiceUtil.isError(createInvoiceItemResult)) {
-
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingInvoiceItemFromOrder",locale),
null, null, createInvoiceItemResult);
+ return adjAmount;
}
// Create the OrderAdjustmentBilling record
@@ -2101,10 +2100,9 @@ public class InvoiceServices {
createOrderAdjustmentBillingContext.put("userLogin",
userLogin);
try {
- Map createOrderAdjustmentBillingResult =
dispatcher.runSync("createOrderAdjustmentBilling",
createOrderAdjustmentBillingContext);
- } catch ( GenericServiceException e ) {
-
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingOrderAdjustmentBillingFromOrder",locale),
null, null, createOrderAdjustmentBillingContext);
- }
+ dispatcher.runSync("createOrderAdjustmentBilling",
createOrderAdjustmentBillingContext);
+ } catch (GenericServiceException e) {
+ return adjAmount; }
}
amount = amount.setScale(decimals, rounding);
@@ -2141,13 +2139,12 @@ public class InvoiceServices {
Map createInvoiceItemResult = null;
try {
createInvoiceItemResult =
dispatcher.runSync("createInvoiceItem", createInvoiceItemContext);
- } catch ( GenericServiceException e ) {
- String errMsg =
UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceItemFromOrder",locale)
+ ": " + e.toString();
- Debug.logError(e, errMsg, module);
- ServiceUtil.returnError(errMsg);
+ } catch (GenericServiceException e) {
+ Debug.logError(e, "Service/other problem creating
InvoiceItem from order header adjustment", module);
+ return adjAmount;
}
if (ServiceUtil.isError(createInvoiceItemResult)) {
-
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingInvoiceItemFromOrder",locale),
null, null, createInvoiceItemResult);
+ return adjAmount;
}
// Create the OrderAdjustmentBilling record
@@ -2159,9 +2156,9 @@ public class InvoiceServices {
createOrderAdjustmentBillingContext.put("userLogin",
userLogin);
try {
- Map createOrderAdjustmentBillingResult =
dispatcher.runSync("createOrderAdjustmentBilling",
createOrderAdjustmentBillingContext);
- } catch ( GenericServiceException e ) {
-
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingOrderAdjustmentBillingFromOrder",locale),
null, null, createOrderAdjustmentBillingContext);
+ dispatcher.runSync("createOrderAdjustmentBilling",
createOrderAdjustmentBillingContext);
+ } catch (GenericServiceException e) {
+ return adjAmount;
}
}
@@ -2198,13 +2195,11 @@ public class InvoiceServices {
Map createInvoiceTermResult = null;
try {
createInvoiceTermResult =
dispatcher.runSync("createInvoiceTerm", createInvoiceTermContext);
- } catch ( GenericServiceException e ) {
- String errMsg =
UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceTermFromOrder",locale)
+ ": " + e.toString();
- Debug.logError(e, errMsg, module);
- ServiceUtil.returnError(errMsg);
+ } catch (GenericServiceException e) {
+ Debug.logError(e, "Service/other problem creating
InvoiceItem from order header adjustment", module);
}
if (ServiceUtil.isError(createInvoiceTermResult)) {
-
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingInvoiceTermFromOrder",locale),
null, null, createInvoiceTermResult);
+ Debug.logError("Service/other problem creating InvoiceItem
from order header adjustment", module);
}
}
}
@@ -2344,7 +2339,7 @@ public class InvoiceServices {
try {
payment = delegator.findByPrimaryKey("Payment",
UtilMisc.toMap("paymentId", paymentId));
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
if (payment == null) {
errorMessageList.add(UtilProperties.getMessage(resource,
"AccountingPaymentRecordNotFound",UtilMisc.toMap("paymentId",paymentId),locale));
@@ -2375,7 +2370,7 @@ public class InvoiceServices {
try {
toPayment = delegator.findByPrimaryKey("Payment",
UtilMisc.toMap("paymentId", toPaymentId));
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
if (toPayment == null) {
errorMessageList.add(UtilProperties.getMessage(resource,
"AccountingPaymentRecordNotFound",UtilMisc.toMap("paymentId",toPaymentId),locale));
@@ -2425,7 +2420,7 @@ public class InvoiceServices {
try {
invoice = delegator.findByPrimaryKey("Invoice",
UtilMisc.toMap("invoiceId", invoiceId));
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
if (invoice == null) {
@@ -2444,7 +2439,7 @@ public class InvoiceServices {
try {
billingAccount = delegator.findByPrimaryKey("BillingAccount",
UtilMisc.toMap("billingAccountId", billingAccountId));
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
if (billingAccount == null) {
errorMessageList.add(UtilProperties.getMessage(resource,
"AccountingBillingAccountNotFound",UtilMisc.toMap("billingAccountId",billingAccountId),
locale));
@@ -2471,7 +2466,7 @@ public class InvoiceServices {
try {
invoice = delegator.findByPrimaryKey("Invoice",
UtilMisc.toMap("invoiceId", invoiceId));
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
if (invoice == null) {
@@ -2544,7 +2539,7 @@ public class InvoiceServices {
try {
invoiceItem = delegator.findByPrimaryKey("InvoiceItem",
UtilMisc.toMap("invoiceId", invoiceId, "invoiceItemSeqId", invoiceItemSeqId));
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
if (invoiceItem == null) {
@@ -2612,7 +2607,7 @@ public class InvoiceServices {
try {
paymentApplication =
delegator.findByPrimaryKey("PaymentApplication",
UtilMisc.toMap("paymentApplicationId", paymentApplicationId));
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
if (paymentApplication == null) {
@@ -2847,7 +2842,7 @@ public class InvoiceServices {
try {
paymentApplications =
invoiceItem.getRelated("PaymentApplication");
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
BigDecimal tobeApplied = ZERO;
// item total amount - already applied (if any)
@@ -3019,7 +3014,7 @@ public class InvoiceServices {
try {
checkAppl.store();
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
} else if
(paymentApplication.getString("paymentApplicationId").equals(checkAppl.getString("paymentApplicationId")))
{
// update existing record inplace
@@ -3028,7 +3023,7 @@ public class InvoiceServices {
try {
checkAppl.store();
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
} else { // two existing records, an updated one added to the
existing one
// add 2 amounts together
@@ -3039,14 +3034,14 @@ public class InvoiceServices {
try {
paymentApplication.remove();
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
// update amount existing record
if (debug) Debug.logInfo("Update paymentApplication
record: " + checkAppl.getString("paymentApplicationId") + " with
appliedAmount:" + checkAppl.getBigDecimal("amountApplied"), module);
try {
checkAppl.store();
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
}
} else {
@@ -3058,7 +3053,7 @@ public class InvoiceServices {
try {
paymentApplication.create();
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
} else {
// update existing record (could not be found because a non
existing combination of paymentId/invoiceId/invoiceSeqId/ etc... was provided
@@ -3066,7 +3061,7 @@ public class InvoiceServices {
try {
paymentApplication.store();
} catch (GenericEntityException e) {
- ServiceUtil.returnError(e.getMessage());
+ return ServiceUtil.returnError(e.getMessage());
}
}
}
