Author: hansbak
Date: Sun Sep 13 08:50:54 2009
New Revision: 814287
URL: http://svn.apache.org/viewvc?rev=814287&view=rev
Log:
added the 'main-roletype' to the party list screen, also added a helpscreen to
explain it...
Added:
ofbiz/trunk/applications/party/data/helpdata/
ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml (with props)
ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml
(with props)
ofbiz/trunk/applications/party/documents/
ofbiz/trunk/applications/party/documents/Party.xml (with props)
Modified:
ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
ofbiz/trunk/applications/marketing/documents/Marketing.xml
ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/data/PartyHelpData.xml
ofbiz/trunk/applications/party/data/PartyTypeData.xml
ofbiz/trunk/applications/party/entitydef/entitymodel.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/servicedef/services.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml Sun Sep 13
08:50:54 2009
@@ -67,6 +67,7 @@
</chapter>
<xi:include href="CommonExt.xml"/>
<xi:include
href="../../../applications/accounting/documents/Accounting.xml"/>
+ <xi:include href="../../../applications/party/documents/Party.xml"/>
<xi:include href="../../../applications/product/documents/Product.xml"/>
<xi:include href="../../../applications/content/documents/Content.xml"/>
<xi:include
href="../../../applications/marketing/documents/Marketing.xml"/>
Modified: ofbiz/trunk/applications/marketing/documents/Marketing.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/documents/Marketing.xml?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/documents/Marketing.xml (original)
+++ ofbiz/trunk/applications/marketing/documents/Marketing.xml Sun Sep 13
08:50:54 2009
@@ -35,7 +35,7 @@
<para>
It is very much based on the party component as its source.
Records from the party component are selected with only one basic
reason: a possible sale in the future.
- That also means that records in the party manager should be
complete, esspecially the role is pretty important.
+ That also means that records in the party manager should be
complete, especially the role is pretty important.
Not All roles, but at least 'lead' 'contact' and 'Account' should be defined
</para>
Modified: ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyEntityLabels.xml?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyEntityLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyEntityLabels.xml Sun Sep 13
08:50:54 2009
@@ -974,7 +974,7 @@
<value xml:lang="fr">Informations transporteur</value>
</property>
<property key="PartyRelationshipType.partyRelationshipName.ACCOUNT">
- <value xml:lang="en">Account</value>
+ <value xml:lang="en">Account Owned by</value>
<value xml:lang="es">Cuenta</value>
<value xml:lang="fr">Compte</value>
<value xml:lang="hi_IN">à¤à¤¾à¤¤à¤¾</value>
@@ -1102,7 +1102,7 @@
<value xml:lang="zh">主æºæå¡å¨è®¿é®è
</value>
</property>
<property key="PartyRelationshipType.partyRelationshipName.LEAD_OWNER">
- <value xml:lang="en">Lead owner</value>
+ <value xml:lang="en">Lead owned by</value>
<value xml:lang="es">Encargado de lead</value>
<value xml:lang="fr">Propriétaire principal</value>
<value xml:lang="hi_IN">मà¥à¤à¥à¤¯ सà¥à¤µà¤¾à¤®à¥</value>
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Sep 13 08:50:54
2009
@@ -6053,6 +6053,9 @@
<value
xml:lang="th">à¸à¸²à¸¡à¸ªà¸à¸¸à¸¥à¹à¸à¸´à¸¡à¸à¹à¸à¸à¹à¸à¹à¸à¸à¸²à¸</value>
<value xml:lang="zh">æ¯äº²å©åå§</value>
</property>
+ <property key="PartyMainRole">
+ <value xml:lang="en">Main Role</value>
+ </property>
<property key="PartyManagerApplication">
<value xml:lang="de">Akteur Manager Anwendung</value>
<value xml:lang="en">Party Manager Application</value>
Modified: ofbiz/trunk/applications/party/data/PartyHelpData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyHelpData.xml?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyHelpData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyHelpData.xml Sun Sep 13 08:50:54
2009
@@ -24,6 +24,18 @@
<PortletCategory portletCategoryId="REPORT" description="Reports"/>
<DataResource dataResourceId="HELP_TEMPL"/><!-- further defined in the
content component -->
- <!-- other files -->
+
+ <!-- help files -->
+ <DataResource dataResourceId="HELP_PARTY" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="applications/party/data/helpdata/HELP_PARTY.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+ dataResourceName="Party Overview" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="HELP_PARTY" contentTypeId="DOCUMENT" contentName="Party Overview" templateDataResourceId="HELP_TEMPL"
+ dataResourceId="HELP_PARTY" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_PARTY" contentAssocTypeId="TREE_CHILD"
fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+
+ <DataResource dataResourceId="PARTY_findparty" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="applications/party/data/helpdata/HELP_PARTY_findparty.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List parties Help" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="PARTY_findparty" contentTypeId="DOCUMENT" contentName="List parties Help"
templateDataResourceId="HELP_TEMPL" dataResourceId="PARTY_findparty" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_PARTY" contentIdTo="PARTY_findparty" contentAssocTypeId="TREE_CHILD"
fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="PARTY_findparty"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/party/data/PartyTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyTypeData.xml?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyTypeData.xml Sun Sep 13 08:50:54
2009
@@ -147,8 +147,10 @@
<Enumeration description="Party Email Address Verification" enumCode="EMAIL_VERIFY"
enumId="PRDS_EMAIL_VERIFY" sequenceId="03" enumTypeId="PARTY_EMAIL"/>
<Enumeration description="Party Invitation" enumCode="INVITE_EMAIL" enumId="PRDS_PARTYINV_EMAIL"
sequenceId="04" enumTypeId="PARTY_EMAIL"/>
+ <!-- the groups which are the main roles on he party listing -->
+ <RoleType description="Main Role" hasTable="N" parentTypeId=""
roleTypeId="MAIN_ROLE"/>
+
<!-- top level role types -->
- <RoleType description="Account" hasTable="N" parentTypeId=""
roleTypeId="ACCOUNT"/>
<RoleType description="Account Lead" hasTable="N" parentTypeId=""
roleTypeId="ACCOUNT_LEAD"/>
<RoleType description="Administrator" hasTable="N" parentTypeId=""
roleTypeId="ADMIN"/>
<RoleType description="Agent" hasTable="N" parentTypeId=""
roleTypeId="AGENT"/>
@@ -157,16 +159,14 @@
<RoleType description="Client" hasTable="N" parentTypeId=""
roleTypeId="CLIENT"/>
<RoleType description="Communication Participant" hasTable="N" parentTypeId=""
roleTypeId="COMMEVENT_ROLE"/>
<RoleType description="Consumer" hasTable="N" parentTypeId=""
roleTypeId="CONSUMER"/>
- <RoleType description="Contact" hasTable="N" parentTypeId=""
roleTypeId="CONTACT"/>
<RoleType description="Contractor" hasTable="N" parentTypeId=""
roleTypeId="CONTRACTOR"/>
<RoleType description="Customer" hasTable="N" parentTypeId=""
roleTypeId="CUSTOMER"/>
<RoleType description="Distribution Channel" hasTable="N" parentTypeId=""
roleTypeId="DISTRIBUTION_CHANNEL"/>
<RoleType description="ISP" hasTable="N" parentTypeId="" roleTypeId="ISP"/>
<RoleType description="Hosting Server" hasTable="N" parentTypeId=""
roleTypeId="HOSTING_SERVER"/>
- <RoleType description="Lead" hasTable="N" parentTypeId=""
roleTypeId="LEAD"/>
<RoleType description="Manufacturer" hasTable="N" parentTypeId=""
roleTypeId="MANUFACTURER"/>
<RoleType description="Not Applicable" hasTable="N" parentTypeId=""
roleTypeId="_NA_"/>
- <RoleType description="Organization" hasTable="N" parentTypeId=""
roleTypeId="ORGANIZATION_ROLE"/>
+ <RoleType description="Organization" hasTable="N" parentTypeId="MAIN_ROLE"
roleTypeId="ORGANIZATION_ROLE"/>
<RoleType description="Owner" hasTable="N" parentTypeId=""
roleTypeId="OWNER"/>
<RoleType description="Prospect" hasTable="N" parentTypeId=""
roleTypeId="PROSPECT"/>
<RoleType description="Person" hasTable="N" parentTypeId=""
roleTypeId="PERSON_ROLE"/>
@@ -174,6 +174,7 @@
<RoleType description="Request Manager" hasTable="N" parentTypeId=""
roleTypeId="REQ_MANAGER"/>
<RoleType description="Requesting Party" hasTable="N" parentTypeId=""
roleTypeId="REQ_REQUESTER"/>
<RoleType description="Request Taker" hasTable="N" parentTypeId=""
roleTypeId="REQ_TAKER"/>
+ <RoleType description="Sales Force Autm." hasTable="N" parentTypeId="MAIN_ROLE"
roleTypeId="SFA_ROLE"/>
<RoleType description="Shareholder" hasTable="N" parentTypeId=""
roleTypeId="SHAREHOLDER"/>
<RoleType description="Subscriber" hasTable="N" parentTypeId=""
roleTypeId="SUBSCRIBER"/>
<RoleType description="Vendor" hasTable="N" parentTypeId=""
roleTypeId="VENDOR"/>
@@ -182,6 +183,7 @@
<RoleType description="Workflow" hasTable="N" parentTypeId=""
roleTypeId="WORKFLOW_ROLE"/>
<!-- second level role types -->
+ <RoleType description="Account" hasTable="N" parentTypeId="SFA_ROLE"
roleTypeId="ACCOUNT"/>
<RoleType description="Addressee" hasTable="N" parentTypeId="COMMEVENT_ROLE"
roleTypeId="ADDRESSEE"/>
<RoleType description="Association" hasTable="N" parentTypeId="ORGANIZATION_ROLE"
roleTypeId="ASSOCIATION"/>
<RoleType description="Bill-From Vendor" hasTable="N" parentTypeId="VENDOR"
roleTypeId="BILL_FROM_VENDOR"/>
@@ -195,6 +197,7 @@
<RoleType description="Calendar Owner" hasTable="N" parentTypeId="CALENDAR_ROLE"
roleTypeId="CAL_OWNER"/>
<RoleType description="Carrier" hasTable="N" parentTypeId="ORGANIZATION_ROLE"
roleTypeId="CARRIER"/>
<RoleType description="Competitor" hasTable="N" parentTypeId="ORGANIZATION_ROLE"
roleTypeId="COMPETITOR"/>
+ <RoleType description="Contact" hasTable="N" parentTypeId="SFA_ROLE"
roleTypeId="CONTACT"/>
<RoleType description="Carbon Copy" hasTable="N" parentTypeId="COMMEVENT_ROLE"
roleTypeId="CC"/>
<RoleType description="Originator" hasTable="N" parentTypeId="COMMEVENT_ROLE"
roleTypeId="ORIGINATOR"/>
<RoleType description="Distributor" hasTable="N" parentTypeId="DISTRIBUTION_CHANNEL"
roleTypeId="DISTRIBUTOR"/>
@@ -202,6 +205,7 @@
<RoleType description="End-User Customer" hasTable="N" parentTypeId="CUSTOMER"
roleTypeId="END_USER_CUSTOMER"/>
<RoleType description="Household" hasTable="N" parentTypeId="ORGANIZATION_ROLE"
roleTypeId="HOUSEHOLD"/>
<RoleType description="Internal Organization" hasTable="Y"
parentTypeId="ORGANIZATION_ROLE" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <RoleType description="Lead" hasTable="N" parentTypeId="SFA_ROLE"
roleTypeId="LEAD"/>
<RoleType description="Limited Administrator" hasTable="N" parentTypeId="ADMIN"
roleTypeId="LTD_ADMIN"/>
<RoleType description="Organization Unit" hasTable="N" parentTypeId="ORGANIZATION_ROLE"
roleTypeId="ORGANIZATION_UNIT"/>
<RoleType description="Partner" hasTable="N" parentTypeId="ORGANIZATION_ROLE"
roleTypeId="PARTNER"/>
Added: ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml?rev=814287&view=auto
==============================================================================
--- ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml (added)
+++ ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml Sun Sep 13
08:50:54 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink";
+ xmlns:xi="http://www.w3.org/2001/XInclude";
+ xsi:schemaLocation="http://docbook.org/ns/docbook
../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook";>
+ <title>The Party Introduction</title>
+ <para>
+ The Party Manager application is used to manage the parties, i.e any
legal entity your company has to deal with.
+ </para>
+</section>
+
Propchange: ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml?rev=814287&view=auto
==============================================================================
--- ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml
(added)
+++ ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml Sun
Sep 13 08:50:54 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink";
xmlns:xi="http://www.w3.org/2001/XInclude";
+ xsi:schemaLocation="http://docbook.org/ns/docbook
../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook";>
+ <title>The Party Find help screen.</title>
+ <para>The default screen is for the Party tab is 'Find Party'. It
+ is used to locate existing parties. Vrious serach criteria can
be used, either based on the
+ the general party data like name role and type but also on the postal address, telephone (Telecom)
+ and other like email address.
+ </para>
+ <para>
+ If the find button is pressed, a list is presented containing several
columns.
+ Most colums are pretty obvious.
+ </para>
+ <para>
+ The "Main Roletype" need a little more explanation. In here the role is
listed which is a child of the "Main role""
+ roletype. It is currently set to "Organisation& and "SFA
Role". The later to be prepared to use he party in he SFA component.
+ See the marketing component for more information
+ </para>
+</section>
\ No newline at end of file
Propchange:
ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange:
ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/party/documents/Party.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/documents/Party.xml?rev=814287&view=auto
==============================================================================
--- ofbiz/trunk/applications/party/documents/Party.xml (added)
+++ ofbiz/trunk/applications/party/documents/Party.xml Sun Sep 13 08:50:54 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink";
xmlns:xi="http://www.w3.org/2001/XInclude";
+ xsi:schemaLocation="http://docbook.org/ns/docbook
../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook";>
+ <title>The Party Component.</title>
+ <section>
+ <title>Introduction</title>
+ <para>
+ Please find here a general introduction to the party
component (to be continued)
+ </para>
+ </section>
+ <xi:include href="../data/helpdata/HELP_ACCOUNTING_findparty.xml" />
+</chapter>
Propchange: ofbiz/trunk/applications/party/documents/Party.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/documents/Party.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/documents/Party.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Sun Sep 13
08:50:54 2009
@@ -2620,6 +2620,24 @@
<key-map field-name="parentTypeId" rel-field-name="roleTypeId"/>
</relation>
</entity>
+ <view-entity entity-name="RoleTypeIn3Levels"
+ package-name="org.ofbiz.party.party" title="Party Role View in 4
levels">
+ <member-entity entity-alias="RT1" entity-name="RoleType" />
+ <member-entity entity-alias="RT2" entity-name="RoleType" />
+ <member-entity entity-alias="RT3" entity-name="RoleType" />
+ <alias entity-alias="RT1" name="topRoleTypeId" field="roleTypeId" />
+ <alias entity-alias="RT1" name="topDescription" field="description" />
+ <alias entity-alias="RT2" name="midRoleTypeId" field="roleTypeId" />
+ <alias entity-alias="RT2" name="midDescription" field="description" />
+ <alias entity-alias="RT3" name="lowRoleTypeId" field="roleTypeId" />
+ <alias entity-alias="RT3" name="lowDescription" field="description" />
+ <view-link entity-alias="RT1" rel-entity-alias="RT2"
rel-optional="true">
+ <key-map field-name="roleTypeId" rel-field-name="parentTypeId"/>
+ </view-link>
+ <view-link entity-alias="RT2" rel-entity-alias="RT3"
rel-optional="true">
+ <key-map field-name="roleTypeId" rel-field-name="parentTypeId"/>
+ </view-link>
+ </view-entity>
<view-entity entity-name="RoleTypeAndParty"
package-name="org.ofbiz.party.party"
title="Party Role View Entity">
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=814287&r1=814286&r2=814287&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
Sun Sep 13 08:50:54 2009
@@ -1021,4 +1021,31 @@
<set field="createPartyRoleInMap.userLogin" from-field="userLogin"/>
<call-service service-name="createPartyRole"
in-map-name="createPartyRoleInMap"/>
</simple-method>
+
+ <simple-method method-name="getPartyMainRole"
+ short-description="Get the main role of this party which is a child of the
MAIN_ROLE roletypeId">
+ <entity-and entity-name="PartyRole" list="partyRoles">
+ <field-map field-name="partyId" from-field="parameters.partyId" />
+ </entity-and>
+ <!-- find the role in the list -->
+ <clear-field field="mainRoleTypeId"/>
+ <iterate entry="partyRole" list="partyRoles">
+ <if-empty field="mainRoleTypeId">
+ <entity-and entity-name="RoleTypeIn3Levels"
list="roleTypeIn3Levels">
+ <field-map field-name="topRoleTypeId" value="MAIN_ROLE" />
+ <field-map field-name="lowRoleTypeId"
from-field="partyRole.roleTypeId" />
+ </entity-and>
+ <if-not-empty field="roleTypeIn3Levels">
+ <set field="mainRoleTypeId" from-field="partyRole.roleTypeId"
/>
+ </if-not-empty>
+ </if-empty>
+ </iterate>
+ <if-not-empty field="mainRoleTypeId">
+ <field-to-result field="mainRoleTypeId" result-name="roleTypeId" />
+ <entity-one entity-name="RoleType" value-field="roleType">
+ <field-map field-name="roleTypeId" from-field="mainRoleTypeId"
/>
+ </entity-one>
+ <field-to-result result-name="description"
field="roleType.description" />
+ </if-not-empty>
+ </simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Sun Sep 13 08:50:54
2009
@@ -1257,4 +1257,14 @@
<attribute name="emailAddress" type="String" mode="IN"
optional="false"/>
<attribute name="partyId" type="String" mode="OUT" optional="false"/>
</service>
+
+ <service name="getPartyMainRole" engine="simple"
+ location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="getPartyMainRole">
+ <description>Get the main role of this party which is a child of the
MAIN_ROLE roletypeId</description>
+ <attribute name="partyId" type="String" mode="IN" optional="false"/>
+ <attribute name="roleTypeId" type="String" mode="OUT" optional="true"/>
+ <attribute name="description" type="String" mode="OUT"
optional="true"/>
+ </service>
+
+
</services>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=814287&r1=814286&r2=814287&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Sun Sep
13 08:50:54 2009
@@ -245,6 +245,7 @@
<td>${uiLabelMap.ProductSoftIdentifier}</td>
</#if>
<td>${uiLabelMap.PartyType}</td>
+ <td>${uiLabelMap.PartyMainRole}</td>
<td> </td>
</tr>
<#assign alt_row = false>
@@ -303,6 +304,10 @@
<td>${partyRow.softIdentifier?if_exists}</td>
</#if>
<td><#if partyType.description?exists>${partyType.get("description",
locale)}<#else>???</#if></td>
+ <td>
+ <#assign mainRole = dispatcher.runSync("getPartyMainRole",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRow.partyId, "userLogin",
userLogin))/>
+ ${mainRole.description?if_exists}
+ </td>
<td class="button-col align-float">
<a
href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
<#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "",
session)>
