svn commit: r778581 - in /ofbiz/branches/release09.04: ./ applications/accounting/data/DemoOrganizationData.xml applications/order/widget/ordermgr/RequestScreens.xml specialpurpose/myportal/config/MyPortalHelpUrls.xml

[hansbak-2]

Author: hansbak
Date: Tue May 26 07:10:15 2009
New Revision: 778581

URL: http://svn.apache.org/viewvc?rev=778581&view=rev
Log:
Applied fix from trunk for revision: 778576
 requestcontent list did not show + added email address to demo data

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml
    ofbiz/branches/release09.04/applications/order/widget/ordermgr/RequestScreens.xml
    ofbiz/branches/release09.04/specialpurpose/myportal/config/MyPortalHelpUrls.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 26 07:10:15 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778402
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576

Modified: ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml?rev=778581&r1=778580&r2=778581&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml (original)
+++ ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml Tue May 26 07:10:15 2009
@@ -28,6 +28,8 @@
     <ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/>
     <PartyContactMech partyId="Company" contactMechId="9000" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
     <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003 Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA" stateProvinceGeoId="CA" geoPointId="9000"/>
+    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/>
+    <PartyContactMech partyId="Company" contactMechId="Company" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
     <PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
     <PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
     <PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/>

Modified: ofbiz/branches/release09.04/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/widget/ordermgr/RequestScreens.xml?rev=778581&r1=778580&r2=778581&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/order/widget/ordermgr/RequestScreens.xml Tue May 26 07:10:15 2009
@@ -502,7 +502,7 @@
                 <set field="tabButtonItem" value="custRequestContent"/>
                 <set field="headerItem" value="request"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-and entity-name="CustRequestAndContent" list="custRequstAndContents">
+                <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents">
                     <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>
             </actions>

Modified: ofbiz/branches/release09.04/specialpurpose/myportal/config/MyPortalHelpUrls.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/myportal/config/MyPortalHelpUrls.xml?rev=778581&r1=778580&r2=778581&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/myportal/config/MyPortalHelpUrls.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/myportal/config/MyPortalHelpUrls.xml Tue May 26 07:10:15 2009
@@ -19,7 +19,7 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="MYPORTAL_main">
+    <property key="MYPORTAL_showPortalPage">
         <value xml:lang="en">My Portal</value>
     </property>
 </resource>