svn commit: r1809427 - in /ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports: AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign InvoiceAcctgTransEntry.rptdesign PaymentAcctgTransEntry.rptdesign

[Arun Patidar-4]

Author: arunpatidar
Date: Sat Sep 23 13:22:35 2017
New Revision: 1809427

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

Modified:
    ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
    ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
    ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign

Modified: ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1809427&r1=1809426&r2=1809427&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign Sat Sep 23 13:22:35 2017
@@ -1857,13 +1857,11 @@ if (debitTotal == creditTotal) {
     var amountLocale = null;
     var baseCurrencyUomId = delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).get("baseCurrencyUomId");
     if ("THB".equals(baseCurrencyUomId)) {
-        rule = "%bahts-and-stangs";
         amountLocale = new java.util.Locale("th");
     } else {
-        rule = "%dollars-and-cents";
         amountLocale = new java.util.Locale("us");
     }
-    var formatRuleBaseAmount = UtilNumber.formatRuleBasedAmount(debitTotal, rule, amountLocale).toUpperCase();
+    var formatRuleBaseAmount = UtilNumber.formatRuleBasedAmount(debitTotal, amountLocale).toUpperCase();
     this.setDisplayValue(formatRuleBaseAmount);
 } else {
     this.setDisplayValue("Debit not equal to credit.");

Modified: ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1809427&r1=1809426&r2=1809427&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign Sat Sep 23 13:22:35 2017
@@ -1255,13 +1255,11 @@ this.setDisplayValue(exchangeRate);]]></
     var amountLocale = null;
     var baseCurrencyUomId = delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).get("baseCurrencyUomId");
     if ("THB".equals(baseCurrencyUomId)) {
-        rule = "%bahts-and-stangs";
         amountLocale = new java.util.Locale("th");
     } else {
-        rule = "%dollars-and-cents";
         amountLocale = new java.util.Locale("us");
     }
-    var formatRuleBaseAmount = UtilNumber.formatRuleBasedAmount(debitTotal, rule, amountLocale).toUpperCase();
+    var formatRuleBaseAmount = UtilNumber.formatRuleBasedAmount(debitTotal, amountLocale).toUpperCase();
     this.setDisplayValue(formatRuleBaseAmount);
 } else {
     this.setDisplayValue("Debit not equal to credit.");

Modified: ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign?rev=1809427&r1=1809426&r2=1809427&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign Sat Sep 23 13:22:35 2017
@@ -1251,13 +1251,11 @@ this.setDisplayValue(exchangeRate);]]></
     var amountLocale = null;
     var baseCurrencyUomId = delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", organizationPartyId), false).get("baseCurrencyUomId");
     if ("THB".equals(baseCurrencyUomId)) {
-        rule = "%bahts-and-stangs";
         amountLocale = new java.util.Locale("th");
     } else {
-        rule = "%dollars-and-cents";
         amountLocale = new java.util.Locale("us");
     }
-    var formatRuleBaseAmount = UtilNumber.formatRuleBasedAmount(debitTotal, rule, amountLocale).toUpperCase();
+    var formatRuleBaseAmount = UtilNumber.formatRuleBasedAmount(debitTotal, amountLocale).toUpperCase();
     this.setDisplayValue(formatRuleBaseAmount);
 } else {
     this.setDisplayValue("Debit not equal to credit.");