svn commit: r688931 - in /ofbiz/trunk/applications/party: webapp/partymgr/party/PartyForms.xml widget/partymgr/PartyScreens.xml

[hansbak-2]

Author: hansbak
Date: Mon Aug 25 18:22:35 2008
New Revision: 688931

URL: http://svn.apache.org/viewvc?rev=688931&view=rev
Log:
some corrections on party relationship management

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml

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=688931&r1=688930&r2=688931&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Mon Aug 25 18:22:35 2008
@@ -714,11 +714,11 @@
         <field name="deleteButton"><hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyRelationship?partyId=${parameters.partyId}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;fromDate=${fromDate}"/></field>
     </form>
 
-    <form name="AddOtherPartyRelationship" type="single" target="createAccountContact">
+    <form name="AddOtherPartyRelationship" type="single" target="createPartyRelationship">
         <field name="partyId"><hidden value="${parameters.partyId}"/></field>
-        <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyIdTo" entry-name="parameters.partyId"><display/></field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyPartyInTheRoleOf}">
-            <drop-down allow-empty="true">
+            <drop-down allow-empty="false" no-current-selected-key="_NA_">
                 <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -733,7 +733,7 @@
         </field>
         <field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyPartyInTheRoleOf}">
-            <drop-down allow-empty="true">
+            <drop-down allow-empty="false" no-current-selected-key="_NA_">
                 <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=688931&r1=688930&r2=688931&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Mon Aug 25 18:22:35 2008
@@ -204,6 +204,7 @@
                         <condition-expr field-name="partyIdTo" env-name="partyId"/>
                         <condition-expr field-name="partyIdFrom" env-name="partyId"/>
                     </condition-list>
+                    <order-by field-name="partyIdTo"/>
                     <order-by field-name="partyRelationshipTypeId"/>
                     <order-by field-name="-fromDate"/>
                 </entity-condition>