svn commit: r628173 - /ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java

[jacopoc]

Author: jacopoc
Date: Fri Feb 15 13:20:07 2008
New Revision: 628173

URL: http://svn.apache.org/viewvc?rev=628173&view=rev
Log:
Formatting fixes and code cleanups: no functional changes... but this paymentApplication processes really need to be refactored or rewritten.

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=628173&r1=628172&r2=628173&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Feb 15 13:20:07 2008
@@ -2187,8 +2187,8 @@
 
     private static String successMessage = null;
     public static Map updatePaymentApplicationDefBd(DispatchContext dctx, Map context) {
-            GenericDelegator delegator = dctx.getDelegator();
-            Locale locale = (Locale) context.get("locale");
+        GenericDelegator delegator = dctx.getDelegator();
+        Locale locale = (Locale) context.get("locale");
 
         if (decimals == -1 || rounding == -1) {
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingAritmeticPropertiesNotConfigured",locale));
@@ -2229,21 +2229,19 @@
                 " amountApplied: " + amountApplied +
                 " TaxAuthGeoId: " + taxAuthGeoId, module);
 
-        if (changeProcessing == null) changeProcessing = "N";    // not provided, so no change
+        if (changeProcessing == null) {
+            changeProcessing = "N";    // not provided, so no change
+        }
         
         boolean invoiceProcessing = true;
-        if (defaultInvoiceProcessing.equals("YY")) invoiceProcessing = true;
-
-        else if (defaultInvoiceProcessing.equals("NN")) invoiceProcessing = false;
-
-        else if (defaultInvoiceProcessing.equals("Y")) {
-            if (changeProcessing.equals("Y")) invoiceProcessing = false;
-            else invoiceProcessing = true;
-        }
-
-        else if (defaultInvoiceProcessing.equals("N")) {
-            if (changeProcessing.equals("Y")) invoiceProcessing = true;
-            else invoiceProcessing = false;
+        if (defaultInvoiceProcessing.equals("YY")) {
+            invoiceProcessing = true;
+        } else if (defaultInvoiceProcessing.equals("NN")) {
+            invoiceProcessing = false;
+        } else if (defaultInvoiceProcessing.equals("Y")) {
+            invoiceProcessing = !"Y".equals(changeProcessing);
+        } else if (defaultInvoiceProcessing.equals("N")) {
+            invoiceProcessing = "Y".equals(changeProcessing);
         }
 
         // on a new paymentApplication check if only billing or invoice or tax