svn commit: r820898 - in /ofbiz/trunk/applications: marketing/servicedef/services_opportunity.xml order/ofbiz-component.xml order/servicedef/services_opportunity.xml

[hansbak-2]

Author: hansbak
Date: Fri Oct  2 06:38:05 2009
New Revision: 820898

URL: http://svn.apache.org/viewvc?rev=820898&view=rev
Log:
added html=safe to opportunity services text fields and move the servicedef from order to marketing

Added:
    ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml
      - copied, changed from r820867, ofbiz/trunk/applications/order/servicedef/services_opportunity.xml
Removed:
    ofbiz/trunk/applications/order/servicedef/services_opportunity.xml
Modified:
    ofbiz/trunk/applications/order/ofbiz-component.xml

Copied: ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml (from r820867, ofbiz/trunk/applications/order/servicedef/services_opportunity.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml?p2=ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml&p1=ofbiz/trunk/applications/order/servicedef/services_opportunity.xml&r1=820867&r2=820898&rev=820898&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_opportunity.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services_opportunity.xml Fri Oct  2 06:38:05 2009
@@ -78,6 +78,9 @@
         </auto-attributes>
         <attribute name="accountPartyId" mode="IN" type="String" optional="true"/>
         <attribute name="leadPartyId" mode="IN" type="String" optional="true"/>
+        <override name="opportunityName" allow-html="safe"/>
+        <override name="description" allow-html="safe"/>
+        <override name="nextStep" allow-html="safe"/>
     </service>
     <service name="updateSalesOpportunity" engine="simple" default-entity-name="SalesOpportunity"
         location="component://order/script/org/ofbiz/order/opportunity/OpportunityServices.xml" invoke="updateSalesOpportunity">
@@ -86,6 +89,9 @@
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <attribute name="accountPartyId" mode="IN" type="String" optional="true"/>
         <attribute name="leadPartyId" mode="IN" type="String" optional="true"/>
+        <override name="opportunityName" allow-html="safe"/>
+        <override name="description" allow-html="safe"/>
+        <override name="nextStep" allow-html="safe"/>
     </service>
     <service name="createSalesOpportunityRole" engine="simple" default-entity-name="SalesOpportunityRole"
         location="component://order/script/org/ofbiz/order/opportunity/OpportunityServices.xml" invoke="createSalesOpportunityRole">

Modified: ofbiz/trunk/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=820898&r1=820897&r2=820898&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Fri Oct  2 06:38:05 2009
@@ -42,7 +42,6 @@
     <service-resource type="model" loader="main" location="servicedef/services_quote.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_requirement.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_return.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_opportunity.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/>
     <service-resource type="eca" loader="main" location="servicedef/secas.xml"/>