You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/07 10:27:24 UTC
svn commit: r762648 [6/11] - in /ofbiz/trunk: applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accou...
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=762648&r1=762647&r2=762648&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 Apr 7 08:27:15 2009
@@ -103,11 +103,11 @@
<!-- partyIdTo role-->
<if-not-empty field="newEntity.partyIdTo">
- <set field="commRole.communicationEventId" from-field="newEntity.communicationEventId" />
- <set field="commRole.partyId" from-field="newEntity.partyIdTo" />
- <set field="commRole.roleTypeId" value="ADDRESSEE" />
- <set field="commRole.contactMechId" from-field="newEntity.contactMechIdTo" />
- <set field="commRole.statusId" value="COM_ROLE_CREATED" />
+ <set field="commRole.communicationEventId" from-field="newEntity.communicationEventId"/>
+ <set field="commRole.partyId" from-field="newEntity.partyIdTo"/>
+ <set field="commRole.roleTypeId" value="ADDRESSEE"/>
+ <set field="commRole.contactMechId" from-field="newEntity.contactMechIdTo"/>
+ <set field="commRole.statusId" value="COM_ROLE_CREATED"/>
<if-compare field="parameters.permission" value="true" operator="equals">
<call-service service-name="createCommunicationEventRole" in-map-name="commRole"/>
<else>
@@ -118,11 +118,11 @@
<!-- partyIdFrom role-->
<if-not-empty field="newEntity.partyIdFrom">
- <set field="commRole.communicationEventId" from-field="newEntity.communicationEventId" />
- <set field="commRole.partyId" from-field="newEntity.partyIdFrom" />
- <set field="commRole.roleTypeId" value="ORIGINATOR" />
- <set field="commRole.contactMechId" from-field="newEntity.contactMechIdFrom" />
- <set field="commRole.statusId" value="COM_ROLE_COMPLETED" />
+ <set field="commRole.communicationEventId" from-field="newEntity.communicationEventId"/>
+ <set field="commRole.partyId" from-field="newEntity.partyIdFrom"/>
+ <set field="commRole.roleTypeId" value="ORIGINATOR"/>
+ <set field="commRole.contactMechId" from-field="newEntity.contactMechIdFrom"/>
+ <set field="commRole.statusId" value="COM_ROLE_COMPLETED"/>
<if-compare field="parameters.permission" value="true" operator="equals">
<call-service service-name="createCommunicationEventRole" in-map-name="commRole"/>
<else>
@@ -134,12 +134,12 @@
<simple-method method-name="updateCommunicationEvent"
short-description="Update a CommunicationEvent">
- <entity-one entity-name="CommunicationEvent" value-field="event" />
- <set field="oldStatusId" from-field="event.statusId" />
- <set-nonpk-fields map="parameters" value-field="event" />
+ <entity-one entity-name="CommunicationEvent" value-field="event"/>
+ <set field="oldStatusId" from-field="event.statusId"/>
+ <set-nonpk-fields map="parameters" value-field="event"/>
<if-compare-field operator="not-equals" field="event.statusId"
to-field="oldStatusId">
- <call-simple-method method-name="setCommunicationEventStatus" />
+ <call-simple-method method-name="setCommunicationEventStatus"/>
</if-compare-field>
<!-- if the from- or to-party changed change also the roles -->
@@ -154,20 +154,20 @@
<then>
<!-- check if role exist then delete old role -->
<entity-one entity-name="CommunicationEventRole" value-field="roleFrom">
- <field-map field-name="communicationEventId" from-field="event.communicationEventId" />
- <field-map field-name="partyId" from-field="parameters.partyIdFrom" />
- <field-map field-name="roleTypeId" value="ORIGINATOR" />
+ <field-map field-name="communicationEventId" from-field="event.communicationEventId"/>
+ <field-map field-name="partyId" from-field="parameters.partyIdFrom"/>
+ <field-map field-name="roleTypeId" value="ORIGINATOR"/>
</entity-one>
<if-not-empty field="roleFrom">
- <remove-value value-field="roleFrom" />
+ <remove-value value-field="roleFrom"/>
</if-not-empty>
<!-- add new role -->
- <set field="newRoleFrom.communicationEventId" from-field="event.communicationEventId" />
- <set field="newRoleFrom.partyId" from-field="event.partyIdFrom" />
- <set field="newRoleFrom.roleTypeId" value="ORIGINATOR" />
- <set field="newRoleFrom.contactMechId" from-field="event.contactMechIdFrom" />
+ <set field="newRoleFrom.communicationEventId" from-field="event.communicationEventId"/>
+ <set field="newRoleFrom.partyId" from-field="event.partyIdFrom"/>
+ <set field="newRoleFrom.roleTypeId" value="ORIGINATOR"/>
+ <set field="newRoleFrom.contactMechId" from-field="event.contactMechIdFrom"/>
<call-service service-name="createCommunicationEventRole"
- in-map-name="newRoleFrom" />
+ in-map-name="newRoleFrom"/>
</then>
</if>
</if-not-empty>
@@ -187,23 +187,23 @@
field="event.partyIdTo">
<!-- check if role exist then delete old role -->
<entity-one entity-name="CommunicationEventRole" value-field="roleTo">
- <field-map field-name="communicationEventId" from-field="event.communicationEventId" />
- <field-map field-name="partyId" from-field="event.partyIdTo" />
- <field-map field-name="roleTypeId" value="ADDRESSEE" />
+ <field-map field-name="communicationEventId" from-field="event.communicationEventId"/>
+ <field-map field-name="partyId" from-field="event.partyIdTo"/>
+ <field-map field-name="roleTypeId" value="ADDRESSEE"/>
</entity-one>
<if-not-empty field="roleTo">
- <remove-value value-field="roleTo" />
+ <remove-value value-field="roleTo"/>
</if-not-empty>
<!-- add new role -->
- <set field="newRoleTo.communicationEventId" from-field="event.communicationEventId" />
- <set field="newRoleTo.partyId" from-field="event.partyIdTo" />
- <set field="newRoleTo.roleTypeId" value="ADDRESSEE" />
- <set field="newRoleTo.contactMechId" from-field="event.contactMechIdTo" />
+ <set field="newRoleTo.communicationEventId" from-field="event.communicationEventId"/>
+ <set field="newRoleTo.partyId" from-field="event.partyIdTo"/>
+ <set field="newRoleTo.roleTypeId" value="ADDRESSEE"/>
+ <set field="newRoleTo.contactMechId" from-field="event.contactMechIdTo"/>
<call-service service-name="createCommunicationEventRole"
- in-map-name="newRoleTo" />
+ in-map-name="newRoleTo"/>
</if-compare>
</if-not-empty>
- <store-value value-field="event" />
+ <store-value value-field="event"/>
</simple-method>
<simple-method method-name="deleteCommunicationEvent" short-description="Delete a CommunicationEvent">
@@ -281,7 +281,7 @@
<simple-method method-name="createCommunicationEventRole"
short-description="Create a CommunicationEventRole">
<!-- check if role already exist, then ignore -->
- <entity-one entity-name="CommunicationEventRole" value-field="communicationEventRole" />
+ <entity-one entity-name="CommunicationEventRole" value-field="communicationEventRole"/>
<if-empty field="communicationEventRole">
<entity-one entity-name="UserLogin" value-field="sysUserLogin">
<field-map field-name="userLoginId" value="system"/>
@@ -290,20 +290,20 @@
<set field="partyRole.userLogin" from-field="sysUserLogin"/>
<call-service service-name="createPartyRole" in-map-name="partyRole" include-user-login="false"/>
- <make-value value-field="newEntity" entity-name="CommunicationEventRole" />
- <set-pk-fields map="parameters" value-field="newEntity" />
- <set-nonpk-fields map="parameters" value-field="newEntity" />
+ <make-value value-field="newEntity" entity-name="CommunicationEventRole"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
+ <set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.statusId">
- <set field="newEntity.statusId" value="COM_ROLE_CREATED" />
+ <set field="newEntity.statusId" value="COM_ROLE_CREATED"/>
</if-empty>
- <create-value value-field="newEntity" />
+ <create-value value-field="newEntity"/>
</if-empty>
</simple-method>
<simple-method method-name="updateCommunicationEventRole" short-description="Create a CommunicationEventRole">
- <entity-one value-field="eventRole" entity-name="CommunicationEventRole" />
+ <entity-one value-field="eventRole" entity-name="CommunicationEventRole"/>
<if-not-empty field="eventRole">
- <set-nonpk-fields map="parameters" value-field="eventRole" />
- <store-value value-field="eventRole" />
+ <set-nonpk-fields map="parameters" value-field="eventRole"/>
+ <store-value value-field="eventRole"/>
</if-not-empty>
</simple-method>
<simple-method method-name="removeCommunicationEventRole" short-description="Remove a CommunicationEventRole">
@@ -358,13 +358,13 @@
<entity-condition entity-name="CommunicationEvent" list="communicationEvents">
<condition-list combine="and">
<condition-list combine="or">
- <condition-expr field-name="communicationEventTypeId" operator="equals" value="EMAIL_COMMUNICATION" />
- <condition-expr field-name="communicationEventTypeId" operator="equals" value="AUTO_EMAIL_COMM" />
+ <condition-expr field-name="communicationEventTypeId" operator="equals" value="EMAIL_COMMUNICATION"/>
+ <condition-expr field-name="communicationEventTypeId" operator="equals" value="AUTO_EMAIL_COMM"/>
</condition-list>
- <condition-expr field-name="statusId" operator="equals" value="COM_IN_PROGRESS" />
+ <condition-expr field-name="statusId" operator="equals" value="COM_IN_PROGRESS"/>
<condition-list combine="or">
<condition-expr field-name="datetimeStarted" operator="less" from-field="nowDate"/>
- <condition-expr field-name="datetimeStarted" operator="equals" from-field="nullField" />
+ <condition-expr field-name="datetimeStarted" operator="equals" from-field="nullField"/>
</condition-list>
</condition-list>
</entity-condition>
@@ -408,19 +408,19 @@
<!-- allocate email to the party -->
<if-not-empty field="parameters.emailAddress">
- <entity-one entity-name="Party" value-field="party" />
+ <entity-one entity-name="Party" value-field="party"/>
<if-empty field="party">
<add-error>
- <fail-message message="Party ID: ${parameters.partyId} not found" />
+ <fail-message message="Party ID: ${parameters.partyId} not found"/>
</add-error>
<check-errors />
</if-empty>
- <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL" />
- <set field="newEmail.partyId" from-field="parameters.partyId" />
- <set field="newEmail.emailAddress" from-field="parameters.emailAddress" />
+ <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
+ <set field="newEmail.partyId" from-field="parameters.partyId"/>
+ <set field="newEmail.emailAddress" from-field="parameters.emailAddress"/>
<call-service service-name="createPartyEmailAddress"
in-map-name="newEmail">
- <result-to-field result-name="contactMechId" field="inCom.contactMechIdFrom" />
+ <result-to-field result-name="contactMechId" field="inCom.contactMechIdFrom"/>
</call-service>
</if-not-empty>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Apr 7 08:27:15 2009
@@ -63,7 +63,7 @@
<make-value entity-name="ContactMech" value-field="ContactMechMap"/>
<set-pk-fields value-field="ContactMechMap" map="parameters"/>
- <find-by-primary-key entity-name="ContactMech" map="ContactMechMap" value-field="oldValue" />
+ <find-by-primary-key entity-name="ContactMech" map="ContactMechMap" value-field="oldValue"/>
<if-compare-field to-field="oldValue.infoString" field="parameters.infoString" operator="not-equals">
<log level="info" message="Contact mech need updating"/>
<clone-value value-field="oldValue" new-value-field="newValue"/>
@@ -130,7 +130,7 @@
<check-errors/>
<make-value entity-name="PostalAddress" value-field="newValue"/>
<set-pk-fields value-field="newValue" map="parameters"/>
- <find-by-primary-key entity-name="PostalAddress" map="newValue" value-field="oldValue" />
+ <find-by-primary-key entity-name="PostalAddress" map="newValue" value-field="oldValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<set field="context.contactMechTypeId" value="POSTAL_ADDRESS"/>
@@ -178,7 +178,7 @@
<simple-method method-name="updateTelecomNumber" short-description="Update Contact Mechanism with Telecom Number">
<make-value entity-name="TelecomNumber" value-field="newValue"/>
<set-pk-fields value-field="newValue" map="parameters"/>
- <find-by-primary-key entity-name="TelecomNumber" map="newValue" value-field="oldValue" />
+ <find-by-primary-key entity-name="TelecomNumber" map="newValue" value-field="oldValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<set field="context.contactMechTypeId" value="TELECOM_NUMBER"/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Apr 7 08:27:15 2009
@@ -185,7 +185,7 @@
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
<call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
- <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId" />
+ <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/>
</call-service>
<set-service-fields service-name="updatePartyContactMech" map="parameters" to-map="updatePartyContactMechMap"/>
@@ -232,7 +232,7 @@
<set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>
<call-service service-name="updateTelecomNumber" in-map-name="updateTelecomNumberMap">
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
- <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId" />
+ <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/>
</call-service>
<set-service-fields service-name="updatePartyContactMech" map="parameters" to-map="updatePartyContactMechMap"/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Tue Apr 7 08:27:15 2009
@@ -21,21 +21,21 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createCustomer" short-description="Create Customer" login-required="false">
- <set field="require_email" value="false" />
- <set field="require_phone" value="false" />
- <set field="create_allow_password" value="false" />
- <set field="default_customer_password" value="ungssblepsswd" />
+ <set field="require_email" value="false"/>
+ <set field="require_phone" value="false"/>
+ <set field="create_allow_password" value="false"/>
+ <set field="default_customer_password" value="ungssblepsswd"/>
<property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
<property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
<now-timestamp field="nowStamp"/>
- <set field="parameters.roleTypeId" value="CUSTOMER" />
+ <set field="parameters.roleTypeId" value="CUSTOMER"/>
<if-compare field="create_allow_password" operator="not-equals" value="true">
- <set field="parameters.PASSWORD" from-field="default_customer_password" />
- <set field="parameters.CONFIRM_PASSWORD" from-field="default_customer_password" />
- <set field="parameters.PASSWORD_HINT" value="No hint set, accout not yet enabled" />
+ <set field="parameters.PASSWORD" from-field="default_customer_password"/>
+ <set field="parameters.CONFIRM_PASSWORD" from-field="default_customer_password"/>
+ <set field="parameters.PASSWORD_HINT" value="No hint set, accout not yet enabled"/>
</if-compare>
<!-- if username and/or password should be lowercased, do that now -->
@@ -62,18 +62,18 @@
</simple-map-processor>
</call-map-processor>
<if-not-empty field="userLoginContext.userLoginId">
- <set field="userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" />
+ <set field="userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId"/>
<find-by-primary-key entity-name="UserLogin" map="userLoginExistsMap" value-field="existingUserLogin"/>
<if-not-empty field="existingUserLogin">
- <set field="tempErrorMessage" value="Username in use, please choose another." />
+ <set field="tempErrorMessage" value="Username in use, please choose another."/>
<field-to-list field="tempErrorMessage" list="error_list"/>
</if-not-empty>
</if-not-empty>
<make-value entity-name="UserLogin" value-field="newUserLogin"/>
- <set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId" />
- <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword" />
- <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint" />
+ <set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId"/>
+ <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword"/>
+ <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint"/>
<!-- Check the password, etc for validity -->
<call-bsh><![CDATA[
@@ -97,7 +97,7 @@
</call-map-processor>
<!-- Create the PartyRole -->
- <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId" />
+ <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId"/>
<!-- Create the Postal Address -->
<if-compare field="parameters.USE_ADDRESS" operator="equals" value="false">
@@ -234,7 +234,7 @@
<simple-map-processor name="checkRequiredEmailFormat">
<process field="emailAddress">
<validate-method method="isEmail">
- <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly" />
+ <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/>
</validate-method>
</process>
</simple-map-processor>
@@ -244,9 +244,9 @@
<!-- create the PartyDataSource entry to track where this info came from... -->
<make-value entity-name="PartyDataSource" value-field="partyDataSource"/>
- <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" />
- <set field="partyDataSource.fromDate" from-field="nowStamp" />
- <set field="partyDataSource.isCreate" value="Y" />
+ <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE"/>
+ <set field="partyDataSource.fromDate" from-field="nowStamp"/>
+ <set field="partyDataSource.isCreate" value="Y"/>
<!-- get the visit from the session to get the visitId -->
<session-to-field field="visit"/>
<set from-field="visit.visitId" field="partyDataSource.visitId"/>
@@ -257,7 +257,7 @@
<set-service-fields map="personContext" service-name="createPersonAndUserLogin" to-map="personUserLoginContext"/>
<set-service-fields map="newUserLogin" service-name="createPersonAndUserLogin" to-map="personUserLoginContext"/>
- <set field="personUserLoginContext.currentPasswordVerify" from-field="newUserLogin.currentPassword" />
+ <set field="personUserLoginContext.currentPasswordVerify" from-field="newUserLogin.currentPassword"/>
<!-- the above copy is okay since we checked already that they are the same -->
<call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext">
<result-to-field result-name="partyId" field="tempMap.partyId"/>
@@ -266,16 +266,16 @@
<set-current-user-login value-field="createdUserLogin"/>
<!-- now that we have the partyId, put it where it needs to go... -->
- <set field="partyDataSource.partyId" from-field="tempMap.partyId" />
- <set field="userLoginContext.partyId" from-field="tempMap.partyId" />
- <set field="personContext.partyId" from-field="tempMap.partyId" />
- <set field="partyRoleContext.partyId" from-field="tempMap.partyId" />
- <set field="addressContext.partyId" from-field="tempMap.partyId" />
- <set field="homePhoneContext.partyId" from-field="tempMap.partyId" />
- <set field="workPhoneContext.partyId" from-field="tempMap.partyId" />
- <set field="faxPhoneContext.partyId" from-field="tempMap.partyId" />
- <set field="mobilePhoneContext.partyId" from-field="tempMap.partyId" />
- <set field="emailContext.partyId" from-field="tempMap.partyId" />
+ <set field="partyDataSource.partyId" from-field="tempMap.partyId"/>
+ <set field="userLoginContext.partyId" from-field="tempMap.partyId"/>
+ <set field="personContext.partyId" from-field="tempMap.partyId"/>
+ <set field="partyRoleContext.partyId" from-field="tempMap.partyId"/>
+ <set field="addressContext.partyId" from-field="tempMap.partyId"/>
+ <set field="homePhoneContext.partyId" from-field="tempMap.partyId"/>
+ <set field="workPhoneContext.partyId" from-field="tempMap.partyId"/>
+ <set field="faxPhoneContext.partyId" from-field="tempMap.partyId"/>
+ <set field="mobilePhoneContext.partyId" from-field="tempMap.partyId"/>
+ <set field="emailContext.partyId" from-field="tempMap.partyId"/>
<create-value value-field="partyDataSource"/>
<call-service service-name="createPartyRole" in-map-name="partyRoleContext"/>
@@ -287,12 +287,12 @@
<call-service service-name="createPartyPostalAddress" in-map-name="addressContext">
<result-to-field result-name="contactMechId" field="addressPurposeContext.contactMechId"/>
</call-service>
- <set field="addressPurposeContext.partyId" from-field="tempMap.partyId" />
+ <set field="addressPurposeContext.partyId" from-field="tempMap.partyId"/>
<!-- create the shipping location -->
- <set field="addressPurposeContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION" />
+ <set field="addressPurposeContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="addressPurposeContext"/>
<!-- also consider this address the general correspondence address -->
- <set field="addressPurposeContext.contactMechPurposeTypeId" value="GENERAL_LOCATION" />
+ <set field="addressPurposeContext.contactMechPurposeTypeId" value="GENERAL_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="addressPurposeContext"/>
</else>
</if-compare>
@@ -302,8 +302,8 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext">
<result-to-field result-name="contactMechId" field="homePhonePurposeContext.contactMechId"/>
</call-service>
- <set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME" />
+ <set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="homePhonePurposeContext"/>
</if-not-empty>
@@ -312,8 +312,8 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext">
<result-to-field result-name="contactMechId" field="workPhonePurposeContext.contactMechId"/>
</call-service>
- <set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK" />
+ <set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="workPhonePurposeContext"/>
</if-not-empty>
@@ -322,8 +322,8 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext">
<result-to-field result-name="contactMechId" field="faxPhonePurposeContext.contactMechId"/>
</call-service>
- <set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER" />
+ <set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="faxPhonePurposeContext"/>
</if-not-empty>
@@ -332,8 +332,8 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext">
<result-to-field result-name="contactMechId" field="mobilePhonePurposeContext.contactMechId"/>
</call-service>
- <set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE" />
+ <set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="mobilePhonePurposeContext"/>
</if-not-empty>
@@ -341,8 +341,8 @@
<call-service service-name="createPartyEmailAddress" in-map-name="emailContext">
<result-to-field result-name="contactMechId" field="emailPurposeContext.contactMechId"/>
</call-service>
- <set field="emailPurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" />
+ <set field="emailPurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="emailPurposeContext"/>
<!-- set the partyId in the request -->
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Apr 7 08:27:15 2009
@@ -212,12 +212,12 @@
</simple-method>
<!-- PartyClassificationGroup methods -->
<simple-method method-name="createPartyClassificationGroup" short-description="create a PartyClassificationGroup">
- <log level="verbose" message="in newEntity" />
+ <log level="verbose" message="in newEntity"/>
<make-value entity-name="PartyClassificationGroup" value-field="newEntity"/>
<sequenced-id sequence-name="PartyClassificationGroup" field="newEntity.partyClassificationGroupId"/>
<field-to-result field="newEntity.partyClassificationGroupId" result-name="partyClassificationGroupId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <log level="verbose" message="newEntity:${newEntity}" />
+ <log level="verbose" message="newEntity:${newEntity}"/>
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updatePartyClassificationGroup" short-description="update a PartyClassificationGroup">
@@ -323,7 +323,7 @@
<set-service-fields service-name="updateDataResource" map="dataResource" to-map="dataResource"/>
<set from-field="dataResourceId" field="dataResource.dataResourceId"/>
- <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false" />
+ <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false"/>
<set from-field="dataResource.dataResourceId" field="lookup.dataResourceId"/>
<find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map="lookup"/>
</if-not-empty>
@@ -343,14 +343,14 @@
<set from-field="parameters.partyId" field="contentRole.partyId"/>
<set from-field="nowTimestamp" field="contentRole.fromDate"/>
<set value="OWNER" field="contentRole.roleTypeId"/>
- <call-service service-name="createContentRole" in-map-name="contentRole" break-on-error="false" />
+ <call-service service-name="createContentRole" in-map-name="contentRole" break-on-error="false"/>
<!-- check party role -->
<make-value value-field="partyRole" entity-name="PartyRole"/>
<set-pk-fields value-field="partyRole" map="contentRole"/>
<find-by-and entity-name="PartyRole" map="partyRole" list="pRoles"/>
<if-empty field="pRoles">
<set-service-fields service-name="createPartyRole" map="contentRole" to-map="partyRole"/>
- <call-service service-name="createPartyRole" in-map-name="partyRole" break-on-error="false" />
+ <call-service service-name="createPartyRole" in-map-name="partyRole" break-on-error="false"/>
</if-empty>
</if-not-empty>
<if-not-empty field="parameters._uploadedFile_fileName">
@@ -360,7 +360,7 @@
<set from-field="dataResourceMap" field="fileCtx.dataResource"/>
<call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/>
</if-not-empty>
- <field-to-result field="contentId" />
+ <field-to-result field="contentId"/>
</simple-method>
<!-- Update party content -->
@@ -392,7 +392,7 @@
<if-not-empty field="content.dataResourceId">
<set-service-fields service-name="updateDataResource" map="parameters" to-map="dataResource"/>
<set from-field="content.dataResourceId" field="dataResource.dataResourceId"/>
- <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false" />
+ <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false"/>
<set from-field="content.dataResourceId" field="lookup.dataResourceId"/>
<find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map="lookup"/>
<else>
@@ -417,7 +417,7 @@
</if-not-empty>
<set-service-fields service-name="updateDataResource" map="dataResource" to-map="dataResource"/>
<set from-field="dataResourceId" field="dataResource.dataResourceId"/>
- <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false" />
+ <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false"/>
<set from-field="dataResource.dataResourceId" field="lookup.dataResourceId"/>
<find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map="lookup"/>
</else>
@@ -425,16 +425,16 @@
</if-not-empty>
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContentMap"/>
<if-not-empty field="dataResourceId">
- <set from-field="dataResourceId" field="updateContentMap.dataResourceId" />
+ <set from-field="dataResourceId" field="updateContentMap.dataResourceId"/>
</if-not-empty>
- <call-service service-name="updateContent" in-map-name="updateContentMap" break-on-error="false" />
+ <call-service service-name="updateContent" in-map-name="updateContentMap" break-on-error="false"/>
<if-not-empty field="parameters._uploadedFile_fileName">
<set-service-fields service-name="createAnonFile" map="dataResourceMap" to-map="fileCtx"/>
<set from-field="parameters.uploadedFile" field="fileCtx.binData"/>
<set from-field="dataResourceMap" field="fileCtx.dataResource"/>
<call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/>
</if-not-empty>
- <field-to-result field="parameters.contentId" result-name="contentId" />
+ <field-to-result field="parameters.contentId" result-name="contentId"/>
</simple-method>
<!-- get parties based on PartyRelationship -->
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Tue Apr 7 08:27:15 2009
@@ -44,7 +44,7 @@
</call-service>
</simple-method>
<simple-method method-name="updatePerson" short-description="Update Person">
- <set field="context.partyId" from-field="parameters.partyId" />
+ <set field="context.partyId" from-field="parameters.partyId"/>
<call-map-processor xml-resource="component://party/script/org/ofbiz/party/party/PartyMapProcs.xml"
processor-name="person" in-map-name="parameters" out-map-name="context"/>
<check-errors/>
@@ -64,7 +64,7 @@
</call-service>
</simple-method>
<simple-method method-name="updatePartyGroup" short-description="Update Party Group">
- <set field="context.partyId" from-field="parameters.partyId" />
+ <set field="context.partyId" from-field="parameters.partyId"/>
<call-map-processor xml-resource="component://party/script/org/ofbiz/party/party/PartyMapProcs.xml"
processor-name="partyGroup" in-map-name="parameters" out-map-name="context"/>
<check-errors/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Apr 7 08:27:15 2009
@@ -21,52 +21,52 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createCustomer" short-description="Create Customer" login-required="false">
- <set field="require_email" value="true" />
- <set field="require_phone" value="false" />
- <set field="require_login" value="true" />
+ <set field="require_email" value="true"/>
+ <set field="require_phone" value="false"/>
+ <set field="require_login" value="true"/>
<!-- this parameter must be set to true or the createUser method below will use a default password instead of the one entered by user -->
- <set field="create_allow_password" value="true" />
- <set field="parameters.roleTypeId" value="CUSTOMER" />
+ <set field="create_allow_password" value="true"/>
+ <set field="parameters.roleTypeId" value="CUSTOMER"/>
<call-simple-method method-name="createUser"/>
</simple-method>
<simple-method method-name="createProspect" short-description="Create Prospect" login-required="false">
- <set field="require_email" value="true" />
- <set field="require_phone" value="false" />
- <set field="require_login" value="false" />
- <set field="create_allow_password" value="true" />
+ <set field="require_email" value="true"/>
+ <set field="require_phone" value="false"/>
+ <set field="require_login" value="false"/>
+ <set field="create_allow_password" value="true"/>
<property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
<property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
<now-timestamp field="nowStamp"/>
- <set field="parameters.roleTypeId" value="PROSPECT" />
+ <set field="parameters.roleTypeId" value="PROSPECT"/>
<call-simple-method method-name="createUser"/>
</simple-method>
<simple-method method-name="createEmployee" short-description="Create Employee" login-required="false">
- <set field="require_email" value="false" />
- <set field="require_phone" value="true" />
- <set field="require_login" value="true" />
- <set field="create_allow_password" value="true" />
+ <set field="require_email" value="false"/>
+ <set field="require_phone" value="true"/>
+ <set field="require_login" value="true"/>
+ <set field="create_allow_password" value="true"/>
<property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
<property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
<now-timestamp field="nowStamp"/>
- <set field="parameters.roleTypeId" value="EMPLOYEE" />
+ <set field="parameters.roleTypeId" value="EMPLOYEE"/>
<call-simple-method method-name="createUser"/>
</simple-method>
<simple-method method-name="createUser" short-description="Create User" login-required="false">
<property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
<property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
- <set field="default_user_password" value="ungssblepsswd" />
+ <set field="default_user_password" value="ungssblepsswd"/>
<now-timestamp field="nowStamp"/>
<if-compare field="create_allow_password" operator="not-equals" value="true">
- <set field="parameters.PASSWORD" from-field="default_user_password" />
- <set field="parameters.CONFIRM_PASSWORD" from-field="default_user_password" />
- <set field="parameters.PASSWORD_HINT" value="No hint set, accout not yet enabled" />
+ <set field="parameters.PASSWORD" from-field="default_user_password"/>
+ <set field="parameters.CONFIRM_PASSWORD" from-field="default_user_password"/>
+ <set field="parameters.PASSWORD_HINT" value="No hint set, accout not yet enabled"/>
</if-compare>
<!-- if username and/or password should be lowercased, do that now -->
@@ -93,18 +93,18 @@
</simple-map-processor>
</call-map-processor>
<if-not-empty field="userLoginContext.userLoginId">
- <set field="userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" />
+ <set field="userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId"/>
<find-by-primary-key entity-name="UserLogin" map="userLoginExistsMap" value-field="existingUserLogin"/>
<if-not-empty field="existingUserLogin">
- <set field="tempErrorMessage" value="Username in use, please choose another." />
+ <set field="tempErrorMessage" value="Username in use, please choose another."/>
<field-to-list field="tempErrorMessage" list="error_list"/>
</if-not-empty>
</if-not-empty>
<make-value entity-name="UserLogin" value-field="newUserLogin"/>
<set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId"/>
- <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword" />
- <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint" />
+ <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword"/>
+ <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint"/>
<!-- Check the password, etc for validity -->
<call-bsh><![CDATA[
@@ -135,7 +135,7 @@
</call-map-processor>
<!-- Create the PartyRole -->
- <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId" />
+ <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId"/>
<!-- Create the Postal Address -->
<if-compare field="parameters.USE_ADDRESS" operator="equals" value="false">
@@ -272,7 +272,7 @@
<simple-map-processor name="checkRequiredEmailFormat">
<process field="emailAddress">
<validate-method method="isEmail">
- <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly" />
+ <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/>
</validate-method>
</process>
</simple-map-processor>
@@ -282,9 +282,9 @@
<!-- create the PartyDataSource entry to track where this info came from... -->
<make-value entity-name="PartyDataSource" value-field="partyDataSource"/>
- <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" />
- <set field="partyDataSource.fromDate" from-field="nowStamp" />
- <set field="partyDataSource.isCreate" value="Y" />
+ <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE"/>
+ <set field="partyDataSource.fromDate" from-field="nowStamp"/>
+ <set field="partyDataSource.isCreate" value="Y"/>
<!-- get the visit from the session to get the visitId -->
<session-to-field field="visit"/>
<set from-field="visit.visitId" field="partyDataSource.visitId"/>
@@ -297,16 +297,16 @@
</call-service>
<!-- now that we have the partyId, put it where it needs to go... -->
- <set field="partyDataSource.partyId" from-field="tempMap.partyId" />
- <set field="userLoginContext.partyId" from-field="tempMap.partyId" />
- <set field="personContext.partyId" from-field="tempMap.partyId" />
- <set field="partyRoleContext.partyId" from-field="tempMap.partyId" />
- <set field="addressContext.partyId" from-field="tempMap.partyId" />
- <set field="homePhoneContext.partyId" from-field="tempMap.partyId" />
- <set field="workPhoneContext.partyId" from-field="tempMap.partyId" />
- <set field="faxPhoneContext.partyId" from-field="tempMap.partyId" />
- <set field="mobilePhoneContext.partyId" from-field="tempMap.partyId" />
- <set field="emailContext.partyId" from-field="tempMap.partyId" />
+ <set field="partyDataSource.partyId" from-field="tempMap.partyId"/>
+ <set field="userLoginContext.partyId" from-field="tempMap.partyId"/>
+ <set field="personContext.partyId" from-field="tempMap.partyId"/>
+ <set field="partyRoleContext.partyId" from-field="tempMap.partyId"/>
+ <set field="addressContext.partyId" from-field="tempMap.partyId"/>
+ <set field="homePhoneContext.partyId" from-field="tempMap.partyId"/>
+ <set field="workPhoneContext.partyId" from-field="tempMap.partyId"/>
+ <set field="faxPhoneContext.partyId" from-field="tempMap.partyId"/>
+ <set field="mobilePhoneContext.partyId" from-field="tempMap.partyId"/>
+ <set field="emailContext.partyId" from-field="tempMap.partyId"/>
<if-not-empty field="newUserLogin">
<!-- If password encryption is enabled, encrpyt it now -->
@@ -316,7 +316,7 @@
]]></call-bsh>
<!-- create the UserLogin manually to get around ordering and security constraints in the service -->
- <set field="newUserLogin.partyId" from-field="tempMap.partyId" />
+ <set field="newUserLogin.partyId" from-field="tempMap.partyId"/>
<create-value value-field="newUserLogin"/>
<set-current-user-login value-field="newUserLogin"/>
</if-not-empty>
@@ -331,12 +331,12 @@
<call-service service-name="createPartyPostalAddress" in-map-name="addressContext">
<result-to-field result-name="contactMechId" field="addressPurposeContext.contactMechId"/>
</call-service>
- <set field="addressPurposeContext.partyId" from-field="tempMap.partyId" />
+ <set field="addressPurposeContext.partyId" from-field="tempMap.partyId"/>
<!-- create the shipping location -->
- <set field="addressPurposeContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION" />
+ <set field="addressPurposeContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="addressPurposeContext"/>
<!-- also consider this address the general correspondence address -->
- <set field="addressPurposeContext.contactMechPurposeTypeId" value="GENERAL_LOCATION" />
+ <set field="addressPurposeContext.contactMechPurposeTypeId" value="GENERAL_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="addressPurposeContext"/>
</else>
</if-compare>
@@ -346,8 +346,8 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext">
<result-to-field result-name="contactMechId" field="homePhonePurposeContext.contactMechId"/>
</call-service>
- <set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME" />
+ <set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="homePhonePurposeContext"/>
</if-not-empty>
@@ -356,8 +356,8 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext">
<result-to-field result-name="contactMechId" field="workPhonePurposeContext.contactMechId"/>
</call-service>
- <set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK" />
+ <set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="workPhonePurposeContext"/>
</if-not-empty>
@@ -366,8 +366,8 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext">
<result-to-field result-name="contactMechId" field="faxPhonePurposeContext.contactMechId"/>
</call-service>
- <set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER" />
+ <set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="faxPhonePurposeContext"/>
</if-not-empty>
@@ -376,8 +376,8 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext">
<result-to-field result-name="contactMechId" field="mobilePhonePurposeContext.contactMechId"/>
</call-service>
- <set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE" />
+ <set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="mobilePhonePurposeContext"/>
</if-not-empty>
@@ -386,8 +386,8 @@
<call-service service-name="createPartyEmailAddress" in-map-name="emailContext">
<result-to-field result-name="contactMechId" field="emailPurposeContext.contactMechId"/>
</call-service>
- <set field="emailPurposeContext.partyId" from-field="tempMap.partyId" />
- <set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" />
+ <set field="emailPurposeContext.partyId" from-field="tempMap.partyId"/>
+ <set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
<call-service service-name="createPartyContactMechPurpose" in-map-name="emailPurposeContext"/>
</if-not-empty>
<!-- set the partyId in the request -->
Modified: ofbiz/trunk/applications/party/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/secas.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/secas.xml Tue Apr 7 08:27:15 2009
@@ -57,7 +57,7 @@
<eca service="createCommEventWorkEffort" event="invoke">
<condition field-name="workEffortId" operator="is-empty"/>
- <action service="createWorkEffort" mode="sync" />
+ <action service="createWorkEffort" mode="sync"/>
</eca>
<!-- all these secas are now replaced by a sheduled job (sendEmailDated) which runs every 5 minutes -->
Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Tue Apr 7 08:27:15 2009
@@ -864,7 +864,7 @@
<description>Create a PartyContent record</description>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
- <override name="fromDate" optional="true" />
+ <override name="fromDate" optional="true"/>
</service>
<service name="updatePartyContent" engine="simple" default-entity-name="PartyContent"
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue Apr 7 08:27:15 2009
@@ -789,11 +789,11 @@
value="ListUnknownPartyComms"/>
</request-map>
<request-map uri="listUnknownPartyComms">
- <security https="true" auth="true" />
- <response name="success" type="view" value="ListUnknownPartyComms" />
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListUnknownPartyComms"/>
</request-map>
<request-map uri="editRequestFromCommEvent">
- <security https="true" auth="true" />
+ <security https="true" auth="true"/>
<response name="success" type="view" value="EditRequestFromCommEvent" save-last-view="true"/>
</request-map>
<request-map uri="createRequestFromCommEvent">
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=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Tue Apr 7 08:27:15 2009
@@ -402,7 +402,7 @@
<actions>
<entity-and list="commEvents" entity-name="CommunicationEventAndRole">
<field-map field-name="statusId" value="COM_UNKNOWN_PARTY"/>
- <order-by field-name="-entryDate" />
+ <order-by field-name="-entryDate"/>
</entity-and>
</actions>
<field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
@@ -712,7 +712,7 @@
</hyperlink>
</field>
<field name="entryDate">
- <display description="${date:dateTimeStr(entryDate, timeZone, locale)}" />
+ <display description="${date:dateTimeStr(entryDate, timeZone, locale)}"/>
</field>
<field name="note" widget-area-style="fieldWidth200">
<display />
Modified: ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml Tue Apr 7 08:27:15 2009
@@ -23,7 +23,7 @@
<form name="lookupPartyName" target="LookupPartyName" type="single"
header-row-style="header-row" default-table-style="basic-table">
- <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="find" />-->
+ <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="find"/>-->
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<drop-down allow-empty="true">
@@ -169,7 +169,7 @@
<!-- Person Lookup forms -->
<form name="lookupPerson" type="single" target="LookupPerson"
header-row-style="header-row" default-table-style="basic-table">
- <!--<auto-fields-entity entity-name="Person" default-field-type="find" />-->
+ <!--<auto-fields-entity entity-name="Person" default-field-type="find"/>-->
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
<field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field>
@@ -199,7 +199,7 @@
<form name="lookupPartyAndUserLoginAndPerson" type="single" target="LookupPartyAndUserLoginAndPerson"
paginate-target="LookupPartyAndUserLoginAndPerson" header-row-style="header-row" default-table-style="basic-table">
- <!--<auto-fields-entity entity-name="PartyAndUserLoginAndPerson" default-field-type="find" />-->
+ <!--<auto-fields-entity entity-name="PartyAndUserLoginAndPerson" default-field-type="find"/>-->
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
<field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><text-find/></field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Tue Apr 7 08:27:15 2009
@@ -472,7 +472,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="SegmentGroupRole">
- <field-map field-name="partyId" />
+ <field-map field-name="partyId"/>
</entity-and>
</actions>
<field name="segmentGroupId" title="${uiLabelMap.PartySegmentGroupId}">
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Tue Apr 7 08:27:15 2009
@@ -171,10 +171,10 @@
<screen name="ViewCommunicationEvent">
<section>
<actions>
- <set field="titleProperty" value="PageTitleViewCommunication" />
- <set field="tabButtonItem" value="OverView" />
- <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
- <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
+ <set field="titleProperty" value="PageTitleViewCommunication"/>
+ <set field="tabButtonItem" value="OverView"/>
+ <set field="parentCommEventId" from-field="parameters.parentCommEventId"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
</actions>
<widgets>
<decorator-screen name="Common${parameters.my}CommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
@@ -198,54 +198,54 @@
<section>
<condition>
<not>
- <if-empty field="communicationEvent.parentCommEventId" />
+ <if-empty field="communicationEvent.parentCommEventId"/>
</not>
</condition>
<actions>
<set field="parent" value="${uiLabelMap.CommonParent}"/>
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent">
- <field-map field-name="communicationEventId" from-field="communicationEvent.parentCommEventId" />
+ <field-map field-name="communicationEventId" from-field="communicationEvent.parentCommEventId"/>
</entity-one>
</actions>
<widgets>
- <include-screen name="commEvent" location="component://party/widget/partymgr/CommunicationScreens.xml" />
+ <include-screen name="commEvent" location="component://party/widget/partymgr/CommunicationScreens.xml"/>
</widgets>
</section>
</container>
<container style="righthalf">
- <label style="h1" text="${uiLabelMap.CommonRelatedInformation}" />
+ <label style="h1" text="${uiLabelMap.CommonRelatedInformation}"/>
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
<include-form name="ViewCommRoles"
- location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyCommContent}">
<include-form name="listCommContent"
- location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</screenlet>
<section>
<actions>
<entity-and list="commEvents" entity-name="CommunicationEvent">
<field-map field-name="parentCommEventId"
- from-field="parameters.communicationEventId" />
+ from-field="parameters.communicationEventId"/>
</entity-and>
</actions>
<widgets>
<screenlet title="${uiLabelMap.PartyChildCommunicationEvents}">
<include-form name="ListCommEvents"
- location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</screenlet>
</widgets>
</section>
<section>
<actions>
- <set field="entityName" value="CustRequestAndCommEvent" />
+ <set field="entityName" value="CustRequestAndCommEvent"/>
<set field="requestParameters.communicationEventId"
- from-field="parameters.communicationEventId" />
+ from-field="parameters.communicationEventId"/>
</actions>
<widgets>
<screenlet title="${uiLabelMap.OrderRequestList}">
<include-form name="ListRequests"
- location="component://order/webapp/ordermgr/request/RequestForms.xml" />
+ location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -261,9 +261,9 @@
<condition>
<or><!-- have for e-mails a special form -->
<if-compare field="communicationEvent.communicationEventTypeId"
- operator="equals" value="EMAIL_COMMUNICATION" />
+ operator="equals" value="EMAIL_COMMUNICATION"/>
<if-compare field="communicationEvent.communicationEventTypeId"
- operator="equals" value="AUTO_EMAIL_COMM" />
+ operator="equals" value="AUTO_EMAIL_COMM"/>
</or>
</condition>
<widgets>
@@ -271,31 +271,31 @@
<condition>
<or>
<if-compare field="communicationEvent.statusId"
- operator="equals" value="COM_UNKNOWN_PARTY" />
- <if-empty field="communicationEvent.partyIdFrom" />
+ operator="equals" value="COM_UNKNOWN_PARTY"/>
+ <if-empty field="communicationEvent.partyIdFrom"/>
</or>
</condition>
<widgets>
<screenlet>
<container>
- <label style="h1" text="${uiLabelMap.PartyOriginEmailNotKnown}" />
+ <label style="h1" text="${uiLabelMap.PartyOriginEmailNotKnown}"/>
</container>
<container>
- <label style="h2" text="${uiLabelMap.PartyEmailMessage}" />
+ <label style="h2" text="${uiLabelMap.PartyEmailMessage}"/>
</container>
<include-form name="allocateMsgToPartyForm"
- location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</screenlet>
</widgets>
</section>
<include-form
location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewEmail" />
+ name="ViewEmail"/>
</widgets>
<fail-widgets>
<include-form
location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewCommEvent" />
+ name="ViewCommEvent"/>
</fail-widgets>
</section>
</screenlet>
@@ -350,8 +350,8 @@
<screen name="EditCommunicationEvent">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditCommunication" />
- <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
+ <set field="titleProperty" value="PageTitleEditCommunication"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
<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"/>
@@ -362,8 +362,8 @@
<section><!-- Email -->
<condition>
<or><!-- have for e-mails a special form -->
- <if-compare field="parameters.communicationEventTypeId" operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field="parameters.communicationEventTypeId" operator="equals" value="AUTO_EMAIL_COMM" />
+ <if-compare field="parameters.communicationEventTypeId" operator="equals" value="EMAIL_COMMUNICATION"/>
+ <if-compare field="parameters.communicationEventTypeId" operator="equals" value="AUTO_EMAIL_COMM"/>
</or>
</condition>
<widgets>
@@ -384,10 +384,10 @@
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
- <include-form name="ViewCommRoles" location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ <include-form name="ViewCommRoles" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddEventRole" />
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddEventRole"/>
</screenlet>
<include-screen name="AttachFileList"/>
<include-screen name="addAttachmentEmail"/>
@@ -399,7 +399,7 @@
</section>
<section>
<condition><!-- internal note -->
- <if-compare field="parameters.communicationEventTypeId" operator="equals" value="COMMENT_NOTE" />
+ <if-compare field="parameters.communicationEventTypeId" operator="equals" value="COMMENT_NOTE"/>
</condition>
<widgets>
<section>
@@ -419,10 +419,10 @@
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
- <include-form name="ListCommRoles" location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ <include-form name="ListCommRoles" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddEventRole" />
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddEventRole"/>
</screenlet>
<include-screen name="AttachFileList"/>
<include-screen name="addAttachmentEmail"/>
@@ -434,14 +434,14 @@
<section>
<condition><!-- others -->
<and>
- <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="COMMENT_NOTE" />
- <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="EMAIL_COMMUNICATION" />
- <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="AUTO_EMAIL_COMM" />
+ <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="COMMENT_NOTE"/>
+ <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="EMAIL_COMMUNICATION"/>
+ <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="AUTO_EMAIL_COMM"/>
</and>
</condition>
<widgets>
<screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent} ${parameters.communicationEventId}">
- <include-form name="EditCommEvent" location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ <include-form name="EditCommEvent" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyChildCommunicationEvents}" navigation-form-name="ListChildCommEvents">
<include-form name="ListChildCommEvents" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
@@ -456,7 +456,7 @@
<screen name="EditRequestFromCommEvent">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditCommunication" />
+ <set field="titleProperty" value="PageTitleEditCommunication"/>
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
</actions>
<widgets>
@@ -466,7 +466,7 @@
<screenlet title="${uiLabelMap.PartyEditCustomerRequest}">
<include-form
location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="EditRequestFromCommEvent" />
+ name="EditRequestFromCommEvent"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -476,19 +476,19 @@
<screen name="UpdateCommRoles">
<section>
<actions>
- <set field="titleProperty" value="PageTitleViewCommRoles" />
- <set field="tabButtonItem" value="UpdateCommRoles" />
- <set field="communicationEventId" from-field="parameters.communicationEventId" />
- <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
- <set field="partyId" value="${parameters.partyId}" />
- <set field="partyIdFrom" value="${parameters.partyId}" />
- <set field="partyIdTo" value="${parameters.partyId}" />
- <entity-one entity-name="Party" use-cache="true" value-field="party" />
- <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson" />
- <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" />
+ <set field="titleProperty" value="PageTitleViewCommRoles"/>
+ <set field="tabButtonItem" value="UpdateCommRoles"/>
+ <set field="communicationEventId" from-field="parameters.communicationEventId"/>
+ <set field="parentCommEventId" from-field="parameters.parentCommEventId"/>
+ <set field="partyId" value="${parameters.partyId}"/>
+ <set field="partyIdFrom" value="${parameters.partyId}"/>
+ <set field="partyIdTo" value="${parameters.partyId}"/>
+ <entity-one entity-name="Party" use-cache="true" value-field="party"/>
+ <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer"
- default-value="20" />
+ default-value="20"/>
</actions>
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator"
@@ -497,12 +497,12 @@
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
<include-form
location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ListCommRoles" />
+ name="ListCommRoles"/>
</screenlet>
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
<include-form
location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="AddEventRole" />
+ name="AddEventRole"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -724,7 +724,7 @@
<include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommContent"/>
<section>
<condition>
- <if-regexp expr="text.*" field="commEventContentDataResource.drMimeTypeId" />
+ <if-regexp expr="text.*" field="commEventContentDataResource.drMimeTypeId"/>
</condition>
<actions>
<entity-one entity-name="ElectronicText" value-field="electronicText">
@@ -811,26 +811,26 @@
<entity-condition entity-name="CommunicationEventAndRole" list="commEvents">
<condition-list combine="and">
<condition-expr field-name="statusId" operator="not-equals"
- value="COM_UNKNOWN_PARTY" />
+ value="COM_UNKNOWN_PARTY"/>
<condition-expr field-name="statusId" operator="not-equals"
- value="COM_PENDING" />
+ value="COM_PENDING"/>
<condition-expr field-name="partyId" operator="equals"
- value="${partyId}" />
+ value="${partyId}"/>
<condition-expr field-name="roleStatusId"
- operator="not-equals" value="COM_ROLE_COMPLETED" ignore="${all}" />
+ operator="not-equals" value="COM_ROLE_COMPLETED" ignore="${all}"/>
</condition-list>
- <order-by field-name="-datetimeStarted" />
+ <order-by field-name="-datetimeStarted"/>
</entity-condition>
<entity-condition entity-name="CommunicationEventAndRole" list="commEventsUnknown">
<condition-list combine="and">
<condition-expr field-name="statusId" operator="equals"
- value="COM_UNKNOWN_PARTY" />
+ value="COM_UNKNOWN_PARTY"/>
<condition-expr field-name="roleStatusId" operator="not-equals"
- value="COM_ROLE_COMPLETED" />
+ value="COM_ROLE_COMPLETED"/>
<condition-expr field-name="partyId" operator="equals"
- value="${partyId}" />
+ value="${partyId}"/>
</condition-list>
- <order-by field-name="-datetimeStarted" />
+ <order-by field-name="-datetimeStarted"/>
</entity-condition>
<entity-condition entity-name="CommunicationEventAndRole" list="commEventDraft">
<condition-list combine="and">
@@ -839,7 +839,7 @@
<condition-expr field-name="partyId" operator="equals"
value="${partyId}"/>
</condition-list>
- <order-by field-name="-datetimeStarted" />
+ <order-by field-name="-datetimeStarted"/>
</entity-condition>
<entity-one entity-name="PartyNameView" value-field="partyName">
<field-map field-name="partyId" from-field="partyId"/>
@@ -848,10 +848,10 @@
<widgets>
<screenlet title="${uiLabelMap.PartyCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents" name="myComms">
- <include-menu name="communicationsMenu" location="component://party/widget/partymgr/PartyMenus.xml" />
+ <include-menu name="communicationsMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
<section>
<condition>
- <not><if-empty field="commEventsUnknown" /></not>
+ <not><if-empty field="commEventsUnknown"/></not>
</condition>
<widgets>
<label style="h2" text="${uiLabelMap.PartyEmailsFromUnknownOrigin}"></label>
@@ -862,11 +862,11 @@
<include-form name="ListPartyCommEvents" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
<section>
<condition>
- <not><if-empty field="commEventDraft" /></not>
+ <not><if-empty field="commEventDraft"/></not>
</condition>
<widgets>
<label style="h2" text="${uiLabelMap.PartyDraftEmails}"></label>
- <include-form name="ListDraftEmails" location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ <include-form name="ListDraftEmails" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</widgets>
</section>
</screenlet>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Tue Apr 7 08:27:15 2009
@@ -129,7 +129,7 @@
<set field="labelTitleProperty" value="PartyClassificationGroup"/>
<set field="partyClassificationGroupId" from-field="parameters.partyClassificationGroupId"/>
- <set field="partyId" value="" />
+ <set field="partyId" value=""/>
<entity-one entity-name="PartyClassificationGroup" value-field="partyClassificationGroup"/>
</actions>
<widgets>