svn commit: r555367 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.properties src/org/ofbiz/accounting/invoice/InvoiceServices.java

[sichen]

Author: sichen
Date: Wed Jul 11 11:49:52 2007
New Revision: 555367

URL: http://svn.apache.org/viewvc?view=rev&rev=555367
Log:
Adding a log message when additional shipping charges are ignored during invoice creation from shipments because ProductStore.prorateShipping != N

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

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?view=diff&rev=555367&r1=555366&r2=555367
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Wed Jul 11 11:49:52 2007
@@ -640,6 +640,7 @@
 AccountingInvoiceCommissionEntityDataProblem=Entity/data problem creating commission invoice: ${reason}
 AccountingPageTitleAgreementPriceList=Agreement Price List
 AccountingAdditionalShippingChargeForShipment=Additional Shipping Charge For Shipment
+AccountingIgnoringAdditionalShipCharges=prorateShipping is not N for productStoreId ${productStoreId}: Additional shipping charges for shipments are ignored
 AccountingUnableToAuthAdditionalShipCharges=Unable to authorize additional shipping charges for shipmentId ${shipmentId} to paymentMethodId ${paymentMethodId} (orderPaymentPreferenceId ${orderPaymentPreferenceId})
 AccountingTroubleCallingAuthOrderPaymentPreferenceService=Trouble calling authOrderPaymentPreference service
 AccountingTroubleCallingCreateInvoicesFromShipmentService=Trouble calling createInvoicesFromShipment service; invoice not created for shipment [${shipmentId}]

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?view=diff&rev=555367&r1=555366&r2=555367
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Wed Jul 11 11:49:52 2007
@@ -1497,6 +1497,8 @@
                         }
                     }
                 }
+            } else {
+                Debug.logInfo(UtilProperties.getMessage(resource, "AccountingIgnoringAdditionalShipCharges", productStore.getAllFields(), locale), module);
             }
 
             // call the createInvoiceForOrder service for each order