You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/08/04 20:11:22 UTC
svn commit: r1369382 [2/19] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/webapp/accounting/WEB-INF/ applic...
Propchange: ofbiz/branches/20120329_portletWidget/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1307080-1307082,1340380-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352
Modified: ofbiz/branches/20120329_portletWidget/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/.classpath?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/.classpath (original)
+++ ofbiz/branches/20120329_portletWidget/.classpath Sat Aug 4 18:11:00 2012
@@ -105,8 +105,8 @@
<classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
<classpathentry kind="lib" path="framework/base/lib/scripting/jansi-1.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/scripting/jline-0.9.94.jar"/>
- <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
- <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.2.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar"/>
@@ -114,7 +114,6 @@
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar"/>
<classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
- <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
@@ -177,11 +176,11 @@
<classpathentry kind="src" path="framework/base/build/gen-src/javacc"/>
<classpathentry excluding="org/ofbiz/base/config/CoberturaInstrumenter.java" kind="src" path="framework/base/src"/>
<classpathentry kind="src" path="framework/bi/src"/>
- <classpathentry kind="src" path="framework/birt/src"/>
+ <classpathentry kind="src" path="specialpurpose/birt/src"/>
<classpathentry kind="src" path="framework/catalina/src"/>
<classpathentry kind="src" path="framework/common/src"/>
<classpathentry kind="src" path="framework/datafile/src"/>
- <classpathentry excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java" kind="src" path="framework/entity/src"/>
+ <classpathentry kind="src" path="framework/entity/src"/>
<classpathentry kind="src" path="framework/entityext/src"/>
<classpathentry kind="src" path="framework/geronimo/src"/>
<classpathentry kind="src" path="framework/jetty/src"/>
Modified: ofbiz/branches/20120329_portletWidget/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/LICENSE?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/LICENSE (original)
+++ ofbiz/branches/20120329_portletWidget/LICENSE Sat Aug 4 18:11:00 2012
@@ -55,7 +55,6 @@ ofbiz/trunk/framework/base/lib/commons/c
ofbiz/trunk/framework/base/lib/commons/commons-pool-1.3.jar
ofbiz/trunk/framework/base/lib/commons/commons-primitives-1.0.jar
ofbiz/trunk/framework/base/lib/commons/commons-validator-1.3.1
-ofbiz/trunk/framework/base/lib/commons/commons-vfs-20070730.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar
@@ -75,11 +74,11 @@ ofbiz/trunk/framework/base/lib/scripting
ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-core.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.29-catalina-ha.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.29-catalina-tribes.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-core.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-logging-log4j.jar
ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
ofbiz/trunk/framework/entity/lib/jdbc/derby-10.8.2.2.jar
ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
@@ -1219,7 +1218,6 @@ The following libraries distributed with
MIT/X License:
ofbiz/trunk/framework/base/lib/icu4j-49_1.jar
ofbiz/trunk/framework/base/lib/jcl-over-slf4j-1.6.4.jar
-ofbiz/trunk/framework/entity/lib/ofbiz-minerva.jar
ofbiz/trunk/framework/base/lib/slf4j-api-1.6.4.jar
ofbiz/trunk/framework/base/lib/slf4j-simple-1.6.4.jar
ofbiz/trunk/framework/images/webapp/images/jquery/*
@@ -1248,59 +1246,6 @@ THE SOFTWARE.
=========================================================================
The following libraries distributed with Apache OFBiz are licensed under the
-W3C License:
-ofbiz/trunk/framework/base/lib/Tidy.jar
-=========================================================================
-W3C¨ SOFTWARE NOTICE AND LICENSE
-
- Copyright © 1994-2001 World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en Automatique,
- Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
-
- This W3C work (including software, documents, or other related items) is
- being provided by the copyright holders under the following license. By
- obtaining, using and/or copying this work, you (the licensee) agree that you
- have read, understood, and will comply with the following terms and
- conditions:
-
- Permission to use, copy, modify, and distribute this software and its
- documentation, with or without modification, for any purpose and without fee
- or royalty is hereby granted, provided that you include the following on ALL
- copies of the software and documentation or portions thereof, including
- modifications, that you make:
-
- 1. The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
-
- 2. Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, a short notice of the following form (hypertext is
- preferred, text is permitted) should be used within the body of any
- redistributed or derivative code: "Copyright © [$date-of-software] World Wide
- Web Consortium, (Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All Rights
- Reserved. http://www.w3.org/Consortium/Legal/"
-
- 3. Notice of any changes or modifications to the W3C files, including the
- date changes were made. (We recommend you provide URIs to the location from
- which the code is derived.)
-
- THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
- MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
- LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE
- OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
- PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
- CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
- DOCUMENTATION.
-
- The name and trademarks of copyright holders may NOT be used in advertising
- or publicity pertaining to the software without specific, written prior
- permission. Title to copyright in this software and any associated
- documentation will at all times remain with copyright holders.
-
-=========================================================================
-The following libraries distributed with Apache OFBiz are licensed under the
Sun Public License:
ofbiz/trunk/framework/base/lib/scripting/bsh-2.0b4.jar
=========================================================================
@@ -2307,37 +2252,37 @@ questions or comments regarding the usag
=========================================================================
The following libraries distributed with Apache OFBiz are licensed under the
Eclipse Public License - v 1.0:
-ofbiz/trunk/framework/birt/lib/flute.jar
-ofbiz/trunk/framework/birt/lib/jaxrpc.jar
-ofbiz/trunk/framework/birt/lib/js.jar
-ofbiz/trunk/framework/birt/lib/org.apache.xml.resolver_1.2.0.v201005080400.jar
-ofbiz/trunk/framework/birt/lib/org.apache.xml.serializer_2.7.1.v201005080400.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar
-ofbiz/trunk/framework/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar
-ofbiz/trunk/framework/birt/lib/org.w3c.dom.smil_1.0.0.v200806040011.jar
-ofbiz/trunk/framework/birt/lib/org.w3c.dom.svg_1.1.0.v201011041433.jar
-ofbiz/trunk/framework/birt/lib/saaj.jar
-ofbiz/trunk/framework/birt/lib/Tidy.jar
-ofbiz/trunk/framework/birt/lib/viewservlets.jar
+ofbiz/trunk/specialpurpose/birt/lib/flute.jar
+ofbiz/trunk/specialpurpose/birt/lib/jaxrpc.jar
+ofbiz/trunk/specialpurpose/birt/lib/js.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.apache.xml.resolver_1.2.0.v201005080400.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.apache.xml.serializer_2.7.1.v201005080400.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.w3c.dom.smil_1.0.0.v200806040011.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.w3c.dom.svg_1.1.0.v201011041433.jar
+ofbiz/trunk/specialpurpose/birt/lib/saaj.jar
+ofbiz/trunk/specialpurpose/birt/lib/Tidy.jar
+ofbiz/trunk/specialpurpose/birt/lib/viewservlets.jar
ofbiz/trunk/framework/catalina/lib/ecj-3.7.2.jar
ofbiz/trunk/framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar
ofbiz/trunk/framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Sat Aug 4 18:11:00 2012
@@ -24,7 +24,7 @@ under the License.
<if>
<condition>
<and>
- <not><if-has-permission permission="ACCOUNTING" action="_ADMIN"/></not>
+ <not><if-has-permission permission="ACCOUNTING" action="_CREATE"/></not>
<not><if-has-permission permission="PAY_INFO" action="_CREATE"/></not>
<not><if-compare-field field="userLogin.partyId" to-field="parameters.partyIdFrom" operator="equals"/></not>
<not><if-compare-field field="userLogin.partyId" to-field="parameters.partyIdTo" operator="equals"/></not>
@@ -87,7 +87,7 @@ under the License.
<if>
<condition>
<and>
- <not><if-has-permission permission="ACCOUNTING" action="_ADMIN"/></not>
+ <not><if-has-permission permission="ACCOUNTING" action="_UPDATE"/></not>
<not><if-has-permission permission="PAY_INFO" action="_UPDATE"/></not>
<not><if-compare-field field="userLogin.partyId" to-field="payment.partyIdFrom" operator="equals"/></not>
<not><if-compare-field field="userLogin.partyId" to-field="payment.partyIdTo" operator="equals"/></not>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Sat Aug 4 18:11:00 2012
@@ -2995,7 +2995,7 @@ public class PaymentGatewayServices {
Security security = dctx.getSecurity();
// security check
- if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) {
+ if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_CREATE", userLogin)) {
Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"AccountingPaymentTransactionNotAuthorized", locale));
@@ -3130,7 +3130,7 @@ public class PaymentGatewayServices {
Delegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
// security check
- if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) {
+ if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_CREATE", userLogin)) {
Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"AccountingPaymentTransactionNotAuthorized", locale));
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Sat Aug 4 18:11:00 2012
@@ -89,7 +89,7 @@ public class PaymentMethodServices {
// <b>security check</b>: userLogin partyId must equal paymentMethod partyId, or must have PAY_INFO_DELETE permission
if (paymentMethod.get("partyId") == null || !paymentMethod.getString("partyId").equals(userLogin.getString("partyId"))) {
- if (!security.hasEntityPermission("PAY_INFO", "_DELETE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) {
+ if (!security.hasEntityPermission("PAY_INFO", "_DELETE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_DELETE", userLogin)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"AccountingPaymentMethodNoPermissionToDelete", locale));
}
@@ -139,7 +139,7 @@ public class PaymentMethodServices {
Timestamp now = UtilDateTime.nowTimestamp();
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_ADMIN");
+ String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_CREATE");
if (result.size() > 0) return result;
@@ -260,7 +260,7 @@ public class PaymentMethodServices {
Timestamp now = UtilDateTime.nowTimestamp();
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_ADMIN");
+ String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_UPDATE");
if (result.size() > 0) return result;
@@ -286,7 +286,7 @@ public class PaymentMethodServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"AccountingCreditCardUpdateWithPaymentMethodId", locale) + paymentMethodId);
}
- if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) {
+ if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_UPDATE", userLogin)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"AccountingCreditCardUpdateWithoutPermission", UtilMisc.toMap("partyId", partyId,
"paymentMethodId", paymentMethodId), locale));
@@ -488,7 +488,7 @@ public class PaymentMethodServices {
Timestamp now = UtilDateTime.nowTimestamp();
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_ADMIN");
+ String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_CREATE");
if (result.size() > 0)
return result;
@@ -545,7 +545,7 @@ public class PaymentMethodServices {
Timestamp now = UtilDateTime.nowTimestamp();
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_ADMIN");
+ String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_UPDATE");
if (result.size() > 0)
return result;
@@ -574,7 +574,7 @@ public class PaymentMethodServices {
"AccountingGiftCardCannotBeUpdated",
UtilMisc.toMap("errorString", paymentMethodId), locale));
}
- if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) {
+ if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_UPDATE", userLogin)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"AccountingGiftCardPartyNotAuthorized",
UtilMisc.toMap("partyId", partyId, "paymentMethodId", paymentMethodId), locale));
@@ -679,7 +679,7 @@ public class PaymentMethodServices {
Timestamp now = UtilDateTime.nowTimestamp();
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_ADMIN");
+ String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_CREATE");
if (result.size() > 0) return result;
@@ -777,7 +777,7 @@ public class PaymentMethodServices {
Timestamp now = UtilDateTime.nowTimestamp();
- String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_ADMIN");
+ String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_UPDATE");
if (result.size() > 0) return result;
@@ -806,7 +806,7 @@ public class PaymentMethodServices {
"AccountingEftAccountCannotBeUpdated",
UtilMisc.toMap("errorString", paymentMethodId), locale));
}
- if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) {
+ if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_UPDATE", userLogin)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"AccountingEftAccountCannotBeUpdated",
UtilMisc.toMap("partyId", partyId, "paymentMethodId", paymentMethodId), locale));
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Aug 4 18:11:00 2012
@@ -2169,11 +2169,6 @@ under the License.
<response name="success" type="view" value="paymentOverview"/>
<response name="error" type="view" value="paymentOverview"/>
</request-map>
- <request-map uri="PaymentAcctgTransEntriesPdf">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy"/>
- <response name="success" type="view" value="PaymentAcctgTransEntriesPdf"/>
- </request-map>
<!-- ================ Entity Lookup Requests ================= -->
<request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
@@ -2219,12 +2214,6 @@ under the License.
<response name="success" type="view" value="PrintInvoices"/>
</request-map>
- <request-map uri="InvoiceAcctgTransEntriesPdf">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy"/>
- <response name="success" type="view" value="InvoiceAcctgTransEntriesPdf"/>
- </request-map>
-
<!--Global GL Settings -->
<request-map uri="globalGLSettings">
<security auth="true" https="true"/>
@@ -2242,6 +2231,7 @@ under the License.
<response name="error" type="view" value="ComparativeIncomeStatement"/>
</request-map>
<request-map uri="BalanceSheet"><security https="true" auth="true"/><response name="success" type="view" value="BalanceSheet"/></request-map>
+ <request-map uri="BalanceSheet.pdf"><security https="true" auth="true"/><response name="success" type="view" value="BalanceSheetPdf"/></request-map>
<request-map uri="ComparativeBalanceSheet"><security https="true" auth="true"/><response name="success" type="view" value="ComparativeBalanceSheet"/></request-map>
<request-map uri="ComparativeBalanceSheet.pdf"><security https="true" auth="true"/><response name="success" type="view" value="ComparativeBalanceSheetPdf"/></request-map>
<request-map uri="ComparativeBalanceSheet.csv"><security https="true" auth="true"/><response name="success" type="view" value="ComparativeBalanceSheetCsv"/></request-map>
@@ -2394,12 +2384,6 @@ under the License.
<response name="success" type="view" value="AcctgTransEntriesSearchResultsPdf"/>
</request-map>
- <request-map uri="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf.pdf">
- <security auth="true" https="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy"/>
- <response name="success" type="view" value="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf"/>
- </request-map>
-
<request-map uri="AcctgTransSearchResultsCsv.csv">
<security https="true" auth="true"/>
<response name="success" type="view" value="AcctgTransSearchResultsCsv"/>
@@ -2422,10 +2406,8 @@ under the License.
<request-map uri="IncomeStatementListPdf.pdf">
<security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy"/>
<response name="success" type="view" value="IncomeStatementListPdf"/>
</request-map>
-
<request-map uri="IncomeStatementListCsv.csv">
<security https="true" auth="true"/>
<response name="success" type="view" value="IncomeStatementListCsv"/>
@@ -2436,18 +2418,10 @@ under the License.
<response name="success" type="view" value="BalanceSheetCsv"/>
</request-map>
- <request-map uri="BalanceSheet.pdf">
- <security auth="true" https="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy"/>
- <response name="success" type="view" value="BalanceSheetPdf"/>
- </request-map>
-
<request-map uri="TrialBalanceSearchResultsPdf.pdf">
<security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy"/>
<response name="success" type="view" value="TrialBalanceSearchResultsPdf"/>
</request-map>
-
<request-map uri="TrialBalanceSearchResultsCsv.csv">
<security https="true" auth="true"/>
<response name="success" type="view" value="TrialBalanceSearchResultsCsv"/>
@@ -2562,21 +2536,6 @@ under the License.
</request-map>
<!-- Reports -->
- <request-map uri="paymentReport">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="paymentReport"/>
- </request-map>
- <request-map uri="paymentReportHtml">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/>
- <response name="success" type="view" value="ViewPaymentReportHtml"/>
- </request-map>
- <request-map uri="paymentReportPdf">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/>
- <response name="success" type="view" value="ViewPaymentReportPdf"/>
- </request-map>
-
<request-map uri="createWorkEffortAndPartyAssign">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffortAndPartyAssign"/>
@@ -2626,7 +2585,6 @@ under the License.
<view-map name="PrintChecks" type="screenfop" page="component://accounting/widget/PaymentScreens.xml#PrintChecks" content-type="application/pdf" encoding="none"/>
<view-map name="FindSalesInvoicesByDueDate" type="screen" page="component://accounting/widget/PaymentScreens.xml#FindSalesInvoicesByDueDate"/>
<view-map name="FindPurchaseInvoicesByDueDate" type="screen" page="component://accounting/widget/PaymentScreens.xml#FindPurchaseInvoicesByDueDate"/>
- <view-map name="PaymentAcctgTransEntriesPdf" type="birt" page="component://accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign" content-type="application/pdf" encoding="none"/>
<!-- Payment Group -->
<view-map name="FindPaymentGroup" type="screen" page="component://accounting/widget/PaymentGroupScreens.xml#FindPaymentGroup"/>
@@ -2828,23 +2786,22 @@ under the License.
<view-map name="InvoicePDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#InvoicePDF" content-type="application/pdf" encoding="none"/>
<view-map name="PrintCheckPDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#PrintCheckPDF" content-type="application/pdf" encoding="none"/>
<view-map name="PrintInvoices" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#PrintInvoices" content-type="application/pdf" encoding="none"/>
- <view-map name="InvoiceAcctgTransEntriesPdf" type="birt" page="component://accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign" content-type="application/pdf" encoding="none"/>
<!-- Financial Summary Reports -->
<view-map name="FinancialSummaryReportOptions" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#FinancialSummaryReportOptions"/>
<view-map name="SalesInvoiceByProductCategorySummary" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#SalesInvoiceByProductCategorySummary"/>
<view-map name="TrialBalance" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalance"/>
- <view-map name="TrialBalanceSearchResultsPdf" type="birt" page="component://accounting/webapp/accounting/reports/TrialBalance.rptdesign" content-type="application/pdf" encoding="none"/>
+ <view-map name="TrialBalanceSearchResultsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsPdf" content-type="application/pdf" encoding="none"/>
<view-map name="TrialBalanceSearchResultsCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsCsv" content-type="text/csv" encoding="none"/>
<view-map name="IncomeStatement" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatement"/>
- <view-map name="IncomeStatementListPdf" type="birt" page="component://accounting/webapp/accounting/reports/IncomeStatement.rptdesign" content-type="application/pdf" encoding="none"/>
+ <view-map name="IncomeStatementListPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatementListPdf" content-type="application/pdf" encoding="none"/>
<view-map name="IncomeStatementListCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatementListCsv" content-type="text/csv" encoding="none"/>
<view-map name="ComparativeIncomeStatement" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatement"/>
<view-map name="ComparativeIncomeStatementsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatementsPdf" content-type="application/pdf" encoding="none"/>
<view-map name="ComparativeIncomeStatementsCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatementsCsv" content-type="text/csv" encoding="none"/>
<view-map name="BalanceSheet" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheet"/>
+ <view-map name="BalanceSheetPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetPdf" content-type="application/pdf" encoding="none"/>
<view-map name="BalanceSheetCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetCsv" content-type="text/csv" encoding="none"/>
- <view-map name="BalanceSheetPdf" type="birt" page="component://accounting/webapp/accounting/reports/BalanceSheet.rptdesign" content-type="application/pdf" encoding="none"/>
<view-map name="ComparativeBalanceSheet" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheet"/>
<view-map name="ComparativeBalanceSheetPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheetPdf" content-type="application/pdf" encoding="none"/>
<view-map name="ComparativeBalanceSheetCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheetCsv" content-type="text/csv" encoding="none"/>
@@ -2883,7 +2840,6 @@ under the License.
<view-map name="FixedAssetGeoLocation" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetGeoLocation"/>
<view-map name="AcctgTransEntriesSearchResultsCsv" type="screencsv" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsCsv" content-type="text/csv" encoding="none"/>
<view-map name="AcctgTransEntriesSearchResultsPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsPdf" content-type="application/pdf" encoding="none"/>
- <view-map name="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf" type="birt" page="component://accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign" content-type="application/pdf" encoding="none"/>
<view-map name="AcctgTransSearchResultsCsv" type="screencsv" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultsCsv" content-type="text/csv" encoding="none"/>
<view-map name="AcctgTransSearchResultPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultPdf" content-type="application/pdf" encoding="none"/>
@@ -2898,11 +2854,6 @@ under the License.
<view-map name="GlAccountBalanceByCostCenter" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#GlAccountBalanceByCostCenter"/>
<view-map name="GlAccountBalanceByCostCenterPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#GlAccountBalanceByCostCenterPdf" content-type="application/pdf" encoding="none"/>
- <view-map name="paymentReport" type="screen" page="component://accounting/widget/PaymentScreens.xml#PaymentReport"/>
- <view-map name="ViewPaymentReportHtml" type="birt" page="component://accounting/webapp/accounting/payment/report/PaymentReport.rptdesign" content-type="text/html"/>
- <view-map name="ViewPaymentReportPdf" type="birt" page="component://accounting/webapp/accounting/payment/report/PaymentReport.rptdesign" content-type="application/pdf"/>
-
-
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://accounting/widget/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl Sat Aug 4 18:11:00 2012
@@ -20,7 +20,7 @@ under the License.
<h1>${uiLabelMap.AccountingManualTransaction}</h1>
<br />
-<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
+<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session) || security.hasEntityPermission("ACCOUNTING", "_CREATE", session)>
${setRequestAttribute("validTx", "false")}
<form name="manualTxForm" method="post" action="<@o...@ofbizUrl>">
<#if requestParameters.paymentMethodId?exists>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ap/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ap/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ap/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -31,11 +31,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://accounting/widget/ap/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ar/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ar/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ar/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ar/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://accounting/widget/ar/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml Sat Aug 4 18:11:00 2012
@@ -28,8 +28,8 @@ under the License.
<menu-item name="transaction" title="${uiLabelMap.AccountingTransactions}">
<condition>
<or>
- <if-has-permission permission="MANUAL" action="_PAYMENT"/>
- <if-has-permission permission="ACCOUNTING" action="_ADMIN"/>
+ <if-has-permission permission="MANUAL" action="_PAYMENT"/>
+ <if-has-permission permission="ACCOUNTING" action="_CREATE"/>
</or>
</condition>
<link target="FindGatewayResponses"/>
@@ -398,9 +398,6 @@ under the License.
<parameter param-name="paymentId" from-field="payment.paymentId"/>
</link>
</menu-item>
- <menu-item name="paymentReport" title="Payment Report">
- <link target="paymentReport"/>
- </menu-item>
</menu>
<menu name="PaymentSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -292,35 +292,5 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions/>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
</screens>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml Sat Aug 4 18:11:00 2012
@@ -447,7 +447,7 @@ under the License.
<section>
<condition>
<or>
- <if-has-permission permission="ACCOUNTING" action="_ADMIN"/>
+ <if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
<if-has-permission permission="PAY_INFO" action="_UPDATE"/>
</or>
</condition>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/PaymentForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/PaymentForms.xml Sat Aug 4 18:11:00 2012
@@ -575,17 +575,4 @@ under the License.
<field name="transactionDate" position="1"><display/></field>
<field name="statusId" position="2" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
</form>
- <form name="PaymentReport" type="single" target="paymentReportHtml" extends="FindPayments" extends-resource="component://accounting/widget/PaymentForms.xml" target-window="_BLANK">
- <field name="contentType" action="document.PaymentReport.action=this.value" event="onchange">
- <drop-down>
- <option key="paymentReportHtml" description="text/html"></option>
- <option key="paymentReportPdf" description="application/pdf"></option>
- <!--option key="application/vnd.ms-excel">application/vnd.ms-excel</option>
- <option key="application/vnd.ms-word">application/vnd.ms-word</option>
- <option key="application/vnd.ms-powerpoint">application/vnd.ms-powerpoint</option-->
- </drop-down>
- </field>
- <field name="searchButton"><hidden/></field>
- <field name="report" title="Report" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
</forms>
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/PaymentScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/PaymentScreens.xml Sat Aug 4 18:11:00 2012
@@ -555,25 +555,4 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="PaymentReport">
- <section>
- <actions>
- <set field="headerItem" value="payments"/>
- <set field="tabButtonItem" value="paymentReport"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <widgets>
- <screenlet title="Payment Report">
- <include-form name="PaymentReport" location="component://accounting/widget/PaymentForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/documents/ApacheOfbizTechnical.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/documents/ApacheOfbizTechnical.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/documents/ApacheOfbizTechnical.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/documents/ApacheOfbizTechnical.xml Sat Aug 4 18:11:00 2012
@@ -201,7 +201,6 @@ image=/boot/vmlinuzNew
<xi:include href="../../../framework/testtools/documents/TestTools.xml" />
<xi:include href="../../../framework/documents/UnitTest.xml" />
<xi:include href="../../../framework/documents/SingleSignOn.xml" />
- <xi:include href="../../../framework/birt/documents/Birt.xml"/>
<xi:include href="../../../framework/documents/DataFiles.xml"/>
<appendix>
Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/script/org/ofbiz/SystemInfoServices.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/script/org/ofbiz/SystemInfoServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/script/org/ofbiz/SystemInfoServices.xml Sat Aug 4 18:11:00 2012
@@ -49,7 +49,6 @@ under the License.
<simple-method method-name="deleteSystemInfoNote" short-description="Delete SystemInfo Note">
<entity-one value-field="noteData" entity-name="NoteData"/>
- <remove-related relation-name="ContentNote" value-field="noteData"/>
<remove-related relation-name="CustRequestItemNote" value-field="noteData"/>
<remove-related relation-name="CustRequestNote" value-field="noteData"/>
<remove-related relation-name="MarketingCampaignNote" value-field="noteData"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/WEB-INF/controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/WEB-INF/controller.xml Sat Aug 4 18:11:00 2012
@@ -46,6 +46,7 @@ under the License.
<event type="java" path="org.ofbiz.content.data.DataEvents" invoke="serveObjectData"/>
<response name="success" type="none"/>
<response name="error" type="view" value="error"/>
+ <response name="io-error" type="none"/>
</request-map>
</site-conf>
Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -40,11 +40,6 @@ under the License.
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>scriptLocationPath</param-name>
<param-value>/WEB-INF/bsh</param-value>
<description>BeanShell Script Location</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -40,11 +40,6 @@
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>scriptLocationPath</param-name>
<param-value>/WEB-INF/bsh</param-value>
<description>BeanShell Script Location</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml Sat Aug 4 18:11:00 2012
@@ -45,7 +45,6 @@ under the License.
<!-- these files cannot be loaded in their original component because they are earlier than the content component -->
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/content/ContentServices.xml Sat Aug 4 18:11:00 2012
@@ -491,27 +491,6 @@
<remove-value value-field="lookedUpValue"/>
</simple-method>
- <!-- Methods for ContentPurposeOperation -->
- <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation">
- <make-value entity-name="ContentPurposeOperation" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateContentPurposeOperation" short-description="Update Content PurposeOperation">
- <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
- <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- Methods for ContentAttribute -->
<simple-method method-name="createContentAttribute" short-description="Create Content Attribute">
<make-value entity-name="ContentAttribute" value-field="newEntity"/>
@@ -533,28 +512,6 @@
<remove-value value-field="lookedUpValue"/>
</simple-method>
- <!-- Methods for ContentMetaData -->
- <simple-method method-name="createContentMetaData" short-description="Create Content MetaData">
- <make-value entity-name="ContentMetaData" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateContentMetaData" short-description="Update Content MetaData">
- <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeContentMetaData" short-description="Remove Content MetaData">
- <check-errors/>
- <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- combined text + uploaded file service -->
<simple-method method-name="createTextAndUploadedContent" short-description="Creates Text and Optionally Uploaded (sub) Content records">
<set-service-fields service-name="createTextContent" map="parameters" to-map="textContext"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/data/DataServices.xml Sat Aug 4 18:11:00 2012
@@ -106,28 +106,6 @@ under the License.
<if-compare field="dataResource.dataResourceTypeId" operator="equals" value="IMAGE_OBJECT"><return response-code="${dataResource.dataResourceTypeId}"/></if-compare>
</simple-method>
- <!-- Methods for DataCategory -->
- <simple-method method-name="createDataCategory" short-description="Create a Data Category">
- <make-value entity-name="DataCategory" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- <field-to-result field="newEntity.dataCategoryId" result-name="dataCategoryId"/>
- </simple-method>
- <simple-method method-name="updateDataCategory" short-description="Update a Data Category">
- <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="DataCategory" map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteDataCategory" short-description="Delete a Data Category">
- <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="DataCategory" map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- Methods for DataResourceMetaData -->
<simple-method method-name="createDataResourceMetaData" short-description="Create Data Resource Meta Data">
<check-permission permission="CONTENTMGR" action="_CREATE">
Modified: ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/data/DataEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/data/DataEvents.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/data/DataEvents.java Sat Aug 4 18:11:00 2012
@@ -209,7 +209,9 @@ public class DataEvents {
} catch (IOException e) {
Debug.logError(e, "Unable to write content to browser", module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
- return "error";
+ // this must be handled with a special error string because the output stream has been already used and we will not be able to return the error page;
+ // the "io-error" should be associated to a response of type "none"
+ return "io-error";
}
} else {
String errorMsg = "No data is available.";
Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml Sat Aug 4 18:11:00 2012
@@ -1843,12 +1843,6 @@ under the License.
<response name="success" type="view" value="EditContentKeywords"/>
<response name="error" type="view" value="EditContentKeywords"/>
</request-map>
- <request-map uri="createContentKeywords">
- <security https="true" auth="true"/>
- <event type="service" invoke="createContentKeywords"/>
- <response name="success" type="view" value="EditContentKeywords"/>
- <response name="error" type="view" value="EditContentKeywords"/>
- </request-map>
<request-map uri="deleteContentKeywords">
<security https="true" auth="true"/>
<event type="service" invoke="deleteContentKeywords"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://content/widget/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -453,36 +453,6 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions>
- <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
<screen name="CommonWebAnalyticsDecorator">
<section>
Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSScreens.xml Sat Aug 4 18:11:00 2012
@@ -139,7 +139,7 @@ under the License.
<decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ContentCMSEditPage}">
- <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/>
+ <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}"/>
<include-form name="EditAddContentStuff" location="component://content/widget/cms/CMSForms.xml"/>
<content content-id="${contentId}" enable-edit-name="notfound" edit-request="EditAddSubContent?MASTER_contentId=${MASTER_contentId}&MASTER_caContentIdTo=${MASTER_caContentIdTo}&MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&MASTER_caFromDate=${MASTER_caFromDate}&MASTER_drDataResourceId=${MASTER_drDataResourceId}&caContentIdTo=${caContentIdTo}"/>
</screenlet>
@@ -174,7 +174,7 @@ under the License.
<decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ContentCMSAddSubContent}">
- <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/>
+ <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}"/>
<include-form name="EditAddSubContentStuff" location="component://content/widget/cms/CMSForms.xml"/>
</screenlet>
</decorator-section>
Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml Sat Aug 4 18:11:00 2012
@@ -55,6 +55,12 @@
<!-- Public Holiday -->
<simple-method method-name="createPublicHoliday" short-description="Create Public Holiday">
+ <if-empty field="parameters.workEffortName">
+ <add-error>
+ <fail-message message="The Holiday Name is missing."/>
+ </add-error>
+ <check-errors/>
+ </if-empty>
<if-empty field="parameters.estimatedStartDate">
<add-error>
<fail-message message="The FromDate is missing"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Aug 4 18:11:00 2012
@@ -1082,7 +1082,7 @@ under the License.
<security https="true" auth="true"/>
<event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="createPublicHoliday"/>
<response name="success" type="request-redirect-noparam" value="PublicHoliday"/>
- <response name="error" type="view-last"/>
+ <response name="error" type="view" value="PublicHoliday"/>
</request-map>
<request-map uri="updatePublicHoliday">
<security https="true" auth="true"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://humanres/widget/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -437,36 +437,4 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions>
- <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
</screens>
Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/PersonTrainingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/PersonTrainingForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/PersonTrainingForms.xml Sat Aug 4 18:11:00 2012
@@ -84,7 +84,7 @@ under the License.
<field name="trainingRequestId" widget-style="buttontext"><display/></field>
<field name="trainingClassTypeId"><display-entity entity-name="TrainingClassType"/></field>
</form>
- <form name="FindTrainingApprovals" target="FindTrainingApprovals" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <form name="FindTrainingApprovals" target="FindTrainingApprovals" title="" type="single" default-title-style="tableheadtext" default-widget-style="inputBox">
<auto-fields-entity entity-name="PersonTraining" default-field-type="find"/>
<field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}">
@@ -153,7 +153,7 @@ under the License.
<field name="reason" use-when="personTraining!=null&&personTraining.getString("approvalStatus").equals("TRAINING_REJECTED")"><display/></field>
<field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="FindTrainingStatus" target="FindTrainingStatus" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <form name="FindTrainingStatus" target="FindTrainingStatus" title="" type="single" default-title-style="tableheadtext" default-widget-style="inputBox">
<auto-fields-entity entity-name="PersonTraining" default-field-type="find"/>
<field name="partyId"><hidden value="${loginPartyId}"/></field>
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}">
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://manufacturing/widget/manufacturing/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -49,38 +49,5 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
</screens>
Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>scriptLocationPath</param-name>
<param-value>/WEB-INF/bsh</param-value>
<description>BeanShell Script Location</description>