Author: jacopoc
Date: Mon Sep 17 14:41:15 2007
New Revision: 576594
URL: http://svn.apache.org/viewvc?rev=576594&view=rev
Log:
New screen to lookup customer by name (first/last name or partyGroup).
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=576594&r1=576593&r2=576594&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Mon
Sep 17 14:41:15 2007
@@ -1498,6 +1498,7 @@
<request-map uri="LookupPerson"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupPerson"/></request-map>
<request-map uri="LookupPartyGroup"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupPartyGroup"/></request-map>
<request-map uri="LookupPartyName"><security auth="true"
https="true"/><response name="success" type="view"
value="LookupPartyName"/></request-map>
+ <request-map uri="LookupCustomerName"><security auth="true"
https="true"/><response name="success" type="view"
value="LookupCustomerName"/></request-map>
<request-map uri="LookupProduct"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupProduct"/></request-map>
<request-map uri="LookupProductAndPrice"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupProductAndPrice"/></request-map>
<request-map uri="LookupProductFeature"><security auth="true"
https="true"/><response name="success" type="view"
value="LookupProductFeature"/></request-map>
@@ -1709,6 +1710,7 @@
<view-map name="LookupPerson" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
<view-map name="LookupPartyGroup" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>
<view-map name="LookupPartyName" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
+ <view-map name="LookupCustomerName" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupCustomerName"/>
<view-map name="LookupProduct" type="screen"
page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
<view-map name="LookupProductAndPrice" type="screen"
page="component://product/widget/catalog/LookupScreens.xml#LookupProductAndPrice"/>
<view-map name="LookupProductFeature" type="screen"
page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=576594&r1=576593&r2=576594&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Mon Sep
17 14:41:15 2007
@@ -115,7 +115,7 @@
<td valign='middle'>
<div class='tabletext' valign='top'>
<input type='text' class='inputBox' name='partyId'
value='${thisPartyId?if_exists}'/>
- <a
href="javascript:call_fieldlookup2(document.salesentryform.partyId,'LookupPartyName');">
+ <a
href="javascript:call_fieldlookup2(document.salesentryform.partyId,'LookupCustomerName');">
<img src='/images/fieldlookup.gif' width='15' height='14'
border='0' alt='Click here For Field Lookup'/>
</a>
</div>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml?rev=576594&r1=576593&r2=576594&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml Mon
Sep 17 14:41:15 2007
@@ -56,7 +56,41 @@
<field name="lastName"
title="${uiLabelMap.PartyLastName}"><display/></field>
<field name="groupName"
title="${uiLabelMap.PartyGroupName}"><display/></field>
</form>
-
+
+ <form name="lookupCustomerName" target="LookupCustomerName" type="single">
+ <field name="roleTypeId"><hidden value="CUSTOMER"/></field>
+ <field name="partyId"
title="${uiLabelMap.PartyPartyId}"><text-find/></field>
+ <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="PartyType"/>
+ </drop-down>
+ </field>
+ <field name="firstName"
title="${uiLabelMap.PartyFirstName}"><text-find/></field>
+ <field name="lastName"
title="${uiLabelMap.PartyLastName}"><text-find/></field>
+ <field name="groupName"
title="${uiLabelMap.PartyGroupName}"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit
button-type="button"/></field>
+ </form>
+ <form name="listLookupCustomerName" type="list" list-name="listIt"
+ paginate-target="LookupCustomerName">
+ <actions>
+ <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="orderBy" value="partyId"/>
+ <field-map field-name="entityName"
value="PartyRoleNameDetail"/>
+ </service>
+ </actions>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}"
widget-style="smallSubmit">
+ <hyperlink also-hidden="false" target-type="plain"
description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ </field>
+ <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
+ <display-entity also-hidden="false" entity-name="PartyType"
description="${description}"/>
+ </field>
+ <field name="firstName"
title="${uiLabelMap.PartyFirstName}"><display/></field>
+ <field name="lastName"
title="${uiLabelMap.PartyLastName}"><display/></field>
+ <field name="groupName"
title="${uiLabelMap.PartyGroupName}"><display/></field>
+ </form>
+
<!-- Person Lookup forms -->
<form name="lookupPerson" type="single" target="LookupPerson">
<!--<auto-fields-entity entity-name="Person" default-field-type="find"
/>-->
Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=576594&r1=576593&r2=576594&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml Mon Sep 17
14:41:15 2007
@@ -44,6 +44,30 @@
</widgets>
</section>
</screen>
+ <screen name="LookupCustomerName">
+ <section>
+ <condition>
+ <or>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+ </or>
+ </condition>
+ <actions>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="title"
value="${uiLabelMap.PartyLookupPartyByName}"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <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="20"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="lookupCustomerName"
location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ <include-form name="listLookupCustomerName"
location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="LookupPerson">
<section>
