svn commit: r1750951 - in /ofbiz/branches/release15.12: ./ applications/accounting/webapp/accounting/WEB-INF/actions/reports/ specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/ specialpurpose/birt/webapp/accounting/reports/

[Arun Patidar-4]

Author: arunpatidar
Date: Fri Jul  1 14:58:35 2016
New Revision: 1750951

URL: http://svn.apache.org/viewvc?rev=1750951&view=rev
Log:
Applied fix from trunk for revision: 1750940
===

Applied patch from jira issue - OFBIZ-7515 - Balance Sheet PDF export fails. Thanks Rohit Koushal for your contribution.

Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy
    ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy
    ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul  1 14:58:35 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940

Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy?rev=1750951&r1=1750950&r2=1750951&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy (original)
+++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy Fri Jul  1 14:58:35 2016
@@ -38,6 +38,13 @@ if (!glFiscalTypeId) {
     return;
 }
 
+organizationPartyId = null
+if(context.organizationPartyId) {
+    organizationPartyId = context.organizationPartyId;
+} else {
+    organizationPartyId = parameters.get('ApplicationDecorator|organizationPartyId')
+}
+
 // Setup the divisions for which the report is executed
 List partyIds = PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP');
 partyIds.add(organizationPartyId);

Modified: ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy?rev=1750951&r1=1750950&r2=1750951&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy Fri Jul  1 14:58:35 2016
@@ -16,6 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+import java.sql.Timestamp;
+import org.ofbiz.base.util.Debug;
 
 def module = "BalanceSheetParameters.groovy";
 
@@ -30,6 +33,7 @@ try {
     birtParameters.glFiscalTypeId = parameters.glFiscalTypeId;
     birtParameters.organizationPartyId = parameters.organizationPartyId;
     birtParameters.userLoginId = userLogin.userLoginId;
+    birtParameters.locale = locale;
     request.setAttribute("birtParameters", birtParameters);
 } catch (e) {
     Debug.logError(e, module);

Modified: ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign?rev=1750951&r1=1750950&r2=1750951&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign (original)
+++ ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign Fri Jul  1 14:58:35 2016
@@ -23,6 +23,7 @@ under the License.
     <method name="initialize"><![CDATA[
 importPackage(Packages.org.ofbiz.base.util)
 importPackage(Packages.org.ofbiz.entity.util)
+importPackage(Packages.java.util)
 
 module = "BalanceSheet.rptdesign";
 dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
@@ -54,20 +55,27 @@ if (params["fromDate"].value) {
     fromDate = params["fromDate"].value;
 }
 
-if (!params["thruDate"].value) {
+if (params["thruDate"].value) {
     thruDate = params["thruDate"].value;
 } else {
     thruDate = UtilDateTime.nowTimestamp();
 }
 
-if (!params["glFiscalTypeId"].value) {
+if (params["glFiscalTypeId"].value) {
     glFiscalTypeId = params["glFiscalTypeId"].value;
 } else {
     glFiscalTypeId = "ACTUAL";
 }
 
+if (params["locale"].value) {
+    locale = params["glFiscalTypeId"].value;
+} else {
+    locale = "ACTUAL";
+}
+
 // call BalanceSheet.groovy script
 context = new HashMap();
+context.put("parameters", new HashMap());
 context.put("organizationPartyId", organizationPartyId);
 context.put("fromDate", fromDate);
 context.put("thruDate", thruDate);
@@ -75,7 +83,8 @@ context.put("glFiscalTypeId", glFiscalTy
 context.put("delegator", delegator);
 context.put("dispatcher", dispatcher);
 context.put("userLogin", userLogin);
-GroovyUtil.runScriptAtLocation("component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy", context);
+context.put("locale", params["locale"].value);
+GroovyUtil.runScriptAtLocation("component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy", null, context);
 
 // prepare data source lists
 assetAccountBalanceList = context.get("assetAccountBalanceList");