Fixed in revision: 688691
From: "Jacques Le Roux" <[EMAIL PROTECTED]>
Hi Hans,
About
<property key="InTheRoleOf">
<value xml:lang="en">in the Role of</value>
</property>
There is already PartyPartyInTheRoleOf
Jacques
Author: hansbak
Date: Sun Aug 24 02:53:53 2008
New Revision: 688484
URL: http://svn.apache.org/viewvc?rev=688484&view=rev
Log:
ftl to form: partyrelationship
Removed:
ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=688484&r1=688483&r2=688484&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Aug 24 02:53:53
2008
@@ -1238,6 +1238,12 @@
<value
xml:lang="th">à¸à¸µà¸à¸±à¸à¸à¸¹à¹à¸§à¹à¸²à¸à¹à¸²à¸</value>
<value xml:lang="zh">年为é主</value>
</property>
+ <property key="InTheRoleOf">
+ <value xml:lang="en">in the Role of</value>
+ </property>
+ <property key="IsA"><!-- Peter 'is a' employee of company B -->
+ <value xml:lang="en">is A</value>
+ </property>
<property key="ListRelatedContacts">
<value xml:lang="en">List Related Contacts</value>
<value xml:lang="fr">Voir les contact associés</value>
@@ -2044,6 +2050,9 @@
<value xml:lang="fr">Nouvelle adresse</value>
<value xml:lang="th">à¸à¸µà¹à¸à¸¢à¸¹à¹à¹à¸«à¸¡à¹</value>
</property>
+ <property key="PartyAddOtherRelationship">
+ <value xml:lang="en">Add other party relationship</value>
+ </property>
<property key="PartyAddPermissionManuallyToSecurityGroup">
<value xml:lang="de">Berechtigung (durch Eingabe) zur Sicherheitsgruppe
hinzufügen</value>
<value xml:lang="en">Add Permission (manually) to SecurityGroup</value>
@@ -5197,6 +5206,9 @@
<value
xml:lang="th">à¸à¸µà¹à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¹à¸à¹à¸«à¸²à¸à¸à¸£à¸²à¸¨à¸à¸²à¸à¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸
ัย</value>
<value
xml:lang="zh">å¦æä¸éæ°å建å®å
¨ç»çè¯ï¼ä¸è½ä¿®æ¹è¿ä¸ªã</value>
</property>
+ <property key="PartyOfParty">
+ <value xml:lang="en">of Party</value>
+ </property>
<property key="PartyOptional">
<value xml:lang="de">Optional</value>
<value xml:lang="en">Optional</value>
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=688484&r1=688483&r2=688484&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sun Aug
24 02:53:53 2008
@@ -676,6 +676,78 @@
<field name="thruDate"><display type="date"/></field>
</form>
+ <form name="ListPartyRelationships" type="list" list-name="partyRelationships"
default-table-style="basic-table"
target="updatePartyRelationship">
+ <field name="partyId"><hidden value="${parameters.partyId}"/></field>
+ <field name="partyIdTo" title="${uiLabelMap.PartyPartyId}">
+ <display-entity entity-name="PartyNameView" description="${firstName}
${middleName} ${lastName} ${groupName}"
key-field-name="partyId">
+ <sub-hyperlink description="[${partyIdTo}]"
target="viewprofile?partyId=${partyIdTo}"/>
+ </display-entity>
+ </field>
+ <field name="roleTypeIdTo" title="${uiLabelMap.InTheRoleOf}">
+ <display-entity entity-name="RoleType" key-field-name="roleTypeId"
description="${description}"/>
+ </field>
+ <field name="partyRelationshipTypeId" title="${uiLabelMap.IsA}"><display-entity
entity-name="PartyRelationshipType"
description="${partyRelationshipName}"/></field>
+ <field name="partyIdFrom" title="${uiLabelMap.PartyOfParty}">
+ <display-entity entity-name="PartyNameView" description="${firstName}
${middleName} ${lastName} ${groupName}"
key-field-name="partyId">
+ <sub-hyperlink description="[${partyIdFrom}]"
target="viewprofile?partyId=${partyIdFrom}"/>
+ </display-entity>
+ </field>
+ <field name="roleTypeIdFrom" title="${uiLabelMap.InTheRoleOf}">
+ <display-entity entity-name="RoleType" key-field-name="roleTypeId"
description="${description}"/>
+ </field>
+ <field name="fromDate"><display type="date"/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="comments"><text/></field>
+ <field name="updateButton"><submit button-type="button"/></field>
+ <field name="deleteButton"><hyperlink
description="${uiLabelMap.CommonDelete}"
target="deletePartyRelationship?partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&roleTypeIdTo=${roleTypeIdTo}&roleTypeIdFrom=${roleTypeIdFrom}&fromDate=${fromDate}"/></field>
+ </form>
+
+ <form name="AddOtherPartyRelationship" type="single"
target="createAccountContact">
+ <field name="partyId"><hidden value="${parameters.partyId}"/></field>
+ <field name="partyIdTo"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeIdTo" title="${uiLabelMap.InTheRoleOf}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId"
description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="partyRelationshipTypeId" title="${uiLabelMap.IsA}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PartyRelationshipType"
description="${partyRelationshipName}">
+ <entity-order-by field-name="partyRelationshipName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="partyIdFrom"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeIdFrom" title="${uiLabelMap.InTheRoleOf}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId"
description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="StatusItem"
description="${description}">
+ <entity-constraint name="statusTypeId"
value="PARTY_REL_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="fromDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="SecurityGroup"
description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="comments"><text/></field>
+ <field name="submitButton"><submit button-type="button"/></field>
+ </form>
+
<form name="AddAccount" type="single" target="createAccountContact">
<field name="partyId"><hidden value="${parameters.partyId}"/></field>
<field name="partyIdFrom"><lookup
target-form-name="LookupAccount"/></field>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=688484&r1=688483&r2=688484&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Aug 24
02:53:53 2008
@@ -212,6 +212,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <screenlet title="${uiLabelMap.PartyRelationships}">
+ <include-form name="ListPartyRelationships"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
+ <container style="lefthalf">
<section>
<condition>
<if-compare field-name="party.partyTypeId" operator="equals"
value="PERSON"/>
@@ -227,9 +231,6 @@
</screenlet>
</fail-widgets>
</section>
- <platform-specific>
- <html><html-template
location="component://party/webapp/partymgr/party/EditPartyRelationships.ftl"/></html>
- </platform-specific>
<section>
<condition>
<if-has-permission permission="PARTYMGR"
action="_CREATE"/>
@@ -240,6 +241,13 @@
</screenlet>
</widgets>
</section>
+ </container>
+ <container style="righthalf">
+ <screenlet
title="${uiLabelMap.PartyAddOtherRelationship}">
+ <include-form name="AddOtherPartyRelationship"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
+ </container>
+ <container style="clear"/>
</decorator-section>
</decorator-screen>
</widgets>
