You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/05/26 09:33:02 UTC
svn commit: r778594 - in /ofbiz/trunk/applications: accounting/data/
party/script/org/ofbiz/party/communication/
party/webapp/partymgr/communication/ party/widget/partymgr/
Author: hansbak
Date: Tue May 26 07:33:01 2009
New Revision: 778594
URL: http://svn.apache.org/viewvc?rev=778594&view=rev
Log:
some corrections on the communicationevent as reported by aswath in the mailing list
Modified:
ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=778594&r1=778593&r2=778594&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Tue May 26 07:33:01 2009
@@ -30,6 +30,7 @@
<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="ofbiztest@yahoo.com"/>
<PartyContactMech partyId="Company" contactMechId="Company" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
+ <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="Company" contactMechId="Company" fromDate="2003-01-01 00:00:00.000"/>
<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/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=778594&r1=778593&r2=778594&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue May 26 07:33:01 2009
@@ -112,10 +112,6 @@
<set value="COM_ENTERED" field="parameters.statusId"/>
</if-empty>
- <if-empty field="newEntity.partyIdFrom">
- <set field="newEntity.partyIdFrom" from-field="userLogin.partyId"/>
- </if-empty>
-
<!-- if only contactMechId and no partyIdTo is provided for creation email address find the related party -->
<if-empty field="parameters.partyIdTo">
<if-not-empty field="parameters.contactMechIdTo">
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=778594&r1=778593&r2=778594&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Tue May 26 07:33:01 2009
@@ -125,7 +125,7 @@
<set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
<entity-condition entity-name="PartyContactWithPurpose" list="emailAddresses">
<condition-list combine="and">
- <condition-expr field-name="partyId" value="${communicationEvent.partyIdFrom}"/>
+ <condition-expr field-name="partyId" from-field="partyIdFrom"/>
<condition-expr field-name="contactFromDate" operator="less-equals" from-field="nowDate"/>
<condition-list combine="or">
<condition-expr field-name="contactThruDate" from-field="null"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=778594&r1=778593&r2=778594&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Tue May 26 07:33:01 2009
@@ -364,10 +364,12 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditCommunication"/>
+ <set field="my" from-field="parameters.my" default-value=""/>
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
+ <set field="partyIdFrom" from-field="parameters.partyIdFrom" default-value="parameters.userLogin.partyId"/>
<set field="parameters.communicationEventTypeId" from-field="parameters.communicationEventTypeId" default-value="${communicationEvent.communicationEventTypeId}"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/>
+ <!--script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/-->
</actions>
<widgets>
<decorator-screen name="Common${my}CommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
@@ -385,13 +387,13 @@
<if-empty field="communicationEvent"/>
</condition>
<widgets>
- <screenlet title="${uiLabelMap.PartyCreateAddEmail} ${parameters.communicationEventId} ${uiLabelMap.CommonFrom} ${communicationEvent.partyIdFrom}">
+ <screenlet title="${uiLabelMap.PartyCreateAddEmail} ${uiLabelMap.CommonFrom} ${parameters.partyIdFrom}">
<include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditEmail"/>
</screenlet>
</widgets>
<fail-widgets>
<container style="lefthalf">
- <screenlet title="${uiLabelMap.PartyCreateAddEmail} ${parameters.communicationEventId}">
+ <screenlet title="${uiLabelMap.CommonFrom}: ${communicationEvent.partyIdFrom}, CommunicationEventId: ${communicationEvent.communicationEventId}">
<include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditEmail"/>
</screenlet>
</container>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=778594&r1=778593&r2=778594&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue May 26 07:33:01 2009
@@ -360,7 +360,7 @@
</condition>
<link target="NewDraftCommunicationEvent">
<parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/>
- <parameter param-name="partyIdFrom" from-field="partyId"/>
+ <parameter param-name="partyIdFrom" from-field="parameters.userLogin.partyId"/>
<parameter param-name="my" value="My"/>
<parameter param-name="statusId" value="COM_PENDING"/>
</link>
@@ -374,7 +374,7 @@
</condition>
<link target="NewDraftCommunicationEvent">
<parameter param-name="communicationEventTypeId" value="COMMENT_NOTE"/>
- <parameter param-name="partyIdFrom" from-field="partyId"/>
+ <parameter param-name="partyIdFrom" from-field="parameters.userLogin.partyId"/>
<parameter param-name="my" value="My"/>
<parameter param-name="statusId" value="COM_PENDING"/>
</link>
@@ -385,6 +385,7 @@
<not><if-empty field="communicationEvent"/></not>
<not><if-empty field="communicationEvent.partyIdFrom"/></not>
<if-compare field="communicationEvent.statusId" operator="not-equals" value="COM_PENDING"/>
+ <if-compare field="communicationEvent.statusId" operator="not-equals" value="COM_UNKNOWN_PARTY"/>
<if-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${partyId}"/>
<if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
@@ -561,11 +562,13 @@
<menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
<link target="EditCommunicationEvent">
<parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/>
+ <parameter param-name="partyIdFrom" from-field="parameters.userLogin.partyId"/>
</link>
</menu-item>
<menu-item name="newInternalNote" title="${uiLabelMap.PartyNewInternalNote}">
<link target="EditCommunicationEvent">
<parameter param-name="communicationEventTypeId" value="COMMENT_NOTE"/>
+ <parameter param-name="partyIdFrom" from-field="parameters.userLogin.partyId"/>
</link>
</menu-item>
<menu-item name="reply" title="${uiLabelMap.PartyReply}">