You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2013/02/01 09:02:53 UTC
svn commit: r1441333 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
Author: mor
Date: Fri Feb 1 08:02:52 2013
New Revision: 1441333
URL: http://svn.apache.org/viewvc?rev=1441333&view=rev
Log:
Final formatting changes.
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1441333&r1=1441332&r2=1441333&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Fri Feb 1 08:02:52 2013
@@ -754,14 +754,14 @@ public class OrderReturnServices {
// if both billingAccountId and finAccountId are supplied, look for productStore.storeCreditAccountEnumId preference
if (finAccountId != null && billingAccountId != null && productStore != null && productStore.getString("storeCreditAccountEnumId") != null) {
- Debug.logWarning("You have entered both financial account and billing account for store credit. Based on the configuration on product store, only one of them will be selected.", module);
- if ("BILLING_ACCOUNT".equals(productStore.getString("storeCreditAccountEnumId"))) {
- finAccountId = null;
- Debug.logWarning("Default setting on product store is billing account. Store credit will goes to billing account [" + billingAccountId + "]", module);
- } else {
- billingAccountId = null;
- Debug.logWarning("Default setting on product store is financial account. Store credit will goes to financial account [" + finAccountId + "]", module);
- }
+ Debug.logWarning("You have entered both financial account and billing account for store credit. Based on the configuration on product store, only one of them will be selected.", module);
+ if ("BILLING_ACCOUNT".equals(productStore.getString("storeCreditAccountEnumId"))) {
+ finAccountId = null;
+ Debug.logWarning("Default setting on product store is billing account. Store credit will goes to billing account [" + billingAccountId + "]", module);
+ } else {
+ billingAccountId = null;
+ Debug.logWarning("Default setting on product store is financial account. Store credit will goes to financial account [" + finAccountId + "]", module);
+ }
}
if (finAccountId == null && billingAccountId == null) {