svn commit: r1027885 - in /ofbiz/trunk/applications: order/servicedef/services_request.xml workeffort/servicedef/services.xml

[hansbak-2]

Author: hansbak
Date: Wed Oct 27 10:12:49 2010
New Revision: 1027885

URL: http://svn.apache.org/viewvc?rev=1027885&view=rev
Log:
reverting rev 1027811 because of buildbot errors

Modified:
    ofbiz/trunk/applications/order/servicedef/services_request.xml
    ofbiz/trunk/applications/workeffort/servicedef/services.xml

Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=1027885&r1=1027884&r2=1027885&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Wed Oct 27 10:12:49 2010
@@ -84,7 +84,6 @@ under the License.
         <auto-attributes include="pk" mode="INOUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="custRequestItemSeqId" optional="true"/>
-        <override name="description" allow-html="safe"/>
         <override name="story" allow-html="safe"/>
     </service>
     <service name="updateCustRequestItem" engine="simple" default-entity-name="CustRequestItem"

Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1027885&r1=1027884&r2=1027885&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Wed Oct 27 10:12:49 2010
@@ -46,10 +46,11 @@ under the License.
         <attribute name="requirementId" type="String" mode="IN" optional="true"/>
         <attribute name="custRequestId" type="String" mode="IN" optional="true"/>
         <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
-        <attribute name="workEffortName" optional="false" allow-html="safe"/>
-        <attribute name="description" allow-html="safe"/>
         <override name="workEffortTypeId" optional="false"/>
+        <override name="workEffortName" optional="false"/>
         <override name="currentStatusId" optional="false"/>
+        <override name="workEffortName" allow-html="safe" />
+        <override name="description" allow-html="safe" />
     </service>
     <service name="createWorkEffortAndPartyAssign" default-entity-name="WorkEffort" engine="simple"
         location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAndPartyAssign">
@@ -75,8 +76,6 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
         <attribute name="reason" type="String" mode="IN" optional="true"/>
-        <attribute name="workEffortName" allow-html="safe"/>
-        <attribute name="description" allow-html="safe"/>
     </service>
     <service name="deleteWorkEffort" default-entity-name="WorkEffort" engine="simple"
             location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffort">
@@ -364,7 +363,6 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
         <auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequest"/>
         <override name="custRequestId" optional="true" mode="INOUT"/>
-        <override name="description" allow-html="safe"/>
     </service>
     <service name="deleteWorkEffortRequest" engine="simple" location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequest" auth="true">
         <description>Deletes a CustRequestWorkEffort</description>