svn commit: r1650883 - in /ofbiz/branches/release14.12: ./ applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl

Author: jleroux
Date: Sun Jan 11 10:15:10 2015
New Revision: 1650883

URL: http://svn.apache.org/r1650883
Log:
"Applied fix from trunk for revision: 1650882"
------------------------------------------------------------------------
r1650882 | jleroux | 2015-01-11 11:14:14 +0100 (dim. 11 janv. 2015) | 11 lignes

A patch from Christian Carlow for "GlReconciledFinAccountTrans.ftl finAccountTrans.entryDateId should be finAccountTrans.entryDate" https://issues.apache.org/jira/browse/OFBIZ-5945

An error is thrown at accounting/control/FindFinAccountReconciliation for finAccountTrans.entryDateId because the field is supposed to be finAccountTrans.entryDate.


To reproduce, transaction records have to be associated with the glReconciliation:
1. Navigate to Accounting->Financial Account->Reconciliation
2. Click "Create New Financial Account Reconciliations" and create a glReconciliation and copy the glReconciliationId
3. Navigate to Accounting->Financial Account->Transactionsgl
4. Click "Create New" and create a new transaction with glReconciliationId set to the one created in step 2
5. Navigate to Accounting->Financial Account->Reconciliation again and an error should appear about finAccountTrans.entryDateId not being a valild field
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 11 10:15:10 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649742,1650240,1650583,1650642,1650678
+/ofbiz/trunk:1649742,1650240,1650583,1650642,1650678,1650882

Modified: ofbiz/branches/release14.12/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=1650883&r1=1650882&r2=1650883&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original)
+++ ofbiz/branches/release14.12/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Sun Jan 11 10:15:10 2015
@@ -176,7 +176,7 @@ under the License.
               <td>${finAccountTransType.description!}</td>
               <td><#if partyName?has_content>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}<a href="/partymgr/control/viewprofile?partyId=${partyName.partyId}">[${(partyName.partyId)!}]</a></#if></td>
               <td>${finAccountTrans.transactionDate!}</td>
-              <td>${finAccountTrans.entryDateId!}</td>
+              <td>${finAccountTrans.entryDate!}</td>
               <td><@ofbizCurrency amount=finAccountTrans.amount isoCode=defaultOrganizationPartyCurrencyUomId/></td>
               <td>
                 <#if finAccountTrans.paymentId?has_content>