svn commit: r1672853 - in /ofbiz/trunk: applications/product/src/org/ofbiz/product/category/ framework/common/webcommon/ framework/webapp/src/org/ofbiz/webapp/control/ specialpurpose/hhfacility/webapp
Author: deepak
Date: Sat Apr 11 09:43:10 2015
New Revision: 1672853
URL: http://svn.apache.org/r1672853
Log:
Applied patch from jira issue OFBIZ-6222 - Change the field name 'tenantId' to
'userTenantId' from login page and ContextFilter
Thanks Arun Patidar for reporting the issue and providing the patch.
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java
ofbiz/trunk/framework/common/webcommon/changePassword.ftl
ofbiz/trunk/framework/common/webcommon/login.ftl
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl
ofbiz/trunk/specialpurpose/myportal/widget/login.ftl
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java?rev=1672853r1=1672852r2=1672853view=diff
==
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java
Sat Apr 11 09:43:10 2015
@@ -333,7 +333,7 @@ public class SeoContextFilter extends Co
request.setAttribute(dispatcher, dispatcher);
request.setAttribute(security, security);
-request.setAttribute(tenantId, tenantId);
+request.setAttribute(userTenantId, tenantId);
}
// NOTE DEJ20101130: do NOT always put the delegator name in
the user's session because the user may
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java?rev=1672853r1=1672852r2=1672853view=diff
==
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java
Sat Apr 11 09:43:10 2015
@@ -299,7 +299,7 @@ public class UrlRegexpContextFilter exte
httpRequest.getSession().setAttribute(dispatcher,
dispatcher);
httpRequest.getSession().setAttribute(security,
security);
-httpRequest.setAttribute(tenantId, tenantId);
+httpRequest.setAttribute(userTenantId, tenantId);
}
// NOTE DEJ20101130: do NOT always put the delegator name in
the user's session because the user may
Modified: ofbiz/trunk/framework/common/webcommon/changePassword.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/changePassword.ftl?rev=1672853r1=1672852r2=1672853view=diff
==
--- ofbiz/trunk/framework/common/webcommon/changePassword.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/changePassword.ftl Sat Apr 11
09:43:10 2015
@@ -18,7 +18,7 @@ under the License.
--
#assign username =
requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default())
-#assign tenantId = requestParameters.tenantId!
+#assign tenantId = requestParameters.userTenantId!
center
div class=screenlet login-screenlet
@@ -29,7 +29,7 @@ under the License.
form method=post action=@ofbizUrllogin/@ofbizUrl name=loginform
input type=hidden name=requirePasswordChange value=Y/
input type=hidden name=USERNAME value=${username}/
- input type=hidden name=tenantId value=${tenantId!}/
+ input type=hidden name=userTenantId value=${tenantId!}/
table cellspacing=0
tr
td class=label${uiLabelMap.CommonUsername}/td
Modified: ofbiz/trunk/framework/common/webcommon/login.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/login.ftl?rev=1672853r1=1672852r2=1672853view=diff
==
--- ofbiz/trunk/framework/common/webcommon/login.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/login.ftl Sat Apr 11 09:43:10 2015
@@ -43,13 +43,13 @@ under the License.
tdinput type=password name=PASSWORD value=
size=20//td
/tr
#if (Y == useMultitenant)
- #if !requestAttributes.tenantId??
+ #if !requestAttributes.userTenantId??
tr
td class=label${uiLabelMap.CommonTenantId}/td
-
svn commit: r1672849 - in /ofbiz/branches/release13.07/framework: common/src/org/ofbiz/common/email/NotificationServices.java webapp/src/org/ofbiz/webapp/control/RequestHandler.java webapp/src/org/ofb
Author: deepak
Date: Sat Apr 11 09:06:56 2015
New Revision: 1672849
URL: http://svn.apache.org/r1672849
Log:
Manually applied fix from trunk r#1672846
Applied patch from jira issue OFBIZ-6205 - Use EntityUtilProperties to get the
WebSiteProperties
Thanks Arun Patidar for reporting the issue and providing the patch.
Modified:
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/email/NotificationServices.java
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java
Modified:
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/email/NotificationServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/email/NotificationServices.java?rev=1672849r1=1672848r2=1672849view=diff
==
---
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/email/NotificationServices.java
(original)
+++
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/email/NotificationServices.java
Sat Apr 11 09:06:56 2015
@@ -40,6 +40,7 @@ import org.ofbiz.base.util.template.Free
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
@@ -295,19 +296,19 @@ public class NotificationServices {
// fill in any missing properties with fields from the global file
if (UtilValidate.isEmpty(httpsPort)) {
-httpsPort = UtilProperties.getPropertyValue(url.properties,
port.https, 443);
+httpsPort =
EntityUtilProperties.getPropertyValue(url.properties, port.https, 443,
delegator);
}
if (UtilValidate.isEmpty(httpsServer)) {
-httpsServer =
UtilProperties.getPropertyValue(url.properties, force.https.host,
localServer);
+httpsServer =
EntityUtilProperties.getPropertyValue(url.properties, force.https.host,
localServer, delegator);
}
if (UtilValidate.isEmpty(httpPort)) {
-httpPort = UtilProperties.getPropertyValue(url.properties,
port.http, 80);
+httpPort =
EntityUtilProperties.getPropertyValue(url.properties, port.http, 80,
delegator);
}
if (UtilValidate.isEmpty(httpServer)) {
-httpServer = UtilProperties.getPropertyValue(url.properties,
force.http.host, localServer);
+httpServer =
EntityUtilProperties.getPropertyValue(url.properties, force.http.host,
localServer, delegator);
}
if (UtilValidate.isEmpty(enableHttps)) {
-enableHttps =
(UtilProperties.propertyValueEqualsIgnoreCase(url.properties,
port.https.enabled, Y)) ? Boolean.TRUE : Boolean.FALSE;
+enableHttps =
(EntityUtilProperties.propertyValueEqualsIgnoreCase(url.properties,
port.https.enabled, Y, delegator)) ? Boolean.TRUE : Boolean.FALSE;
}
if (ClassLoaderContainer.portOffset != 0) {
Modified:
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1672849r1=1672848r2=1672849view=diff
==
---
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
(original)
+++
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
Sat Apr 11 09:06:56 2015
@@ -50,6 +50,7 @@ import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.webapp.event.EventFactory;
import org.ofbiz.webapp.event.EventHandler;
import org.ofbiz.webapp.event.EventHandlerException;
@@ -940,11 +941,12 @@ public class RequestHandler {
}
public static String getDefaultServerRootUrl(HttpServletRequest request,
boolean secure) {
-String httpsPort = UtilProperties.getPropertyValue(url.properties,
port.https, 443);
-String httpsServer = UtilProperties.getPropertyValue(url.properties,
force.https.host);
-String httpPort = UtilProperties.getPropertyValue(url.properties,
port.http, 80);
-String httpServer = UtilProperties.getPropertyValue(url.properties,
force.http.host);
-boolean useHttps =
svn commit: r1672846 - in /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp: OfbizUrlBuilder.java website/WebSiteProperties.java
Author: deepak
Date: Sat Apr 11 08:50:42 2015
New Revision: 1672846
URL: http://svn.apache.org/r1672846
Log:
Applied patch from jira issue OFBIZ-6205 - Use EntityUtilProperties to get the
WebSiteProperties
Thanks Arun Patidar for reporting the issue and providing the patch.
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java?rev=1672846r1=1672845r2=1672846view=diff
==
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
(original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java Sat
Apr 11 08:50:42 2015
@@ -94,7 +94,7 @@ public final class OfbizUrlBuilder {
servletPath = WebAppUtil.getControlServletPath(webAppInfo);
}
if (webSiteProps == null) {
-webSiteProps = WebSiteProperties.defaults();
+webSiteProps = WebSiteProperties.defaults(delegator);
}
return new OfbizUrlBuilder(config, webSiteProps, servletPath);
}
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java?rev=1672846r1=1672845r2=1672846view=diff
==
---
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
(original)
+++
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Sat Apr 11 08:50:42 2015
@@ -23,11 +23,11 @@ import javax.servlet.http.HttpServletReq
import org.ofbiz.base.lang.ThreadSafe;
import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Assert;
-import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityQuery;
+import org.ofbiz.entity.util.EntityUtilProperties;
/**
* Web site properties.
@@ -40,8 +40,8 @@ public final class WebSiteProperties {
* Returns a codeWebSiteProperties/code instance initialized to the
settings found
* in the codeurl.properties/code file.
*/
-public static WebSiteProperties defaults() {
-return new WebSiteProperties();
+public static WebSiteProperties defaults(Delegator delegator) {
+return new WebSiteProperties(delegator);
}
/**
@@ -57,13 +57,13 @@ public final class WebSiteProperties {
Assert.notNull(request, request);
WebSiteProperties webSiteProps = (WebSiteProperties)
request.getAttribute(_WEBSITE_PROPS_);
if (webSiteProps == null) {
-WebSiteProperties defaults = new WebSiteProperties();
+Delegator delegator = (Delegator)
request.getAttribute(delegator);
+WebSiteProperties defaults = new WebSiteProperties(delegator);
String httpPort = defaults.getHttpPort();
String httpHost = defaults.getHttpHost();
String httpsPort = defaults.getHttpsPort();
String httpsHost = defaults.getHttpsHost();
boolean enableHttps = defaults.getEnableHttps();
-Delegator delegator = (Delegator)
request.getAttribute(delegator);
if (delegator != null) {
String webSiteId = WebSiteWorker.getWebSiteId(request);
if (webSiteId != null) {
@@ -126,7 +126,7 @@ public final class WebSiteProperties {
if (!WebSite.equals(webSiteValue.getEntityName())) {
throw new IllegalArgumentException(webSiteValue is not a WebSite
entity value);
}
-WebSiteProperties defaults = new WebSiteProperties();
+WebSiteProperties defaults = new
WebSiteProperties(webSiteValue.getDelegator());
String httpPort = (webSiteValue.get(httpPort) != null) ?
webSiteValue.getString(httpPort) : defaults.getHttpPort();
String httpHost = (webSiteValue.get(httpHost) != null) ?
webSiteValue.getString(httpHost) : defaults.getHttpHost();
String httpsPort = (webSiteValue.get(httpsPort) != null) ?
webSiteValue.getString(httpsPort) : defaults.getHttpsPort();
@@ -151,12 +151,12 @@ public final class WebSiteProperties {
private final String httpsHost;
private final boolean enableHttps;
-private WebSiteProperties() {
-this.httpPort = UtilProperties.getPropertyValue(url.properties,
port.http);
-this.httpHost = UtilProperties.getPropertyValue(url.properties,
force.http.host);
-this.httpsPort = UtilProperties.getPropertyValue(url.properties,
port.https);
-this.httpsHost =
svn commit: r1672854 - in /ofbiz/branches/release14.12: ./ framework/common/webcommon/ framework/webapp/src/org/ofbiz/webapp/control/ specialpurpose/hhfacility/webapp/hhfacility/ specialpurpose/myport
Author: deepak
Date: Sat Apr 11 09:51:06 2015
New Revision: 1672854
URL: http://svn.apache.org/r1672854
Log:
Applied fix from trunk r#1672853
===
Applied patch from jira issue OFBIZ-6222 - Change the field name 'tenantId' to
'userTenantId' from login page and ContextFilter.
Thanks Arun Patidar for reporting the issue and providing the patch.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/framework/common/webcommon/changePassword.ftl
ofbiz/branches/release14.12/framework/common/webcommon/login.ftl
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
ofbiz/branches/release14.12/specialpurpose/hhfacility/webapp/hhfacility/login.ftl
ofbiz/branches/release14.12/specialpurpose/myportal/widget/login.ftl
Propchange: ofbiz/branches/release14.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 11 09:51:06 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,133,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
+/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,133,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
Modified:
ofbiz/branches/release14.12/framework/common/webcommon/changePassword.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/webcommon/changePassword.ftl?rev=1672854r1=1672853r2=1672854view=diff
==
--- ofbiz/branches/release14.12/framework/common/webcommon/changePassword.ftl
(original)
+++ ofbiz/branches/release14.12/framework/common/webcommon/changePassword.ftl
Sat Apr 11 09:51:06 2015
@@ -18,7 +18,7 @@ under the License.
--
#assign username =
requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default())
-#assign tenantId = requestParameters.tenantId!
+#assign tenantId = requestParameters.userTenantId!
center
div class=screenlet login-screenlet
@@ -29,7 +29,7 @@ under the License.
form method=post action=@ofbizUrllogin/@ofbizUrl name=loginform
input type=hidden name=requirePasswordChange value=Y/
input type=hidden name=USERNAME value=${username}/
- input type=hidden name=tenantId value=${tenantId!}/
+ input type=hidden name=userTenantId value=${tenantId!}/
table cellspacing=0
tr
td class=label${uiLabelMap.CommonUsername}/td
Modified: ofbiz/branches/release14.12/framework/common/webcommon/login.ftl
URL:
svn commit: r1672848 - in /ofbiz/branches/release14.12: ./ framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Author: deepak
Date: Sat Apr 11 08:55:35 2015
New Revision: 1672848
URL: http://svn.apache.org/r1672848
Log:
Applied fix from trunk r#1672846
Applied patch from jira issue OFBIZ-6205 - Use EntityUtilProperties to get the
WebSiteProperties
Thanks Arun Patidar for reporting the issue and providing the patch.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Propchange: ofbiz/branches/release14.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 11 08:55:35 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,133,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430
+/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,133,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
Modified:
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java?rev=1672848r1=1672847r2=1672848view=diff
==
---
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
(original)
+++
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
Sat Apr 11 08:55:35 2015
@@ -95,7 +95,7 @@ public final class OfbizUrlBuilder {
servletPath = WebAppUtil.getControlServletPath(webAppInfo);
}
if (webSiteProps == null) {
-webSiteProps = WebSiteProperties.defaults();
+webSiteProps = WebSiteProperties.defaults(delegator);
}
return new OfbizUrlBuilder(config, webSiteProps, servletPath);
}
Modified:
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java?rev=1672848r1=1672847r2=1672848view=diff
==
---
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
(original)
+++
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Sat Apr 11 08:55:35 2015
@@ -23,12 +23,11 @@ import javax.servlet.http.HttpServletReq
import org.ofbiz.base.lang.ThreadSafe;
import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Assert;
-import org.ofbiz.base.util.UtilMisc;
-import
svn commit: r1672856 - /ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
Author: deepak Date: Sat Apr 11 10:56:56 2015 New Revision: 1672856 URL: http://svn.apache.org/r1672856 Log: OFBIZ-6077: Added check on quote report body fo ftl to avoid NPE. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1672856r1=1672855r2=1672856view=diff == --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Sat Apr 11 10:56:56 2015 @@ -40,6 +40,7 @@ under the License. fo:table-body #assign rowColor = white #assign totalQuoteAmount = 0.0 +#if quoteItems?has_content #list quoteItems as quoteItem #if quoteItem.productId?? #assign product = quoteItem.getRelatedOne(Product, false) @@ -105,6 +106,7 @@ under the License. #assign rowColor = white /#if /#list +/#if /fo:table-body /fo:table
svn commit: r1672868 - in /ofbiz/branches/release13.07: ./ applications/order/config/OrderUiLabels.xml applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
Author: jleroux Date: Sat Apr 11 12:16:46 2015 New Revision: 1672868 URL: http://svn.apache.org/r1672868 Log: Applied fix from trunk for revision: 1672862 r1672862 | deepak | 2015-04-11 13:37:42 +0200 (sam., 11 avr. 2015) | 1 line OFBIZ-6077: Fixed in correct hierarchy of fo:table, and if no items found then display message on quote item section. Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/order/config/OrderUiLabels.xml ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Propchange: ofbiz/branches/release13.07/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 11 12:16:46 2015 @@ -5,4 +5,4 @@ /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release12.04:1557118 -/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,151,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,154,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327, 1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122 02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,1664602,1664604,16 66633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952
svn commit: r1672861 - /ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
Author: nmalin Date: Sat Apr 11 11:33:58 2015 New Revision: 1672861 URL: http://svn.apache.org/r1672861 Log: remove import adding on last commit (remove javolution collection) and unecessary Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=1672861r1=1672860r2=1672861view=diff == --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java Sat Apr 11 11:33:58 2015 @@ -59,8 +59,6 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.party.party.PartyHelper; import org.ofbiz.product.category.CategoryContentWrapper; -import com.sun.syndication.feed.atom.Link; - /** * Utilities for product search based on various constraints including categories, features and keywords.
svn commit: r1672873 - /ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Author: deepak
Date: Sat Apr 11 12:49:04 2015
New Revision: 1672873
URL: http://svn.apache.org/r1672873
Log:
OFBIZ-6057: Fixed freemarker stack trace on view quote item info, instead of
assigning null in freemarker corrected the condition and removed the null value
assignment.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1672873r1=1672872r2=1672873view=diff
==
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Sat Apr 11 12:49:04 2015
@@ -50,11 +50,6 @@ under the License.
#assign totalQuoteAmount = 0.0
#assign alt_row = false/
#list quoteItems as quoteItem
-#if quoteItem.productId??
-#assign product = quoteItem.getRelatedOne(Product,
false)
-#else
-#assign product = null #-- don't drag it along to the
next iteration --
-/#if
#assign selectedAmount = quoteItem.selectedAmount?default(1)
#if selectedAmount == 0
#assign selectedAmount = 1/
@@ -81,7 +76,10 @@ under the License.
/td
td valign=top
div
-${(product.internalName)!}nbsp;
+#if quoteItem.productId??
+ #assign product =
quoteItem.getRelatedOne(Product, false)/
+ ${(product.internalName)!}nbsp;
+/#if
#if showQuoteManagementLinks??
a
href=/catalog/control/EditProduct?productId=${quoteItem.productId!}
class=buttontext
#if quoteItem.productId??
svn commit: r1672896 - /ofbiz/site/release-notes-13.07.02.html
Author: jacopoc Date: Sat Apr 11 16:49:36 2015 New Revision: 1672896 URL: http://svn.apache.org/r1672896 Log: Updated release notes for the tentative 13.07.02 release. Modified: ofbiz/site/release-notes-13.07.02.html Modified: ofbiz/site/release-notes-13.07.02.html URL: http://svn.apache.org/viewvc/ofbiz/site/release-notes-13.07.02.html?rev=1672896r1=1672895r2=1672896view=diff == --- ofbiz/site/release-notes-13.07.02.html (original) +++ ofbiz/site/release-notes-13.07.02.html Sat Apr 11 16:49:36 2015 @@ -53,6 +53,9 @@ processes that includes framework compon pApache OFBiz 13.07.02, released in April 2015, is the second release of the 13.07 series, that has been stabilized with bug fixes since July 2013./p pPlease notice that in the 13.07 series the specialpurpose components are no more included with the only exception of the ecommerce component (because there are still some dependencies on it): the specialpurpose components may be released in a separate package in the future./p + +h2Sub-task +/h2 ul li[a href='https://issues.apache.org/jira/browse/OFBIZ-2602'OFBIZ-2602/a] - Main storefront page, Featured Products (middle column) overwrites right column. Should just crop column, but not overwrite right column. /li @@ -60,6 +63,8 @@ processes that includes framework compon /li /ul +h2Bug +/h2 ul li[a href='https://issues.apache.org/jira/browse/OFBIZ-223'OFBIZ-223/a] - CartShipInfo objects are not properly cloned when shopping cart items are exploded. /li @@ -121,6 +126,8 @@ processes that includes framework compon /li li[a href='https://issues.apache.org/jira/browse/OFBIZ-5261'OFBIZ-5261/a] - Party contact expiration and its hidden problems /li +li[a href='https://issues.apache.org/jira/browse/OFBIZ-5279'OFBIZ-5279/a] - Wrong to use !jQuery(#39;#content-messages#39;) in \framework\images\webapp\images\selectall.js line #354 +/li li[a href='https://issues.apache.org/jira/browse/OFBIZ-5295'OFBIZ-5295/a] - Anonymous Quick Checkout: No Payment Method Information shown in Order Confirmation /li li[a href='https://issues.apache.org/jira/browse/OFBIZ-5370'OFBIZ-5370/a] - OrderItemShipGrpInvRes incorrect when receiving an inventory item that relates to more than one record @@ -231,6 +238,12 @@ processes that includes framework compon /li li[a href='https://issues.apache.org/jira/browse/OFBIZ-6013'OFBIZ-6013/a] - quot;Return Selected Item(s)quot; button broken for manually created returns /li +li[a href='https://issues.apache.org/jira/browse/OFBIZ-6057'OFBIZ-6057/a] - Quote item view FreeMarker error message due to changes made in OFBIZ-2120 +/li +li[a href='https://issues.apache.org/jira/browse/OFBIZ-6070'OFBIZ-6070/a] - Create content for product causes exception +/li +li[a href='https://issues.apache.org/jira/browse/OFBIZ-6077'OFBIZ-6077/a] - Error when creating a quote report +/li li[a href='https://issues.apache.org/jira/browse/OFBIZ-6088'OFBIZ-6088/a] - There should not need to setup SystemProperty data on each tenant for specifying path to store tenant images. /li li[a href='https://issues.apache.org/jira/browse/OFBIZ-6090'OFBIZ-6090/a] - Unable to return order items in return process. @@ -269,8 +282,12 @@ processes that includes framework compon /li li[a href='https://issues.apache.org/jira/browse/OFBIZ-6200'OFBIZ-6200/a] - Order Adjustment details are hidden on order Item section of order entry page. /li +li[a href='https://issues.apache.org/jira/browse/OFBIZ-6205'OFBIZ-6205/a] - Use EntityUtilProperties to get the WebSiteProperties +/li /ul +h2Improvement +/h2 ul li[a href='https://issues.apache.org/jira/browse/OFBIZ-4020'OFBIZ-4020/a] - Sign up for a contact list always redirects to the main ecommerce page /li @@ -286,6 +303,8 @@ processes that includes framework compon /li /ul +h2Task +/h2 ul li[a href='https://issues.apache.org/jira/browse/OFBIZ-6123'OFBIZ-6123/a] - Upgrade Freemarker from 2.3.21 to 2.3.22 /li
svn commit: r1672904 - in /ofbiz/trunk: applications/manufacturing/README specialpurpose/projectmgr/README specialpurpose/scrum/README
Author: jleroux Date: Sat Apr 11 17:21:34 2015 New Revision: 1672904 URL: http://svn.apache.org/r1672904 Log: Have a readme in every component https://issues.apache.org/jira/browse/OFBIZ-6243 Here are the manufacturing, projectmgr and scrum README files Added: ofbiz/trunk/applications/manufacturing/README (with props) ofbiz/trunk/specialpurpose/projectmgr/README (with props) ofbiz/trunk/specialpurpose/scrum/README (with props) Added: ofbiz/trunk/applications/manufacturing/README URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/README?rev=1672904view=auto == --- ofbiz/trunk/applications/manufacturing/README (added) +++ ofbiz/trunk/applications/manufacturing/README Sat Apr 11 17:21:34 2015 @@ -0,0 +1,27 @@ +#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + +This OFBiz component enables organisations to manage production runs, define schemas and tasks and configure Bills of +Material. +For more information about this component visit the product page in the OFBiz WIKI, +which can be found at https://cwiki.apache.org/confluence/display/OFBIZ/Manufacturing+Management + +JIRA issues related to this component can be found at https://issues.apache.org/jira/browse/OFBIZ/component/12311150 + +Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/ \ No newline at end of file Propchange: ofbiz/trunk/applications/manufacturing/README -- svn:eol-style = native Propchange: ofbiz/trunk/applications/manufacturing/README -- svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/projectmgr/README URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/README?rev=1672904view=auto == --- ofbiz/trunk/specialpurpose/projectmgr/README (added) +++ ofbiz/trunk/specialpurpose/projectmgr/README Sat Apr 11 17:21:34 2015 @@ -0,0 +1,26 @@ +#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + +This OFBiz component enables organisations to manage projects, project phases and project tasks. +For more information about this component visit the product page in the OFBiz WIKI, +which can be found at https://cwiki.apache.org/confluence/display/OFBIZ/Project+Management + +JIRA issues related to this component can be found at https://issues.apache.org/jira/browse/OFBIZ/component/12312073 + +Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/ \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/projectmgr/README -- svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/projectmgr/README -- svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/scrum/README URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/README?rev=1672904view=auto == --- ofbiz/trunk/specialpurpose/scrum/README (added) +++ ofbiz/trunk/specialpurpose/scrum/README Sat Apr 11 17:21:34 2015 @@ -0,0 +1,26 @@ +#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor
svn commit: r1672895 - /ofbiz/tags/REL-13.07.02/
Author: jacopoc Date: Sat Apr 11 16:46:03 2015 New Revision: 1672895 URL: http://svn.apache.org/r1672895 Log: Tag for Release 13.07.02 Added: ofbiz/tags/REL-13.07.02/ (props changed) - copied from r1672893, ofbiz/branches/release13.07/ Propchange: ofbiz/tags/REL-13.07.02/ -- --- svn:ignore (added) +++ svn:ignore Sat Apr 11 16:46:03 2015 @@ -0,0 +1,11 @@ +ofbiz.jar +bin +*.patch +*.iml +*.ipr +*.iws +*.time +.settings +.project +changelog +.idea Propchange: ofbiz/tags/REL-13.07.02/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Apr 11 16:46:03 2015 @@ -0,0 +1,8 @@ +/ofbiz/branches/2013_RemoveJavolution:1462755 +/ofbiz/branches/addbirt:831210-885099,885686-886087 +/ofbiz/branches/dojo1.4:951708-952957 +/ofbiz/branches/jackrabbit20100709:962442-1231517 +/ofbiz/branches/jquery:952958-1044489 +/ofbiz/branches/multitenant20100310:921280-927264 +/ofbiz/branches/release12.04:1557118 +/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,151,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,154,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327, 1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122 02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,1664602,1664604,16 66633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1672862
svn commit: r8582 - in /dev/ofbiz: apache-ofbiz-13.07.02.zip apache-ofbiz-13.07.02.zip.asc apache-ofbiz-13.07.02.zip.md5 apache-ofbiz-13.07.02.zip.sha
Author: jacopoc Date: Sat Apr 11 16:43:14 2015 New Revision: 8582 Log: Tentative release 13.07.02, second attempt. Added: dev/ofbiz/apache-ofbiz-13.07.02.zip (with props) dev/ofbiz/apache-ofbiz-13.07.02.zip.asc dev/ofbiz/apache-ofbiz-13.07.02.zip.md5 dev/ofbiz/apache-ofbiz-13.07.02.zip.sha Added: dev/ofbiz/apache-ofbiz-13.07.02.zip == Binary file - no diff available. Propchange: dev/ofbiz/apache-ofbiz-13.07.02.zip -- svn:mime-type = application/zip Added: dev/ofbiz/apache-ofbiz-13.07.02.zip.asc == --- dev/ofbiz/apache-ofbiz-13.07.02.zip.asc (added) +++ dev/ofbiz/apache-ofbiz-13.07.02.zip.asc Sat Apr 11 16:43:14 2015 @@ -0,0 +1,18 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCgAGBQJVKU6KAAoJEHpYCQiEevnguWsP/1LGzXq596agNP/OmRqAq/6R +0Fh2reL4fRhDen+dZ2/IjKLM+JjsMUhXsrbOSiE8p1Qq3yfmA6EIehsYA3d+HtZr +5HBC9K1lUAzUSUHV0wudSoAIJZiTgVQtA4B9dqmLE4nuDONtoagi99PTO4IHc3Zd +/FBM35uPC3ddKCknvcuzCATKss4XEqSdkIQtmCbpLJMabEsQ2aQBYFyy1zMFtKjf +qzDeGqTQlyy0kO/7RClhGuxOSJgNvbQ9LEsNo0cVyi/OIWBFTFIP6WQwGFMAclzL +ocddaTAzDQ20uzhNxN/CAkFkFnsuExucdELT37Iwav7OWxA3FCa/lA5OCx9FFxUT +nf4lpx+aCMxVsI+OCh0L7VOqRrP1TGP24sNFa/nbYxWCbZ8PE9SC4NvHkqo7d7mV +BdJvULR3hzKUKWwmvbuBxNsn93Iwbcd12Ajz42kWt7tpzqdS1+wnGK7diMN5SmZT +CunSGz4W1z3Dx9VHjugI0wEAIvM0yDfrdnaECEDxqSnd4SbJuleos3Mrfavae8iE +q5EgeJQUK5C8mnjE1jDFBab2BoLsbOGo2/Ls5f8tdSewaVLr9qPAXWbtqMREQ3zK +TdfhekiL/9cNlR2/Eo7XMxBMujtyaMyEhN56LmpoK6wFGVm+EXHT9cNYHQ1pBxpy +LB3sWX40p84z5cbXk0VS +=hqN7 +-END PGP SIGNATURE- Added: dev/ofbiz/apache-ofbiz-13.07.02.zip.md5 == --- dev/ofbiz/apache-ofbiz-13.07.02.zip.md5 (added) +++ dev/ofbiz/apache-ofbiz-13.07.02.zip.md5 Sat Apr 11 16:43:14 2015 @@ -0,0 +1,6 @@ +apache-ofbiz-13.07.02.zip: A8 2F 6C + FE D0 81 + EF 14 56 + 76 F1 39 + CD E3 4E + B0 Added: dev/ofbiz/apache-ofbiz-13.07.02.zip.sha == --- dev/ofbiz/apache-ofbiz-13.07.02.zip.sha (added) +++ dev/ofbiz/apache-ofbiz-13.07.02.zip.sha Sat Apr 11 16:43:14 2015 @@ -0,0 +1,8 @@ +apache-ofbiz-13.07.02.zip: 0709CF84 62125712 + 4A9AED7B 013123A6 + E0A0F360 DA25C82E + 04F02FC8 E0B7C53C + BA64FA21 6EE70165 + A508EA2C BE79C772 + 163EAE35 DA4421CA + 404BC762 22CBFEF1
svn commit: r8581 - in /dev/ofbiz: apache-ofbiz-13.07.02.zip apache-ofbiz-13.07.02.zip.asc apache-ofbiz-13.07.02.zip.md5 apache-ofbiz-13.07.02.zip.sha
Author: jacopoc Date: Sat Apr 11 16:39:24 2015 New Revision: 8581 Log: Removed tentative release files; I am going to upload a new set with the latest bug fixes. Removed: dev/ofbiz/apache-ofbiz-13.07.02.zip dev/ofbiz/apache-ofbiz-13.07.02.zip.asc dev/ofbiz/apache-ofbiz-13.07.02.zip.md5 dev/ofbiz/apache-ofbiz-13.07.02.zip.sha
svn commit: r1672869 - /ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
Author: deepak Date: Sat Apr 11 12:29:28 2015 New Revision: 1672869 URL: http://svn.apache.org/r1672869 Log: OFBIZ-6077: Added missing if condition in quote report fo ftl. Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1672869r1=1672868r2=1672869view=diff == --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Sat Apr 11 12:29:28 2015 @@ -40,6 +40,7 @@ under the License. fo:table-body #assign rowColor = white #assign totalQuoteAmount = 0.0 +#if quoteItems?has_content #list quoteItems as quoteItem #if quoteItem.productId?exists #assign product = quoteItem.getRelatedOne(Product, false)
svn commit: r1672874 - in /ofbiz/branches/release14.12: ./ applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Author: deepak
Date: Sat Apr 11 12:52:22 2015
New Revision: 1672874
URL: http://svn.apache.org/r1672874
Log:
Applied fix from trunk r#1672873
OFBIZ-6057: Fixed freemarker stack trace on view quote item info, instead of
assigning null in freemarker corrected the condition and removed the null value
assignment.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Propchange: ofbiz/branches/release14.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 11 12:52:22 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,133,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
+/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,133,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
Modified:
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1672874r1=1672873r2=1672874view=diff
==
---
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
(original)
+++
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Sat Apr 11 12:52:22 2015
@@ -50,11 +50,6 @@ under the License.
#assign totalQuoteAmount = 0.0
#assign alt_row = false/
#list quoteItems as quoteItem
-#if quoteItem.productId??
-#assign product = quoteItem.getRelatedOne(Product,
false)
-#else
-#assign product = null #-- don't drag it along to the
next iteration --
-/#if
#assign selectedAmount = quoteItem.selectedAmount?default(1)
#if selectedAmount == 0
#assign selectedAmount = 1/
@@ -81,7 +76,10 @@ under the License.
/td
td valign=top
div
-${(product.internalName)!}nbsp;
+#if quoteItem.productId??
+ #assign product =
quoteItem.getRelatedOne(Product, false)/
+ ${(product.internalName)!}nbsp;
+/#if
#if showQuoteManagementLinks??
a
href=/catalog/control/EditProduct?productId=${quoteItem.productId!}
class=buttontext
svn commit: r1672875 - /ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Author: deepak
Date: Sat Apr 11 12:54:58 2015
New Revision: 1672875
URL: http://svn.apache.org/r1672875
Log:
Applied fix from trunk r#1672873
OFBIZ-6057: Fixed freemarker stack trace on view quote item info, instead of
assigning null in freemarker corrected the condition and removed the null value
assignment.
Modified:
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Modified:
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1672875r1=1672874r2=1672875view=diff
==
---
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
(original)
+++
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Sat Apr 11 12:54:58 2015
@@ -50,11 +50,6 @@ under the License.
#assign totalQuoteAmount = 0.0
#assign alt_row = false/
#list quoteItems as quoteItem
-#if quoteItem.productId?exists
-#assign product = quoteItem.getRelatedOne(Product,
false)
-#else
-#assign product = null #-- don't drag it along to the
next iteration --
-/#if
#assign selectedAmount = quoteItem.selectedAmount?default(1)
#if selectedAmount == 0
#assign selectedAmount = 1/
@@ -81,7 +76,10 @@ under the License.
/td
td valign=top
div
+ #if quoteItem.productId?exists
+#assign product =
quoteItem.getRelatedOne(Product, false)
${(product.internalName)?if_exists}nbsp;
+/#if
#if showQuoteManagementLinks?exists
a
href=/catalog/control/EditProduct?productId=${quoteItem.productId?if_exists}
class=buttontext
#if quoteItem.productId?exists
svn commit: r1672862 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml webapp/ordermgr/quote/quoteReportBody.fo.ftl
Author: deepak
Date: Sat Apr 11 11:37:42 2015
New Revision: 1672862
URL: http://svn.apache.org/r1672862
Log:
OFBIZ-6077: Fixed in correct hierarchy of fo:table, and if no items found then
display message on quote item section.
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1672862r1=1672861r2=1672862view=diff
==
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat Apr 11 11:37:42
2015
@@ -5678,6 +5678,9 @@
value xml:lang=zhæçéè´§/value
value xml:lang=zh-TWæçé貨/value
/property
+property key=OrderNoItemsQuote
+ value xml:lang=enNo Items in quote/value
+/property
property key=OrderNOTEMultipleShipmentsExist
value xml:lang=deAnmerkung: Mehrere Lieferungen vorhanden,
verwenden Sie Lieferung aufteilen./value
value xml:lang=enNOTE: Multiple shipments exist, use Split
Shipment./value
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1672862r1=1672861r2=1672862view=diff
==
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
Sat Apr 11 11:37:42 2015
@@ -106,6 +106,12 @@ under the License.
#assign rowColor = white
/#if
/#list
+#else
+ fo:table-row
+ fo:table-cell number-columns-spanned=7
padding=2pt background-color=${rowColor}
+
fo:block${uiLabelMap.OrderNoItemsQuote}/fo:block
+ /fo:table-cell
+ /fo:table-row
/#if
/fo:table-body
/fo:table
svn commit: r1672859 - in /ofbiz/branches/release14.12: ./ applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
Author: deepak Date: Sat Apr 11 11:02:26 2015 New Revision: 1672859 URL: http://svn.apache.org/r1672859 Log: Applied fix from trunk r#1672856 OFBIZ-6077: Added check on quote report body fo ftl to avoid NPE. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 11 11:02:26 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,133,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 +/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,133,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 Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1672859r1=1672858r2=1672859view=diff == --- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original) +++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Sat Apr 11 11:02:26 2015 @@ -40,6 +40,7 @@ under the License. fo:table-body #assign rowColor = white #assign totalQuoteAmount = 0.0 +#if quoteItems?has_content #list quoteItems as quoteItem #if quoteItem.productId?? #assign product = quoteItem.getRelatedOne(Product, false) @@ -105,6 +106,7 @@ under the License. #assign rowColor = white /#if /#list +/#if /fo:table-body /fo:table
svn commit: r1672863 - in /ofbiz/branches/release14.12: ./ applications/order/config/OrderUiLabels.xml applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
Author: deepak Date: Sat Apr 11 11:42:03 2015 New Revision: 1672863 URL: http://svn.apache.org/r1672863 Log: Apllied fix from trunk r#1672862 === OFBIZ-6077: Fixed incorrect hierarchy of fo:table, and if no items found then display message on quote item section. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/order/config/OrderUiLabels.xml ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 11 11:42:03 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,133,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 +/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,133,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 Modified: ofbiz/branches/release14.12/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/config/OrderUiLabels.xml?rev=1672863r1=1672862r2=1672863view=diff == --- ofbiz/branches/release14.12/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/release14.12/applications/order/config/OrderUiLabels.xml Sat Apr 11 11:42:03 2015 @@ -5673,6 +5673,9 @@ value xml:lang=zhæçéè´§/value value xml:lang=zh_TWæçé貨/value /property +property key=OrderNoItemsQuote + value xml:lang=enNo Items in quote/value +/property property key=OrderNOTEMultipleShipmentsExist value xml:lang=deAnmerkung: Mehrere Lieferungen vorhanden, verwenden Sie Lieferung aufteilen./value value xml:lang=enNOTE: Multiple shipments exist, use Split Shipment./value Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1672863r1=1672862r2=1672863view=diff == --- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original) +++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Sat Apr 11 11:42:03 2015 @@ -106,6 +106,12 @@ under the License. #assign rowColor = white /#if /#list +#else + fo:table-row +
