You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pr...@apache.org on 2016/06/04 10:49:46 UTC
svn commit: r1746805 -
/ofbiz/trunk/applications/accounting/widget/GlForms.xml
Author: pranayp
Date: Sat Jun 4 10:49:46 2016
New Revision: 1746805
URL: http://svn.apache.org/viewvc?rev=1746805&view=rev
Log:
[OFBIZ-7171] Fixed error in accounting transactions pdf due to missing child block in case when there was a no field for exchange rate when currencyUomId equals to origCurrencyUomId. Thanks Amardeep Singh Jhajj for the contribution.
Modified:
ofbiz/trunk/applications/accounting/widget/GlForms.xml
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=1746805&r1=1746804&r2=1746805&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sat Jun 4 10:49:46 2016
@@ -1166,6 +1166,7 @@ under the License.
<field name="accountCode"><display/></field>
<field name="accountName"><display/></field>
<field name="currencyUomId" title="${uiLabelMap.AccountingOriginalCurrency}"><display description="${origCurrencyUomId}"/></field>
+ <field name="exchangeRate" use-when="${origCurrencyUomId==currencyUomId}"><display/></field>
<field name="exchangeRate" use-when="${origCurrencyUomId!=currencyUomId}"><display description="${origAmount/amount} ${origCurrencyUomId}/${currencyUomId}"/></field>
<field name="debitAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('D'))return(amount);if(debitCreditFlag.equals('C'))return(0);}"/></field>
<field name="creditAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('C'))return(amount);if(debitCreditFlag.equals('D'))return(0);}"/></field>