You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/08/28 07:10:42 UTC
svn commit: r1698260 - in /ofbiz/branches/release14.12: ./
applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
Author: jleroux
Date: Fri Aug 28 05:10:42 2015
New Revision: 1698260
URL: http://svn.apache.org/r1698260
Log:
"Applied fix from trunk for revision: 1698259 "
------------------------------------------------------------------------
r1698259 | jleroux | 2015-08-28 07:09:35 +0200 (ven. 28 août 2015) | 3 lignes
A patch from Wai for "simple coding cleanup" https://issues.apache.org/jira/browse/OFBIZ-6583
This fixes and improves CompanyHeader.groovy
------------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 28 05:10:42 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696234,1697590,1697647,1697993
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696234,1697590,1697647,1697993,1698259
Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1698260&r1=1698259&r2=1698260&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original)
+++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Fri Aug 28 05:10:42 2015
@@ -45,7 +45,7 @@ if (!orderHeader && orderId) {
if (parameters.facilityId) {
response.setHeader("Content-Disposition","attachment; filename=\"PickSheet" + orderId + ".pdf" + "\";");
} else {
- response.setHeader("Content-Disposition","attachment; filename=\"" + orderId + ".pdf" + "\";");
+ response.setHeader("Content-Disposition","attachment; filename=\"" + orderId + ".pdf" + "\";");
}
} else if (shipmentId) {
shipment = from("Shipment").where("shipmentId", shipmentId).queryOne();
@@ -138,7 +138,7 @@ if (partyGroup) {
}
//If logoImageUrl not null then only set it to context else it will override the default value "/images/ofbiz_powered.gif"
if (logoImageUrl) {
- context.logoImageUrl = logoImageUrl;
+ //context.logoImageUrl = logoImageUrl;
}
// the company name
@@ -213,28 +213,28 @@ if (emails) {
// website
websiteUrls = from("PartyContactWithPurpose")
- .where("partyId", partyId, "contactMechPurposeTypeId", "PRIMARY_WEB_URLs")
+ .where("partyId", partyId, "contactMechPurposeTypeId", "PRIMARY_WEB_URL")
.filterByDate("contactFromDate", "contactThruDate", "purposeFromDate", "purposeThruDate")
.queryList();
if (websiteUrls) {
websiteUrl = EntityUtil.getFirst(websiteUrls);
context.website = from("ContactMech").where("contactMechId", websiteUrl.contactMechId).queryOne();
} else { //get web address from party contact mech
-selContacts = from("PartyContactMech")
- .where("partyId", partyId)
- .filterByDate(nowTimestamp, "fromDate", "thruDate")
- .queryList();
-if (selContacts) {
- Iterator i = selContacts.iterator();
- while (i.hasNext()) {
- website = i.next().getRelatedOne("ContactMech", false);
- if ("WEB_ADDRESS".equals(website.contactMechTypeId)) {
- context.website = website;
- break;
+ selContacts = from("PartyContactMech")
+ .where("partyId", partyId)
+ .filterByDate(nowTimestamp, "fromDate", "thruDate")
+ .queryList();
+ if (selContacts) {
+ Iterator i = selContacts.iterator();
+ while (i.hasNext()) {
+ website = i.next().getRelatedOne("ContactMech", false);
+ if ("WEB_ADDRESS".equals(website.contactMechTypeId)) {
+ context.website = website;
+ break;
+ }
}
}
}
-}
//Bank account
selPayments = from("PaymentMethod")
@@ -246,7 +246,9 @@ if (selPayments) {
}
// Tax ID Info
-partyTaxAuthInfoList = from("PartyTaxAuthInfo").where("partyId", partyId).queryList();
+partyTaxAuthInfoList = from("PartyTaxAuthInfo").where("partyId", partyId)
+ .filterByDate(nowTimestamp, "fromDate", "thruDate")
+ .queryList();
if (partyTaxAuthInfoList) {
if (address.countryGeoId) {
// if we have an address with country filter by that
@@ -259,4 +261,4 @@ if (partyTaxAuthInfoList) {
// otherwise just grab the first one
context.sendingPartyTaxId = partyTaxAuthInfoList[0].partyTaxId;
}
-}
+}
\ No newline at end of file