0024183: Payment posting does not take into account the dimensions at payment schedule detail level

diff --git a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
@@ -241,14 +241,23 @@
             .getFINPaymentScheduleDetailList().get(0).getSalesRegion() != null ? paymentDetails
             .get(i).getFINPaymentScheduleDetailList().get(0).getSalesRegion().getId() : "");
         FieldProviderFactory.setField(data[i], "lineno", transaction.getLineNo().toString());
-
+        FieldProviderFactory
+            .setField(data[i], "cCostcenterId", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getCostCenter() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getCostCenter().getId() : "");
         try { // Get User1_ID and User2_ID using xsql
           ConnectionProvider conn = new DalConnectionProvider(false);
           DocFINFinAccTransactionData[] trxInfo = DocFINFinAccTransactionData.select(conn,
               transaction.getId());
           if (trxInfo.length > 0) {
-            FieldProviderFactory.setField(data[i], "user1Id", trxInfo[0].user1Id);
-            FieldProviderFactory.setField(data[i], "user2Id", trxInfo[0].user2Id);
+            FieldProviderFactory.setField(data[i], "user1Id", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getStDimension() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getStDimension().getId()
+                : trxInfo[0].user1Id);
+            FieldProviderFactory.setField(data[i], "user2Id", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getNdDimension() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getNdDimension().getId()
+                : trxInfo[0].user2Id);
           }
         } catch (Exception e) {
           log4j.error("Error while retreiving user1 and user2 - ", e);
diff --git a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
@@ -203,13 +203,23 @@
         FieldProviderFactory.setField(data[i], "cSalesregionId", paymentDetails.get(i)
             .getFINPaymentScheduleDetailList().get(0).getSalesRegion() != null ? paymentDetails
             .get(i).getFINPaymentScheduleDetailList().get(0).getSalesRegion().getId() : "");
+        FieldProviderFactory
+            .setField(data[i], "cCostcenterId", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getCostCenter() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getCostCenter().getId() : "");
 
         try { // Get User1_ID and User2_ID using xsql
           ConnectionProvider conn = new DalConnectionProvider(false);
           DocFINPaymentData[] paymentInfo = DocFINPaymentData.select(conn, payment.getId());
           if (paymentInfo.length > 0) {
-            FieldProviderFactory.setField(data[i], "user1Id", paymentInfo[0].user1Id);
-            FieldProviderFactory.setField(data[i], "user2Id", paymentInfo[0].user2Id);
+            FieldProviderFactory.setField(data[i], "user1Id", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getStDimension() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getStDimension().getId()
+                : paymentInfo[0].user1Id);
+            FieldProviderFactory.setField(data[i], "user2Id", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getNdDimension() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getNdDimension().getId()
+                : paymentInfo[0].user2Id);
           }
         } catch (Exception e) {
           log4j.error("Error while retreiving user1 and user2 - ", e);
diff --git a/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
@@ -297,13 +297,23 @@
         FieldProviderFactory.setField(data[i], "cSalesregionId", paymentDetails.get(i)
             .getFINPaymentScheduleDetailList().get(0).getSalesRegion() != null ? paymentDetails
             .get(i).getFINPaymentScheduleDetailList().get(0).getSalesRegion().getId() : "");
+        FieldProviderFactory
+            .setField(data[i], "cCostcenterId", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getCostCenter() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getCostCenter().getId() : "");
         FieldProviderFactory.setField(data[i], "lineno", transaction.getLineNo().toString());
         try { // Get User1_ID and User2_ID using xsql
           ConnectionProvider conn = new DalConnectionProvider(false);
           DocFINPaymentData[] paymentInfo = DocFINPaymentData.select(conn, payment.getId());
           if (paymentInfo.length > 0) {
-            FieldProviderFactory.setField(data[i], "user1Id", paymentInfo[0].user1Id);
-            FieldProviderFactory.setField(data[i], "user2Id", paymentInfo[0].user2Id);
+            FieldProviderFactory.setField(data[i], "user1Id", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getStDimension() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getStDimension().getId()
+                : paymentInfo[0].user1Id);
+            FieldProviderFactory.setField(data[i], "user2Id", paymentDetails.get(i)
+                .getFINPaymentScheduleDetailList().get(0).getNdDimension() != null ? paymentDetails
+                .get(i).getFINPaymentScheduleDetailList().get(0).getNdDimension().getId()
+                : paymentInfo[0].user2Id);
           }
         } catch (Exception e) {
           log4j.error("Error while retreiving user1 and user2 - ", e);