svn commit: r1060383 - in /ofbiz/branches/release10.04: ./ applications/accounting/src/or
Locked
svn commit: r1060383 - in /ofbiz/branches/release10.04: ./ applications/accounting/src/or
 
|
Author: jleroux
Date: Tue Jan 18 14:03:00 2011 New Revision: 1060383 URL: http://svn.apache.org/viewvc?rev=1060383&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/release10.04/ (props changed) ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 18 14:03:00 2011 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060261 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060261,1060368 Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1060383&r1=1060382&r2=1060383&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Tue Jan 18 14:03:00 2011 @@ -2156,12 +2156,11 @@ public class InvoiceServices { 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); + 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 @@ -2175,8 +2174,7 @@ public class InvoiceServices { try { Map<String, Object> createOrderAdjustmentBillingResult = dispatcher.runSync("createOrderAdjustmentBilling", createOrderAdjustmentBillingContext); } catch (GenericServiceException e) { - ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingOrderAdjustmentBillingFromOrder",locale), null, null, createOrderAdjustmentBillingContext); - } + return adjAmount; } } amount = amount.setScale(decimals, rounding); @@ -2214,12 +2212,11 @@ public class InvoiceServices { 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); + 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 @@ -2233,7 +2230,7 @@ public class InvoiceServices { try { Map<String, Object> createOrderAdjustmentBillingResult = dispatcher.runSync("createOrderAdjustmentBilling", createOrderAdjustmentBillingContext); } catch (GenericServiceException e) { - ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingOrderAdjustmentBillingFromOrder",locale), null, null, createOrderAdjustmentBillingContext); + return adjAmount; } } @@ -2269,12 +2266,10 @@ public class InvoiceServices { 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); + 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); } } } @@ -2411,7 +2406,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)); @@ -2442,7 +2437,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)); @@ -2492,7 +2487,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) { @@ -2510,7 +2505,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)); @@ -2537,7 +2532,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) { @@ -2610,7 +2605,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) { @@ -2678,7 +2673,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) { @@ -2914,7 +2909,7 @@ public class InvoiceServices { try { paymentApplications = currentInvoiceItem.getRelated("PaymentApplication"); } catch (GenericEntityException e) { - ServiceUtil.returnError(e.getMessage()); + return ServiceUtil.returnError(e.getMessage()); } BigDecimal tobeApplied = ZERO; // item total amount - already applied (if any) @@ -3084,7 +3079,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 in-place @@ -3093,7 +3088,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 @@ -3104,14 +3099,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 { @@ -3123,7 +3118,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 @@ -3131,7 +3126,7 @@ public class InvoiceServices { try { paymentApplication.store(); } catch (GenericEntityException e) { - ServiceUtil.returnError(e.getMessage()); + return ServiceUtil.returnError(e.getMessage()); } } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |