svn commit: r816083 [3/4] - in /ofbiz/trunk: applications/commonext/ applications/commonext/config/ applications/commonext/data/ applications/commonext/data/helpdata/ applications/commonext/documents/ applications/commonext/script/ applications/commone...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r816083 [3/4] - in /ofbiz/trunk: applications/commonext/ applications/commonext/config/ applications/commonext/data/ applications/commonext/data/helpdata/ applications/commonext/documents/ applications/commonext/script/ applications/commone...

hansbak-2
Added: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl?rev=816083&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl (added)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl Thu Sep 17 07:43:05 2009
@@ -0,0 +1,154 @@
+<#--
+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.
+-->
+
+  <div id="partyContactInfo" class="screenlet">
+    <div class="screenlet-title-bar">
+      <ul>
+        <li class="h3">${uiLabelMap.PartyContactInformation}</li>
+        <#--if security.hasEntityPermission("PARTYMGR", "_CREATE", session) || userLogin.partyId == partyId>
+          <li><a href="<@ofbizUrl>editcontactmech?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+        </#if-->
+      </ul>
+      <br class="clear" />
+    </div>
+    <div class="screenlet-body">
+      <#if contactMeches?has_content>
+        <table class="basic-table" cellspacing="0">
+          <tr>
+            <th>${uiLabelMap.PartyContactType}</th>
+            <th>${uiLabelMap.PartyContactInformation}</th>
+            <th>${uiLabelMap.PartyContactSolicitingOk}</th>
+            <th>&nbsp;</th>
+          </tr>
+          <#list contactMeches as contactMechMap>
+            <#assign contactMech = contactMechMap.contactMech>
+            <#assign partyContactMech = contactMechMap.partyContactMech>
+            <tr><td colspan="4"><hr/></td></tr>
+            <tr>
+              <td class="label align-top">${contactMechMap.contactMechType.get("description",locale)}</td>
+              <td>
+                <#list contactMechMap.partyContactMechPurposes as partyContactMechPurpose>
+                  <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+                  <div>
+                    <#if contactMechPurposeType?has_content>
+                      <b>${contactMechPurposeType.get("description",locale)}</b>
+                    <#else>
+                      <b>${uiLabelMap.PartyMechPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b>
+                    </#if>
+                    <#if partyContactMechPurpose.thruDate?has_content>
+                      (${uiLabelMap.CommonExpire}: ${partyContactMechPurpose.thruDate})
+                    </#if>
+                  </div>
+                </#list>
+                <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId>
+                  <#assign postalAddress = contactMechMap.postalAddress>
+                  <#if postalAddress?has_content>
+                  <div>
+                    <#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br /></#if>
+                    <#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if>
+                    ${postalAddress.address1?if_exists}<br />
+                    <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
+                    ${postalAddress.city?if_exists},
+                    <#if postalAddress.stateProvinceGeoId?has_content>
+                      <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")>
+                      ${stateProvince.abbreviation?default(stateProvince.geoId)}
+                    </#if>
+                    ${postalAddress.postalCode?if_exists}
+                    <#if postalAddress.countryGeoId?has_content><br />
+                      <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+                      ${country.geoName?default(country.geoId)}
+                    </#if>
+                  </div>
+                  </#if>
+                  <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA">
+                    <#assign addr1 = postalAddress.address1?if_exists>
+                    <#if addr1?has_content && (addr1.indexOf(" ") > 0)>
+                      <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
+                      <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
+                      <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesAddressLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
+                    </#if>
+                  </#if>
+                  <#if postalAddress.geoPointId?has_content>
+                    <#assign popUptitle = contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation>
+                    <a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+                  </#if>
+                <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
+                  <#assign telecomNumber = contactMechMap.telecomNumber>
+                  <div>
+                    ${telecomNumber.countryCode?if_exists}
+                    <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")}
+                    <#if partyContactMech.extension?has_content>${uiLabelMap.PartyContactExt}&nbsp;${partyContactMech.extension}</#if>
+                    <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
+                      <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a>
+                      <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
+                    </#if>
+                  </div>
+                <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId>
+                  <div>
+                    ${contactMech.infoString?if_exists}
+                    <#--a href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMech.contactMechId}&contactMechTypeId=EMAIL_ADDRESS<#if thisUserPrimaryEmail?has_content>&contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#if></@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSendEmail}</a-->
+                  </div>
+                <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId>
+                  <div>
+                    ${contactMech.infoString?if_exists}
+                    <#assign openAddress = contactMech.infoString?default("")>
+                    <#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress></#if>
+                    <a target="_blank" href="${openAddress}" class="buttontext">${uiLabelMap.CommonOpenPageNewWindow}</a>
+                  </div>
+                <#else>
+                  <div>${contactMech.infoString?if_exists}</div>
+                </#if>
+                <div>(${uiLabelMap.CommonUpdated}:&nbsp;${partyContactMech.fromDate})</div>
+                <#if partyContactMech.thruDate?has_content><div><b>${uiLabelMap.PartyContactEffectiveThru}:&nbsp;${partyContactMech.thruDate}</b></div></#if>
+                <#-- create cust request -->
+                <#if custRequestTypes?exists>
+                  <form name="createCustRequestForm" action="<@ofbizUrl>createCustRequest</@ofbizUrl>" method="POST" onSubmit="javascript:submitFormDisableSubmits(this)">
+                    <input type="hidden" name="partyId" value="${partyId}"/>
+                    <input type="hidden" name="fromPartyId" value="${partyId}"/>
+                    <input type="hidden" name="fulfillContactMechId" value="${contactMech.contactMechId}"/>
+                    <select name="custRequestTypeId">
+                      <#list custRequestTypes as type>
+                        <option value="${type.custRequestTypeId}">${type.get("description", locale)}</option>
+                      </#list>
+                    </select>
+                    <input type="submit" class="smallSubmit" value="${uiLabelMap.PartyCreateNewCustRequest}"/>
+                  </form>
+                </#if>
+              </td>
+              <td valign="top"><b>(${partyContactMech.allowSolicitation?if_exists})</b></td>
+              <td class="button-col">
+                <#--if security.hasEntityPermission("PARTYMGR", "_UPDATE", session) || userLogin.partyId == partyId>
+                  <a href="<@ofbizUrl>editcontactmech?partyId=${partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+                </#if>
+                <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session) || userLogin.partyId == partyId>
+                  <form name="partyDeleteContact" method="post" action="<@ofbizUrl>deleteContactMech</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)">
+                    <input name="partyId" value="${partyId}" type="hidden"/>
+                    <input name="contactMechId" value="${contactMech.contactMechId}" type="hidden"/>
+                    <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonExpire}"/>
+                  </form>
+                </#if-->
+              </td>
+            </tr>
+          </#list>
+        </table>
+      <#else>
+        ${uiLabelMap.PartyNoContactInformation}
+      </#if>
+    </div>
+  </div>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=816083&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml (added)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml Thu Sep 17 07:43:05 2009
@@ -0,0 +1,177 @@
+<?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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    <screen name="main-decorator">
+        <section>
+            <actions>
+                <!-- base/top/specific map first, then more common map added for shared labels -->
+                <property-map resource="SetupUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                
+                <set field="MainColumnStyle" value="nocolumns" global="true"/>
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.SetupCompanyName" global="true"/>
+                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.SetupCompanySubtitle" global="true"/>
+                <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
+                    then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
+                <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
+                <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
+                <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
+                <set field="activeApp" value="ofbizsetup" global="true"/>
+                <set field="applicationMenuName" value="SetupAppBar" global="true"/>
+                <set field="applicationMenuLocation" value="component://commonext/widget/ofbizsetup/Menus.xml" global="true"/>
+                <set field="applicationTitle" value="${uiLabelMap.SetupApp}" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="CommonSetupDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="init"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <entity-one entity-name="Party" value-field="party"/>
+                <entity-one entity-name="PartyGroup" value-field="lookupGroup"/>
+                <entity-one entity-name="Facility" value-field="lookupFacility"/>
+                <entity-one entity-name="WebSite" value-field="lookupWebSite"/>
+                <entity-one entity-name="ProductStore" value-field="lookupProductStore"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <condition>
+                                <and>
+                                    <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+                                    <not><if-empty field="party"/></not>
+                                </and>
+                            </condition>
+                            <widgets>
+                                <include-menu location="component://commonext/widget/ofbizsetup/Menus.xml" name="SetupSubTabBar"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for PARTYMGR, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <section>
+                                    <condition><not><if-empty field="partyId"/></not></condition>
+                                    <widgets>
+                                        <container style="clear"/>
+                                        <container style="h1">
+                                            <section>
+                                                <condition><not><if-empty field="lookupGroup"/></not></condition>
+                                                <widgets>
+                                                    <label text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName} [${partyId}]"/>
+                                                    <horizontal-separator/>
+                                                </widgets>
+                                                <fail-widgets>
+                                                    <label text="${uiLabelMap.PartyNewUser}"/>
+                                                </fail-widgets>
+                                            </section>
+                                        </container>
+                                    </widgets>
+                                </section>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="EntityExportAll">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEntityExportAll"/>
+                <set field="tabButtonItem" value="entityExportAll"/>
+                <set field="parameters.TRANSACTION_TIMEOUT" value="7200"/>
+                <set field="results" from-field="parameters.results"/>
+                <set field="headerItem" value="export"/>
+            </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.PageTitleEntityExportAll}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <platform-specific>
+                                            <html><html-template location="component://webtools/webapp/webtools/entity/EntityExportAll.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="CommonMyCommunicationEventDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="mycomm"/>
+                <set field="my" value="My" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+                            </condition>
+                            <widgets>
+                                <include-menu name="MyCommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml?rev=816083&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml (added)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml Thu Sep 17 07:43:05 2009
@@ -0,0 +1,101 @@
+<?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.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
+    
+    <menu name="SetupAppBar" title="${uiLabelMap.SetupApp}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="init" title="${uiLabelMap.SetupInitialSetup}">
+            <link target="initialsetup"/>
+        </menu-item>
+        <menu-item name="export" title="${uiLabelMap.PageTitleEntityExportAll}">
+            <link target="EntityExportAll"/>
+        </menu-item>
+    </menu>
+    
+    <menu name="SetupSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+        selected-menuitem-context-field-name="tabButtonItemTop">
+        <menu-item name="organization" title="${uiLabelMap.SetupOrganization}">
+            <link target="viewprofile">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+        <menu-item name="facility" title="${uiLabelMap.SetupFacility}">
+            <link target="EditFacility">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+        <menu-item name="productstore" title="${uiLabelMap.SetupProductStore}">
+            <link target="EditProductStore">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+        <menu-item name="website" title="${uiLabelMap.SetupWebSite}">
+            <link target="EditWebSite">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+        <menu-item name="firstcustomer" title="${uiLabelMap.SetupFirstCustomer}">
+            <link target="firstcustomer">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+        <menu-item name="firstproduct" title="${uiLabelMap.SetupFirstProduct}">
+            <link target="firstproduct">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+    </menu>
+    
+    <menu name="FirstProductTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+        default-menu-item-name="productcatalog">
+        <menu-item name="productcatalog" title="${uiLabelMap.SetupProductCatalog}">
+            <link target="firstproduct">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+        <menu-item name="productcategory" title="${uiLabelMap.ProductCategory}">
+            <link target="EditCategory">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+        <menu-item name="product" title="${uiLabelMap.ProductProduct}">
+            <link target="NewProduct">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
+    </menu>
+    
+    <menu name="personUpdate">
+        <menu-item name="update" title="${uiLabelMap.CommonUpdate}">
+            <link target="editperson">
+                <parameter param-name="customerPartyId" from-field="customerPartyId"/>
+                <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+            </link>
+        </menu-item>
+    </menu>
+    
+    <menu name="groupUpdate">
+        <menu-item name="update" title="${uiLabelMap.CommonUpdate}">
+            <link target="editpartygroup">
+                <parameter param-name="partyId" from-field="organizationPartyId"/>
+            </link>
+        </menu-item>
+    </menu>
+</menus>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=816083&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (added)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Thu Sep 17 07:43:05 2009
@@ -0,0 +1,340 @@
+<?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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    
+    <!-- First Customer -->
+    <screen name="FirstCustomer">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PartyCreateNewCustomer"/>
+                <set field="tabButtonItemTop" value="firstcustomer"/>
+                
+                <set field="target" value="createCustomer"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <entity-condition entity-name="PartyRelationship" list="customerRels" filter-by-date="true">
+                    <condition-list>
+                        <condition-expr field-name="partyIdTo" from-field="partyId"/>
+                        <condition-expr field-name="roleTypeIdFrom" value="CUSTOMER"/>
+                        <condition-expr field-name="roleTypeIdTo" value="INTERNAL_ORGANIZATIO"/>
+                        <condition-expr field-name="partyRelationshipTypeId" value="CUSTOMER_REL"/>
+                    </condition-list>
+                </entity-condition>
+                <set field="customerRel" from-field="customerRels[0]"/>
+                
+                <set field="customerPartyId" from-field="customerRel.partyIdFrom"/>
+                <set field="organizationPartyId" from-field="parameters.partyId"/>
+                <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+                <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-has-permission permission="PARTYMGR" action="_CREATE"/>
+                            </condition>
+                            <widgets>
+                                <section>
+                                    <condition>
+                                        <not><if-empty field="customerRel"/></not>
+                                    </condition>
+                                    <widgets>
+                                        <include-screen name="Party"/>
+                                        <include-screen name="Contact"/>
+                                    </widgets>
+                                    <fail-widgets>
+                                        <container style="screenlet">
+                                            <container style="screenlet-title-bar">
+                                                <container style="h3">
+                                                    <label text="${uiLabelMap.PartyCreateNewCustomer}"/>
+                                                </container>
+                                            </container>
+                                            <container style="screenlet-body">
+                                                <section>
+                                                    <widgets>
+                                                        <include-form name="NewCustomer" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/>
+                                                    </widgets>
+                                                </section>
+                                            </container>
+                                        </container>
+                                    </fail-widgets>
+                                </section>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>          
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="viewprofile">
+        <section>
+            <actions>
+                <set field="tabButtonItemTop" value="organization"/>
+                <set field="organizationPartyId" from-field="parameters.partyId"/>
+                <entity-condition entity-name="PartyRole" list="partyRoles">
+                    <condition-list combine="and">
+                        <condition-expr field-name="partyId" operator="equals" from-field="organizationPartyId"/>
+                        <condition-expr field-name="roleTypeId" operator="equals" value="ORGANIZATION_ROLE"/>
+                    </condition-list>
+                </entity-condition>
+                <set field="partyRole" from-field="partyRoles[0]"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-empty field="partyRole"/>
+                            </condition>
+                            <widgets>
+                                <container style="button-bar">
+                                    <link target="OrganizationToComplete" text="${uiLabelMap.SetupSetToComplete}" style="buttontext">
+                                        <parameter param-name="partyId" from-field="organizationPartyId"/>
+                                        <parameter param-name="roleTypeId" value="ORGANIZATION_ROLE"/>
+                                    </link>
+                                </container>
+                            </widgets>
+                        </section>
+                        <include-screen name="Party"/>
+                        <include-screen name="Contact"/>
+                    </decorator-section>
+                </decorator-screen>          
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="Party">
+        <section>
+            <actions>
+                <entity-condition entity-name="PartyRelationship" list="customerRels" filter-by-date="true">
+                    <condition-list>
+                        <condition-expr field-name="partyIdTo" from-field="parameters.partyId"/>
+                        <condition-expr field-name="roleTypeIdFrom" value="CUSTOMER"/>
+                        <condition-expr field-name="roleTypeIdTo" value="INTERNAL_ORGANIZATIO"/>
+                        <condition-expr field-name="partyRelationshipTypeId" value="CUSTOMER_REL"/>
+                    </condition-list>
+                </entity-condition>
+                <set field="customerRel" from-field="customerRels[0]"/>
+                
+                <set field="partyId" from-field="customerPartyId" default-value="${organizationPartyId}"/>
+                <entity-and entity-name="PartyNameHistory" list="partyNameHistoryList">
+                    <field-map field-name="partyId" from-field="partyId"/>
+                    <order-by field-name="-changeDate"/>
+                </entity-and>
+                <entity-one entity-name="PartyAndGroup" value-field="lookupGroup">
+                    <field-map field-name="partyId" from-field="parameters.partyId"/>
+                </entity-one>
+                <entity-one entity-name="PartyAndPerson" value-field="lookupPerson">
+                    <field-map field-name="partyId" from-field="customerPartyId"/>
+                </entity-one>
+            </actions>
+            <widgets>
+                <section>
+                    <condition>
+                        <and>
+                            <if-compare field="tabButtonItemTop" operator="equals" value="firstcustomer"/>
+                            <not><if-empty field="lookupPerson"/></not>
+                        </and>
+                    </condition>
+                    <widgets>
+                        <container>
+                            <label style="h1" text="${uiLabelMap.SetupTheFirstCustomerOf} ${lookupGroup.groupName}"/>
+                        </container>
+                        <container style="clear"/>
+                        <section>
+                            <condition>
+                                <or>
+                                    <if-has-permission permission="PARTYMGR" action="_GRP_UPDATE"/>
+                                    <if-compare-field field="customerPartyId" operator="equals" to-field="userLogin.partyId"/>
+                                </or>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel">
+                                    <include-menu name="personUpdate" location="component://commonext/widget/ofbizsetup/Menus.xml"/>
+                                    <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                    <section>
+                                        <condition>
+                                            <not><if-empty field="partyNameHistoryList"/></not>
+                                        </condition>
+                                        <widgets>
+                                            <include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                        </widgets>
+                                    </section>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel">
+                                    <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                    <section>
+                                        <condition>
+                                            <not><if-empty field="partyNameHistoryList"/></not>
+                                        </condition>
+                                        <widgets>
+                                            <include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                        </widgets>
+                                    </section>
+                                </screenlet>
+                            </fail-widgets>
+                        </section>
+                    </widgets>
+                </section>
+                <section>
+                    <condition>
+                        <and>
+                            <if-compare field="tabButtonItemTop" operator="equals" value="organization"/>
+                            <not><if-empty field="lookupGroup"/></not>
+                        </and>
+                    </condition>
+                    <widgets>
+                        <section>
+                            <condition>
+                                <if-has-permission permission="PARTYMGR" action="_GRP_UPDATE"/>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.SetupOrganizationInformation}" navigation-menu-name="groupUpdate" id="PartyGroupInformationPanel">
+                                    <include-menu name="groupUpdate" location="component://commonext/widget/ofbizsetup/Menus.xml"/>
+                                    <include-form name="ViewOrganization" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/>
+                                    <section>
+                                        <condition>
+                                            <not><if-empty field="partyNameHistoryList"/></not>
+                                        </condition>
+                                        <widgets>
+                                            <include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                        </widgets>
+                                    </section>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <screenlet title="${uiLabelMap.SetupOrganizationInformation}" navigation-menu-name="groupUpdate" id="PartyGroupInformationPanel">
+                                    <include-form name="ViewOrganization" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/>
+                                    <section>
+                                        <condition>
+                                            <not><if-empty field="partyNameHistoryList"/></not>
+                                        </condition>
+                                        <widgets>
+                                            <include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                        </widgets>
+                                    </section>
+                                </screenlet>
+                            </fail-widgets>                            
+                        </section>
+                    </widgets>
+                </section>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="Contact">
+        <section>
+            <actions>
+                <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
+            </actions>
+            <widgets>
+                <!--<platform-specific>
+                    <html>
+                        <html-template location="component://commonext/webapp/ofbizsetup/organization/viewcontact.ftl"/>
+                    </html>
+                    </platform-specific>-->
+                <platform-specific>
+                    <html>
+                        <html-template location="component://party/webapp/partymgr/party/profileblocks/Contact.ftl"/>
+                    </html>
+                </platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="EditPartyGroup">
+        <section>
+            <actions>
+                <set field="titleProperty" value="SetupEditOrganizationInformation"/>
+                <set field="tabButtonItemTop" value="organization"/>
+                <set field="labelTitleProperty" value="SetupEditOrganizationInformation"/>
+                
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <entity-one entity-name="PartyAndGroup" value-field="partyGroup"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="h3">
+                                    <label text="${uiLabelMap.SetupEditOrganizationInformation}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="EditPerson">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditPersonalInformation"/>
+                <set field="tabButtonItemTop" value="firstcustomer"/>
+                <set field="labelTitleProperty" value="PageTitleEditPersonalInformation"/>
+                
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="firstcustomer"/>
+                <set field="partyId" from-field="parameters.customerPartyId"/>
+                <entity-one entity-name="PartyAndPerson" value-field="personInfo"/>
+                <set field="parameters.partyId" from-field="parameters.organizationPartyId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="h3">
+                                    <label text="${uiLabelMap.PageTitleEditPersonalInformation}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditCustomer" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=816083&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml (added)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Thu Sep 17 07:43:05 2009
@@ -0,0 +1,289 @@
+<?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="NewOrganization" type="single" target="${target}${previousParams}"
+        focus-field-name="USER_TITLE" header-row-style="header-row" default-table-style="basic-table">
+        <field name="USE_ADDRESS"><hidden value="${USE_ADDRESS}"/></field>
+        <field name="partyId"><text/></field>
+        <field name="groupName" title="${uiLabelMap.SetupOrganizationName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+
+        <field name="ShippingAddressTitle" title="${uiLabelMap.PartyAddressMailingShipping}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="USER_ADDRESS1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+        <field name="USER_ADDRESS2" title="${uiLabelMap.CommonAddress2}"><text size="30" maxlength="60"/></field>
+        <field name="USER_CITY" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+        <field name="USER_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="USER_POSTAL_CODE" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="10" maxlength="30"/></field>
+        <field name="USER_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="USER_ADDRESS_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="WorkPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}" title-area-style="group-label" widget-style="tooltip"><display description="${uiLabelMap.PartyPhoneNumberRequired}" also-hidden="false"/></field>
+        <field name="USER_WORK_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_WORK_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_WORK_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
+        <field name="USER_WORK_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
+        <field name="USER_WORK_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="FaxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="USER_FAX_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_FAX_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_FAX_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
+        <field name="USER_FAX_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
+        <field name="USER_FAX_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="EmailAddressTitle" title="${uiLabelMap.PartyEmailAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field use-when="require_email!=null" name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="60" maxlength="250"/></field>
+        <field use-when="require_email==null" name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" widget-style="required"><text size="60" maxlength="250"/></field>
+        <field name="USER_EMAIL_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
+    </form>
+    
+    <form name="NewCustomer" extends="NewUser" extends-resource="component://party/webapp/partymgr/party/PartyForms.xml">
+        <field name="partyId"><hidden value="${partyId}"/></field>
+        <field name="customerPartyId"><hidden value="CUST${partyId}"/></field>
+        <field use-when="displayPassword!=null" name="USERNAME" title="${uiLabelMap.CommonUsername}"><text size="30" maxlength="250"/></field>
+        <field use-when="displayPassword!=null" name="PASSWORD" title="${uiLabelMap.CommonPassword}"><password size="15" maxlength="250"/></field>
+        <field use-when="displayPassword!=null" name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}"><password size="15" maxlength="250"/></field>
+        <field name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="* ${uiLabelMap.PartyCustomerTemporaryPassword}"><text size="30" maxlength="250"/></field>
+        <field name="USER_ADDRESS_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="USER_HOME_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="USER_WORK_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="USER_FAX_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="USER_MOBILE_ALLOW_SOL"><hidden value="Y"/></field>
+        <field name="USER_EMAIL_ALLOW_SOL"><hidden value="Y"/></field>
+    </form>
+    
+    <form name="ViewOrganization" type="single" default-map-name="lookupGroup">
+        <field name="partyId" title="${uiLabelMap.SetupOrganizationPartyId}"><display/></field>
+        <field name="groupName" title="${uiLabelMap.SetupOrganizationName}"><display/></field>
+        <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+    </form>
+    
+    <form name="EditProductStore" type="single" target="updateProductStore" title="" default-map-name="productStore"
+        header-row-style="header-row" default-table-style="basic-table">
+        <alt-target use-when="productStore==null" target="createProductStore"/>
+        
+        <field use-when="productStore!=null" name="productStoreId" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductStore}"><display/></field>
+        <field use-when="productStore==null&amp;&amp;productStoreId==null" name="productStoreId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field>
+        <field use-when="productStore==null&amp;&amp;productStoreId!=null" name="productStoreId" tooltip="${uiLabelMap.CommonCannotBeFound}: [${productStoreId}]"><text size="20" maxlength="20"/></field>
+        
+        <field name="storeName" title="${uiLabelMap.ProductStoreName}"><text size="30" maxlength="60"/></field>
+        <field name="companyName"><hidden value="${partyGroup.groupName}"/></field>
+        <field name="primaryStoreGroupId"><hidden/></field>
+        <field name="title"><hidden/></field>
+        <field name="subtitle"><hidden/></field>
+        <field name="payToPartyId"><hidden value="${partyId}"/></field>
+        <field name="partyId"><hidden value="${partyId}"/></field>
+        <field name="inventoryFacilityId"><hidden value="${parameters.facilityId}"/></field>
+        <field name="visualThemeId"><hidden value="FLAT_GREY"/></field>
+        <field name="manualAuthIsCapture"><hidden value="N"/></field>
+        <field name="prorateShipping"><hidden value="Y"/></field>
+        <field name="prorateTaxes"><hidden value="Y"/></field>
+        <field name="viewCartOnAdd"><hidden value="N"/></field>
+        <field name="autoSaveCart"><hidden value="N"/></field>
+        <field name="autoApproveReviews"><hidden value="N"/></field>
+        <field name="autoInvoiceDigitalItems"><hidden value="Y"/></field>
+        <field name="reqShipAddrForDigItems"><hidden value="Y"/></field>
+        <field name="isDemoStore"><hidden value="Y"/></field>
+        <field name="isImmediatelyFulfilled"><hidden value="N"/></field>
+        <field name="checkInventory"><hidden value="Y"/></field>
+        <field name="requireInventory"><hidden value="N"/></field>
+        <field name="reserveInventory"><hidden value="Y"/></field>
+        <field name="reserveOrderEnumId"><hidden value="INVRO_FIFO_REC"/></field>
+        <field name="balanceResOnOrderCreation"><hidden value="Y"/></field>
+        <field name="oneInventoryFacility"><hidden value="Y"/></field>
+        <field name="requirementMethodEnumId"><hidden/></field>
+        <field name="defaultCurrencyUomId"><hidden/></field>
+        <field name="defaultSalesChannelEnumId"><hidden value="WEB_SALES_CHANNEL"/></field>
+        <field name="allowPassword"><hidden value="Y"/></field>
+        <field name="retryFailedAuths"><hidden value="Y"/></field>
+        <field name="headerApprovedStatus"><hidden value="ORDER_APPROVED"/></field>
+        <field name="itemApprovedStatus"><hidden value="ITEM_APPROVED"/></field>
+        <field name="digitalItemApprovedStatus"><hidden value="ITEM_APPROVED"/></field>
+        <field name="headerDeclinedStatus"><hidden value="ORDER_REJECTED"/></field>
+        <field name="itemDeclinedStatus"><hidden value="ITEM_REJECTED"/></field>
+        <field name="headerCancelStatus"><hidden value="ORDER_CANCELLED"/></field>
+        <field name="itemCancelStatus"><hidden value="ITEM_CANCELLED"/></field>
+        <field name="storeCreditAccountEnumId"><hidden value="FIN_ACCOUNT"/></field>
+        <field name="explodeOrderItems"><hidden value="N"/></field>
+        <field name="checkGcBalance"><hidden value="N"/></field>
+        <field name="usePrimaryEmailUsername"><hidden value="N"/></field>
+        <field name="requireCustomerRole"><hidden value="N"/></field>
+        <field name="showCheckoutGiftOptions"><hidden value="Y"/></field>
+        <field name="selectPaymentTypePerItem"><hidden value="N"/></field>
+        <field name="showPricesWithVatTax"><hidden value="N"/></field>
+        <field name="showTaxIsExempt"><hidden value="Y"/></field>
+        <field name="vatTaxAuthGeoId"><hidden/></field>
+        <field name="vatTaxAuthPartyId"><hidden/></field>
+        <field name="prodSearchExcludeVariants"><hidden value="Y"/></field>
+        <field name="enableDigProdUpload"><hidden value="N"/></field>
+        <field name="digProdUploadCategoryId"><hidden/></field>
+        <field name="autoOrderCcTryExp"><hidden value="Y"/></field>
+        <field name="autoOrderCcTryOtherCards"><hidden value="Y"/></field>
+        <field name="autoOrderCcTryLaterNsf"><hidden value="Y"/></field>
+        <field name="autoApproveInvoice"><hidden value="Y"/></field>
+        <field name="autoApproveOrder"><hidden value="Y"/></field>
+        <field name="shipIfCaptureFails"><hidden value="Y"/></field>
+        <field name="setOwnerUponIssuance"><hidden/></field>
+        <field name="reqReturnInventoryReceive"><hidden value="N"/></field>
+        <field name="addToCartReplaceUpsell"><hidden/></field>
+        <field name="addToCartRemoveIncompat"><hidden/></field>
+        <field name="splitPayPrefPerShpGrp"><hidden/></field>
+        <field name="autoOrderCcTryLaterMax"><hidden/></field>
+        <field name="orderNumberPrefix"><hidden value="WS"/></field>
+        <field name="defaultLocaleString"><hidden value="en_US"/></field>
+        <field name="enableAutoSuggestionList"><hidden/></field>
+        <field name="showOutOfStockProducts"><hidden value="Y"/></field>
+        <field name="authDeclinedMessage"><hidden value="There has been a problem with your method of payment. Please try a different method or call customer service."/></field>
+        <field name="authFraudMessage"><hidden value="Your order has been rejected and your account has been disabled due to fraud."/></field>
+        <field name="authErrorMessage"><hidden value="Problem connecting to payment processor; we will continue to retry and notify you by email."/></field>
+        <field name="defaultPassword"><hidden/></field>
+        <field name="inventoryFacilityLink"><hidden/></field>
+        <field name="paymentList"><hidden value="${paymentList}"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+    </form>
+
+    <form name="EditWebSite" extends="EditWebSite" extends-resource="component://content/webapp/content/website/WebSiteForms.xml">
+        <field use-when="webSite==null&amp;&amp;webSiteId==null" name="webSiteId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field>
+        <field name="partyId"><hidden value="${partyId}"/></field>
+        <field name="httpHost"><hidden/></field>
+        <field name="httpPort"><hidden/></field>
+        <field name="httpsHost"><hidden/></field>
+        <field name="httpsPort"><hidden/></field>
+        <field name="enableHttps"><hidden/></field>
+        <field name="standardContentPrefix"><hidden/></field>
+        <field name="secureContentPrefix"><hidden/></field>
+        <field name="cookieDomain"><hidden/></field>
+        <field name="productStoreId"><hidden/></field>
+        <field name="allowProductStoreChange"><hidden/></field>
+        <field name="siteName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+    </form>
+    
+    <form name="EditProdCatalog" extends="EditProdCatalog" extends-resource="component://product/webapp/catalog/catalog/ProdCatalogForms.xml">
+        <field use-when="prodCatalog==null&amp;&amp;prodCatalogId==null" name="prodCatalogId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field>
+        <field name="catalogName" title="${uiLabelMap.ProductCatalogName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+        <field name="partyId"><hidden value="${partyId}"/></field>
+        <field name="productStoreId"><hidden value="${productStoreId}"/></field>
+        <field name="useQuickAdd"><hidden value="Y"/></field>
+        <field name="styleSheet"><hidden/></field>
+        <field name="headerLogo"><hidden/></field>
+        <field name="contentPathPrefix"><hidden/></field>
+        <field name="templatePathPrefix"><hidden/></field>
+        <field name="viewAllowPermReqd"><hidden value="N"/></field>
+        <field name="purchaseAllowPermReqd"><hidden value="N"/></field>
+    </form>
+    
+    <form name="EditProductCategory" type="single" header-row-style="header-row" default-table-style="basic-table"
+        default-map-name="productCategory" target="updateProductCategory">
+        
+        <alt-target use-when="productCategory==null" target="createProductCategory"/>
+        
+        <field use-when="productCategory!=null" name="productCategoryId" title="${uiLabelMap.ProductProductCategoryId}" tooltip="${uiLabelMap.ProductNotModificationRecrationCategory}."><display/></field>
+        <field use-when="productCategory==null&amp;&amp;productCategoryId==null" name="productCategoryId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field>
+        <field name="partyId"><hidden value="${partyId}"/></field>
+        <field name="prodCatalogId"><hidden value="${prodCatalogId}"/></field>
+        <field name="productCategoryTypeId"><hidden value="CATALOG_CATEGORY"/></field>
+        <field name="categoryName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+        <field name="description" title="${uiLabelMap.ProductProductDescription}"><textarea cols="60" rows="2"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>  
+    
+    <form name="EditProduct" type="single" target="updateProduct" title="" default-map-name="product"
+        header-row-style="header-row" default-table-style="basic-table">
+        <alt-target use-when="product==null" target="createProduct"/>
+        <field use-when="product==null" name="isCreate"><hidden value="true"/></field>
+        
+        <field position="1" use-when="product!=null" name="productId" title="${uiLabelMap.ProductProductId}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProduct}"><display/></field>
+        <field position="1" use-when="product==null&amp;&amp;productId!=null" name="productId" title="${uiLabelMap.ProductProductId}" tooltip="${uiLabelMap.ProductNotFindProductId} [${productId}]"><text size="20" maxlength="20"/></field>
+        <field position="1" use-when="product==null&amp;&amp;productId==null" name="productId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field>
+        
+        <field name="partyId"><hidden value="${partyId}"/></field>
+        <field name="productCategoryId"><hidden value="${productCategoryId}"/></field>
+        <field name="productTypeId"><hidden value="FINISHED_GOOD"/></field>
+        <field name="internalName" title="${uiLabelMap.ProductInternalName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+        <field name="productName" title="${uiLabelMap.ProductProductName}" ><text size="30" maxlength="60"/></field>
+        <field name="description" title="${uiLabelMap.ProductShortDescription}"><text size="60" maxlength="250"/></field>
+        <field name="defaultPrice" title="${uiLabelMap.ProductDefaultPrice}"><text size="8" default-value="${defaultPrice}"/></field>
+        <field name="averageCost" title="${uiLabelMap.ProductAverageCost}"><text size="8" default-value="${averageCost}"/></field>
+        
+        <field name="submitButton" title="${uiLabelMap.ProductUpdateProduct}" use-when="product!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.ProductCreateProduct}" use-when="product==null" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    
+    <form name="ListProduct" type="single" default-map-name="product" odd-row-style="alternate-row" default-table-style="basic-table">
+        <field name="productId"><display/></field>
+        <field name="internalName"><display/></field>
+        <field name="productName"><display/></field>
+        <field name="description"><display/></field>
+    </form>
+    
+    <form name="ListOrganizations" type="list" title="Internal Organizations" list-name="parties"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" view-size="10">
+        <row-actions>
+            <entity-one entity-name="PartyAcctgPreference" value-field="partyAcctgPreference"/>
+            <entity-condition entity-name="PartyRole" list="partyRoles">
+                <condition-list combine="and">
+                    <condition-expr field-name="partyId" operator="equals" from-field="partyId"/>
+                    <condition-expr field-name="roleTypeId" operator="equals" value="ORGANIZATION_ROLE"/>
+                </condition-list>
+            </entity-condition>
+            <set field="partyRole" from-field="partyRoles[0]"/>
+        </row-actions>
+        <field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
+        <field name="setup" title="${uiLabelMap.CommonEmptyHeader}" use-when="partyAcctgPreference==null" widget-style="buttontext">
+            <hyperlink target="addGeneralLedger" description="${uiLabelMap.AccountingSetup}">
+                <parameter param-name="partyId"/>
+            </hyperlink>
+        </field>
+        <field name="setup" title="${uiLabelMap.CommonEmptyHeader}" use-when="partyAcctgPreference!=null" widget-style="buttontext">
+            <hyperlink target="viewprofile" description="${uiLabelMap.AccountingSetup}">
+                <parameter param-name="partyId"/>
+            </hyperlink>
+        </field>
+        <field name="setToComplete" title="${uiLabelMap.CommonEmptyHeader}" use-when="partyRole==null" widget-style="buttontext">
+            <hyperlink target="OrganizationToComplete" description="${uiLabelMap.SetupSetToComplete}">
+                <parameter param-name="partyId"/>
+                <parameter param-name="roleTypeId" value="ORGANIZATION_ROLE"/>
+            </hyperlink>
+        </field>
+    </form>
+    
+    <form name="EditCustomer" extends="EditPerson" extends-resource="component://party/webapp/partymgr/party/PartyForms.xml">
+        <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+            <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+                <parameter param-name="partyId" from-field="parameters.partyId"/>
+            </hyperlink>
+        </field>
+    </form>
+</forms>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml