# HG changeset patch
# User Ben Sommerville <ben.sommerville@eintel.com.au>
# Date 1286946679 -39600
# Node ID 6cb13cf08cfa44d885ebacb3ee99dd4171b25129
# Parent  63658371c9fd6219a0c4ab19cb09d799468e5e3d
Fixes issue 14851: Don't subtract writeoff from payment amount when creating FIN_Transaction

diff -r 63658371c9fd -r 6cb13cf08cfa src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
--- a/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java	Fri Oct 08 17:06:56 2010 +0200
+++ b/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java	Wed Oct 13 16:11:19 2010 +1100
@@ -106,10 +106,10 @@
       newTransaction.setLineNo(getTransactionMaxLineNo(payment.getAccount()) + 10);
       newTransaction
           .setDepositAmount(payment.getDocumentType().getDocumentCategory().equals("ARR") ? payment
-              .getAmount().subtract(payment.getWriteoffAmount()) : BigDecimal.ZERO);
+              .getAmount() : BigDecimal.ZERO);
       newTransaction
           .setPaymentAmount(payment.getDocumentType().getDocumentCategory().equals("ARR") ? BigDecimal.ZERO
-              : payment.getAmount().subtract(payment.getWriteoffAmount()));
+              : payment.getAmount());
       newTransaction.setStatus(newTransaction.getDepositAmount().compareTo(
           newTransaction.getPaymentAmount()) > 0 ? "RPR" : "PPM");
       OBDal.getInstance().save(newTransaction);
@@ -261,8 +261,7 @@
   public static FieldProvider[] getTransactionsFiltered(FIN_FinancialAccount account,
       Date statementDate, boolean hideAfterDate) {
 
-    String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties().getProperty(
-        "dateFormat.java");
+    String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties().getJavaDateFormat();
     SimpleDateFormat dateFormater = new SimpleDateFormat(dateFormat);
     OBContext.setAdminMode();
     try {