svn commit: r1809426 - in /ofbiz/ofbiz-framework/trunk/applications/accounting/template: payment/PrintChecks.fo.ftl reports/InvoiceAcctgTransEntry.fo.ftl

[Arun Patidar-4]

Author: arunpatidar
Date: Sat Sep 23 13:22:03 2017
New Revision: 1809426

URL: http://svn.apache.org/viewvc?rev=1809426&view=rev
Log:
ADDED: Apply new ruleSet definition into Ofbiz files. (OFBIZ-9515)
Thanks Pradhan Yash Sharma for your contribution.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl
    ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/InvoiceAcctgTransEntry.fo.ftl

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl?rev=1809426&r1=1809425&r2=1809426&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/PrintChecks.fo.ftl Sat Sep 23 13:22:03 2017
@@ -76,7 +76,7 @@ by hand from a real template using a rul
                                                 </fo:table-row>
                                                 <fo:table-row>
                                                     <fo:table-cell number-columns-spanned="2">
-                                                        <#assign amount = Static["org.apache.ofbiz.base.util.UtilNumber"].formatRuleBasedAmount(payment.getDouble("amount"), "%dollars-and-hundredths", locale).toUpperCase()>
+                                                        <#assign amount = Static["org.apache.ofbiz.base.util.UtilNumber"].formatRuleBasedAmount(payment.getDouble("amount"), locale).toUpperCase()>
                                                         <fo:block padding-before="0.4cm" margin-left="1.3cm">${amount}<#list 1..(100-amount.length()) as x>*</#list></fo:block>
                                                     </fo:table-cell>
                                                 </fo:table-row>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/InvoiceAcctgTransEntry.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/InvoiceAcctgTransEntry.fo.ftl?rev=1809426&r1=1809425&r2=1809426&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/InvoiceAcctgTransEntry.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/InvoiceAcctgTransEntry.fo.ftl Sat Sep 23 13:22:03 2017
@@ -157,13 +157,11 @@ by hand from a real template using a rul
                     <#if debitTotal == creditTotal>
                       <#assign baseCurrencyUomId = (delegator.findOne("PartyAcctgPreference", {"partyId" : partyId}, true))!>
                       <#if baseCurrencyUomId?has_content && "THB" == baseCurrencyUomId.baseCurrencyUomId>
-                        <#assign rule = "%bahts-and-stangs">
                         <#assign locale = Static["org.apache.ofbiz.base.util.UtilMisc"].parseLocale("th")!/>
                       <#else>
-                        <#assign rule = "%dollars-and-cents">
                         <#assign locale = Static["org.apache.ofbiz.base.util.UtilMisc"].parseLocale("en_us")!/>
                       </#if>
-                      <#assign amount = Static["org.apache.ofbiz.base.util.UtilNumber"].formatRuleBasedAmount(debitTotal, rule, locale).toUpperCase()>
+                      <#assign amount = Static["org.apache.ofbiz.base.util.UtilNumber"].formatRuleBasedAmount(debitTotal, locale).toUpperCase()>
                       ${uiLabelMap.AccountingTotalCapital} : ${amount!}
                     <#else>
                       ${uiLabelMap.AccountingDebitNotEqualCredit}