Author: hansbak
Date: Tue Mar 10 08:06:42 2009 New Revision: 752012 URL: http://svn.apache.org/viewvc?rev=752012&view=rev Log: be able to find a communication event by party role as well Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=752012&r1=752011&r2=752012&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Mar 10 08:06:42 2009 @@ -2435,6 +2435,9 @@ <value xml:lang="th">à¸à¹à¸²à¸à¸¸à¸à¸à¸£à¹à¸à¸¡à¸à¸°à¸¡à¸µà¸à¸±à¸à¸à¸µ</value> <value xml:lang="zh">å¦æä½ å·²ç»æè´¦æ·äº</value> </property> + <property key="PartyAnyRole"> + <value xml:lang="en">(Any Role)</value> + </property> <property key="PartyAppliedPayments"> <value xml:lang="en">Applied payments to payments</value> <value xml:lang="fr">Paiements affectés à d'autres paiements</value> @@ -2532,7 +2535,7 @@ <value xml:lang="pt_PT">Encadeamento AVS</value> <value xml:lang="ro">Stringa AVS</value> <value xml:lang="ru">СÑÑока AVS</value> - <value xml:lang="th">AVS à¸à¸±à¸§à¸«à¸à¸±à¸à¸ªà¸·à¸</value> + <value xml:lang="th">AV à¸à¸±à¸§à¸«à¸à¸±à¸à¸ªà¸·à¸</value> <value xml:lang="zh">å°åéªè¯æå¡å符串</value> </property> <property key="PartyBank"> 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=752012&r1=752011&r2=752012&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Tue Mar 10 08:06:42 2009 @@ -242,6 +242,7 @@ <!-- field name="origCommEventId"><text-find/></field--> <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyId" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field> <field name="communicationEventTypeId" position="1"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/> @@ -313,13 +314,9 @@ <form name="ListPartyCommEvents" type="list" extends="ListCommEvents" header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="CommunicationEvent" list="commEvents"> + <entity-condition entity-name="CommunicationEventAndRole" list="commEvents" distinct="true"> <condition-list combine="and"> - <condition-expr from-field="" field-name="statusId" operator="not-equals" value="COM_PENDING"/> - <condition-list combine="or"> - <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/> - <condition-expr field-name="partyIdTo" operator="equals" value="${partyId}"/> - </condition-list> + <condition-expr field-name="partyId" operator="equals" value="${partyId}"/> </condition-list> <order-by field-name="-lastUpdatedStamp"/> </entity-condition> |
Free forum by Nabble | Edit this page |