svn commit: r1441329 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java

[mor-2]

Author: mor
Date: Fri Feb  1 07:55:53 2013
New Revision: 1441329

URL: http://svn.apache.org/viewvc?rev=1441329&view=rev
Log:
Minor mods to log, type of the default account to be used for store credit and in the log should only be determined after checking the setting on product store.

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=1441329&r1=1441328&r2=1441329&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 07:55:53 2013
@@ -754,11 +754,15 @@ public class OrderReturnServices {
 
             // if both billingAccountId and finAccountId are supplied, look for productStore.storeCreditAccountEnumId preference
             if (finAccountId != null && billingAccountId != null) {
-                Debug.logWarning("FinAccount and BillingAccount both are supplied for storing credit, priority will be given to ProductStore preference. Default is FinAccount.", module);
-                if (productStore != null && productStore.getString("storeCreditAccountEnumId") != null && "BILLING_ACCOUNT".equals(productStore.getString("storeCreditAccountEnumId"))) {
+                if (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"))) {
+                    Debug.logWarning("Default setting on product store is billing account. Store credit will goes to billing account [" + billingAccountId + "]", module);
                     finAccountId = null;
                 } else {
                     billingAccountId = null;
+                    Debug.logWarning("Default setting on product store is financial account. Store credit will goes to financial account [" + finAccountId + "]", module);
+                }
                 }
             }