You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/05/09 10:38:10 UTC
svn commit: r654720 - in /ofbiz/trunk/applications/marketing:
script/org/ofbiz/sfa/account/ servicedef/ webapp/sfa/WEB-INF/
webapp/sfa/accounts/ webapp/sfa/party/ widget/sfa/ widget/sfa/forms/
Author: hansbak
Date: Fri May 9 01:38:10 2008
New Revision: 654720
URL: http://svn.apache.org/viewvc?rev=654720&view=rev
Log:
patch provided by Santosh Malviya to bring the accounts in line with the leads and contact design
Added:
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml (with props)
ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (with props)
Modified:
ofbiz/trunk/applications/marketing/servicedef/services.xml
ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
ofbiz/trunk/applications/marketing/webapp/sfa/accounts/AccountForms.xml
ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl
ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
Added: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml?rev=654720&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml (added)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml Fri May 9 01:38:10 2008
@@ -0,0 +1,34 @@
+<?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.
+-->
+<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="createAccount" short-description="create Account Group">
+ <if-not-empty field-name="parameters.accountType">
+ <set field="accountType" from-field="parameters.accountType"/>
+ <else>
+ <set field="accountType" value="GROUP"/>
+ </else>
+ </if-not-empty>
+ <set field="parameters.roleTypeId" value="ACCOUNT"/>
+ <if-compare field-name="accountType" operator="equals" value="GROUP">
+ <call-simple-method method-name="createPartyGroupRoleAndContactMechs" xml-resource="org/ofbiz/party/party/PartySimpleMethods.xml"/>
+ </if-compare>
+ </simple-method>
+</simple-methods>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=654720&r1=654719&r2=654720&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Fri May 9 01:38:10 2008
@@ -444,4 +444,19 @@
<attribute name="useEmail2" type="String" mode="IN" optional="true"/>
<attribute name="partyId" type="String" mode="OUT" optional="false"/>
</service>
- </services>
+ <!-- Account services -->
+ <service name="createAccount" engine="simple"
+ location="org/ofbiz/sfa/account/AccountServices.xml" invoke="createAccount">
+ <description>Create an Account Group</description>
+ <auto-attributes entity-name="PartyGroup" mode="IN" optional="true">
+ <exclude field-name="partyId"/>
+ </auto-attributes>
+ <auto-attributes entity-name="PostalAddress" mode="IN" optional="true">
+ <exclude field-name="contactMechId"/>
+ </auto-attributes>
+ <auto-attributes entity-name="TelecomNumber" mode="IN" optional="true">
+ <exclude field-name="contactMechId"/>
+ </auto-attributes>
+ <attribute name="emailAddress" type="String" mode="IN" optional="true"/>
+ </service>
+</services>
\ No newline at end of file
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=654720&r1=654719&r2=654720&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Fri May 9 01:38:10 2008
@@ -74,14 +74,10 @@
</request-map>
<request-map uri="createAccount">
<security https="true" auth="true"/>
- <event type="simple" path="org/ofbiz/sfa/user/SfaUserEvent.xml" invoke="createAccount"/>
- <response name="success" type="request" value="ViewAccount"/>
+ <event type="service" invoke="createAccount"/>
+ <response name="success" type="view" value="FindAccounts"/>
<response name="error" type="view" value="NewAccounts"/>
</request-map>
- <request-map uri="ViewAccount">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ViewAccount"/>
- </request-map>
<!-- Lead Requests -->
<request-map uri="FindLeads">
@@ -137,7 +133,6 @@
<view-map name="EditOpportunity" type="screen" page="component://marketing/widget/sfa/OpportunityScreens.xml#EditOpportunity"/>
<view-map name="FindAccounts" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#FindAccounts"/>
<view-map name="NewAccounts" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#NewAccounts"/>
- <view-map name="ViewAccount" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#ViewAccount"/>
<view-map name="FindLeads" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#FindLeads"/>
<view-map name="CreateLead" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#CreateLead"/>
<view-map name="FindContacts" type="screen" page="component://marketing/widget/sfa/ContactScreens.xml#FindContacts"/>
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/accounts/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/accounts/AccountForms.xml?rev=654720&r1=654719&r2=654720&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/accounts/AccountForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/accounts/AccountForms.xml Fri May 9 01:38:10 2008
@@ -1,103 +0,0 @@
-<?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.
--->
-
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
- <form name="FindAccounts" type="single" target="FindAccounts"
- header-row-style="header-row" default-table-style="basic-table">
- <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find size="25" default-option="contains"/></field>
- <field name="groupName" title="${uiLabelMap.AccountName}"><text-find size="25" default-option="contains"/></field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
- <form name="NewAccounts" type="single" target="createAccount" header-row-style="header-row" default-table-style="basic-table">
- <field position="1" name="groupName" title="${uiLabelMap.AccountName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
- <field position="1" name="numEmployees" title="${uiLabelMap.MarketingEmployees}"><text size="30"/></field>
- <field position="2" name="tickerSymbol" title="${uiLabelMap.AccountTickerSymbol}"><text size="30"/></field>
- <field position="1" name="siteName" title="${uiLabelMap.FormFieldTitle_officeSiteName}"><text size="30" maxlength="60"/></field>
- <field position="2" name="annualRevenue" title="${uiLabelMap.AccountAnnualRevenue}"><text size="30"/></field>
- <field name="shippingAddressTitle" title="${uiLabelMap.PartyAddressMailingShipping}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="address1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="50" maxlength="60"/></field>
- <field name="address2" title="${uiLabelMap.CommonAddress2}"><text size="50" maxlength="60"/></field>
- <field position="1" name="city" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
- <field position="1" name="state" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
- <drop-down allow-empty="true">
- <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId} - ${geoName}">
- <entity-constraint name="geoTypeId" operator="in" value="STATE,PROVINCE"/>
- <entity-order-by field-name="geoId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="postalCode" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="10" maxlength="30"/></field>
- <field name="country" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
- <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}">
- <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId}: ${geoName}">
- <entity-constraint name="geoTypeId" value="COUNTRY"/>
- <entity-order-by field-name="geoId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="addressAllowSol" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
- <field name="homePhoneTitle" title="${uiLabelMap.PartyHomePhone}" title-area-style="group-label" widget-style="tooltip"><display description="${uiLabelMap.PartyPhoneNumberRequired}" also-hidden="false"/></field>
- <field name="homeCountryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
- <field name="homeAreaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
- <field name="homeContactCode" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
- <field name="homeExtensionCode" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
- <field name="homeAllowsol" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
- <field name="workPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="workCountryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
- <field name="workAreaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
- <field name="workContactCode" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
- <field name="workExtensionCode" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
- <field name="workAllowsol" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
- <field name="faxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="faxCountryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
- <field name="faxAreaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
- <field name="faxContactCode" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
- <field name="faxExtensionCode" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
- <field name="faxAllowSol" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
- <field position="1" name="emailAddress" title="${uiLabelMap.CommonEmail}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="50" maxlength="60"/></field>
- <field position="2" name="emailAllowSol" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
- <field name="description" title="${uiLabelMap.FormFieldTitle_description}"><textarea/></field>
- <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
- <form name="ListAccounts" type="list" list-name="listIt" paginate-target="FindAccounts"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
- <actions>
- <set field="parameters.noConditionFind" value="N"/>
- <set field="parameters.roleTypeId" value="ACCOUNT"/>
- <set field="parameters.partyTypeId" value="PARTY_GROUP"/>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
- <field-map field-name="entityName" value="PartyRoleNameDetail"/>
- <field-map field-name="orderBy" value="groupName"/>
- </service>
- </actions>
- <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext">
- <hyperlink target="ViewAccount?partyId=${partyId}" description="${partyId}"/>
- </field>
- <field name="groupName" title="${uiLabelMap.AccountName}">
- <hyperlink target="ViewAccount?partyId=${partyId}" description="${groupName}"/>
- </field>
- </form>
- <form name="AccountDetail" type="single" default-map-name="partyGroup">
- <auto-fields-entity entity-name="PartyGroup" default-field-type="display"/>
- </form>
-</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl?rev=654720&r1=654719&r2=654720&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl Fri May 9 01:38:10 2008
@@ -27,6 +27,10 @@
<#assign currentUrl="FindContacts"/>
<#assign title="${uiLabelMap.SfaFindContacts}"/>
</#if>
+<#if roleTypeId == "ACCOUNT">
+ <#assign currentUrl = "FindAccounts"/>
+ <#assign title = "${uiLabelMap.MarketingFindAccounts}">
+</#if>
<div id="findPartyParameters" class="screenlet">
<div class="screenlet-title-bar">
<ul>
@@ -65,14 +69,16 @@
<td class="label">${uiLabelMap.PartyPartyId}</td>
<td><input type="text" name="partyId" value="${parameters.partyId?if_exists}"/></td>
</tr>
- <tr>
- <td class="label">${uiLabelMap.PartyLastName}</td>
- <td><input type="text" name="lastName" value="${parameters.lastName?if_exists}"/></td>
- </tr>
- <tr>
- <td class="label">${uiLabelMap.PartyFirstName}</td>
- <td><input type="text" name="firstName" value="${parameters.firstName?if_exists}"/></td>
- </tr>
+ <#if roleTypeId != "ACCOUNT">
+ <tr>
+ <td class="label">${uiLabelMap.PartyLastName}</td>
+ <td><input type="text" name="lastName" value="${parameters.lastName?if_exists}"/></td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.PartyFirstName}</td>
+ <td><input type="text" name="firstName" value="${parameters.firstName?if_exists}"/></td>
+ </tr>
+ </#if>
<#if roleTypeId != "CONTACT">
<tr>
<td class="label">${uiLabelMap.PartyPartyGroupName}</td>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=654720&r1=654719&r2=654720&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Fri May 9 01:38:10 2008
@@ -23,44 +23,52 @@
<screen name="FindAccounts">
<section>
<actions>
- <set field="titleProperty" value="PageTitleFindAccount"/>
- <set field="headerItem" value="AccountTeams"/>
- <set field="tabButtonItem" value="findparty"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+ <set field="titleProperty" value="MarketingFindAccounts"/>
+ <set field="roleTypeId" value="ACCOUNT"/>
+ <set field="tabButtonItem" value="Accounts"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.MarketingFindAccounts}"/>
- </container>
- </container>
- <container style="screenlet-body">
+ <section>
+ <actions>
+ <service service-name="findParty" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <container><link target="NewAccounts" text="${uiLabelMap.PageTitleCreateAccount}" style="buttontext"/></container>
<section>
<widgets>
- <container><link target="NewAccounts" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
- <include-form name="FindAccounts" location="component://marketing/webapp/sfa/accounts/AccountForms.xml"/>
+ <platform-specific>
+ <html><html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html>
+ </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.SfaFindResults}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="partyList"/>
+ </not>
+ </condition>
+ <widgets>
+ <include-form name="ListAccounts" location="component://marketing/widget/sfa/forms/AccountForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <container style="h3">
+ <label text="${uiLabelMap.PartyNoPartiesFound}"/>
+ </container>
+ </fail-widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.SfaFindResults}"/>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListAccounts" location="component://marketing/webapp/sfa/accounts/AccountForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- </container>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -69,9 +77,9 @@
<screen name="NewAccounts">
<section>
<actions>
+ <set field="tabButtonItem" value="Accounts"/>
<set field="titleProperty" value="PageTitleCreateAccount"/>
- <set field="headerItem" value="AccountTeams"/>
- <set field="tabButtonItem" value="findparty"/>
+ <set field="accountType" from-field="parameters.accountType"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -85,41 +93,14 @@
<container style="screenlet-body">
<section>
<widgets>
- <include-form name="NewAccounts" location="component://marketing/webapp/sfa/accounts/AccountForms.xml"/>
+ <include-form name="NewAccount" location="component://marketing/widget/sfa/forms/AccountForms.xml"/>
</widgets>
</section>
- </container>
+ </container>
</container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
- <screen name="ViewAccount">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleAccountSummary"/>
- <set field="headerItem" value="AccountTeams"/>
- <set field="tabButtonItem" value="viewAccount"/>
- <set field="partyId" from-field="parameters.partyId"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/party/getContactMechs.bsh"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh"/>
- <entity-one entity-name="PartyGroup" value-name="partyGroup"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonAccountDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <widgets>
- <screenlet title="Account Detail Information">
- <include-form name="AccountDetail" location="component://marketing/webapp/sfa/accounts/AccountForms.xml"/>
- </screenlet>
- <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=654720&r1=654719&r2=654720&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Fri May 9 01:38:10 2008
@@ -120,33 +120,6 @@
</widgets>
</section>
</screen>
- <screen name="CommonAccountDecorator">
- <section>
- <actions>
- <set field="partyId" from-field="parameters.partyId"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <widgets>
- <section>
- <widgets>
- <include-menu name="AccountTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
- </widgets>
- </section>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.ProjectMgrViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="CommonPartyDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=654720&r1=654719&r2=654720&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Fri May 9 01:38:10 2008
@@ -46,8 +46,4 @@
<link target="EditOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/>
</menu-item>
</menu>
- <menu name="AccountTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
- <menu-item name="viewAccount" title="${uiLabelMap.PageTitleAccountSummary}"><link target="ViewAccount?partyId=${partyId}"/></menu-item>
- <menu-item name="editAccount" title="${uiLabelMap.PageTitleEditAccount}"><link target=""/></menu-item>
- </menu>
</menus>
Added: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=654720&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (added)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Fri May 9 01:38:10 2008
@@ -0,0 +1,75 @@
+<?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.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <form name="ListAccounts" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindAccount"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
+ <row-actions>
+ <entity-one entity-name="PartyGroup" value-name="partyGroup">
+ <field-map field-name="partyId" env-name="partyRow.partyId"/>
+ </entity-one>
+ <entity-one entity-name="PartyType" value-name="partyType">
+ <field-map field-name="partyTypeId" env-name="partyRow.partyTypeId"/>
+ </entity-one>
+ </row-actions>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}">
+ <hyperlink target="viewprofile?partyId=${partyRow.partyId}" description="${partyRow.partyId}" target-type="inter-app"/>
+ </field>
+ <field name="partyName" title="${uiLabelMap.PartyName}" use-when="partyGroup != null"><display description="${partyGroup.groupName}"/></field>
+ <field name="partyTypeId" title="${uiLabelMap.PartyType}"><display description="${partyType.description}"/> </field>
+ </form>
+ <form name="NewAccount" type="single" target="createAccount" header-row-style="header-row" default-table-style="basic-table">
+ <field name="accountType"><hidden value="${accountType}"/></field>
+ <field name="groupName" title="${uiLabelMap.PartyGroupName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+ <field name="numEmployees" title="${uiLabelMap.MarketingEmployees}"><text size="30"/></field>
+ <field name="siteName" title="${uiLabelMap.FormFieldTitle_officeSiteName}"><text size="30" maxlength="60"/></field>
+ <field name="postalAddressTitle" title="${uiLabelMap.PartyGeneralCorrespondenceAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="address1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="50" maxlength="60"/></field>
+ <field name="address2" title="${uiLabelMap.CommonAddress2}"><text size="50" maxlength="60"/></field>
+ <field name="city" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+ <field name="state" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId} - ${geoName}">
+ <entity-constraint name="geoTypeId" operator="in" value="STATE,PROVINCE"/>
+ <entity-order-by field-name="geoId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="postalCode" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="10" maxlength="30"/></field>
+ <field name="country" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+ <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}">
+ <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId}: ${geoName}">
+ <entity-constraint name="geoTypeId" value="COUNTRY"/>
+ <entity-order-by field-name="geoId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field>
+ <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
+ <field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
+ <field name="extensionCode" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
+ <field name="emailAddressTitle" title="${uiLabelMap.PartyEmailAddress}" title-area-style="group-label"><display/></field>
+ <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="50" maxlength="60"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+</forms>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml