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 2009/02/20 06:59:05 UTC
svn commit: r746158 - in /ofbiz/trunk/applications: accounting/data/
order/config/ order/webapp/ordermgr/WEB-INF/
order/webapp/ordermgr/WEB-INF/actions/entry/ order/webapp/ordermgr/entry/
order/webapp/ordermgr/entry/cart/ product/config/ product/entity...
Author: hansbak
Date: Fri Feb 20 05:59:03 2009
New Revision: 746158
URL: http://svn.apache.org/viewvc?rev=746158&view=rev
Log:
added supplier lookup, modified the sales/purchase input start screen to look better....should actually be converted to forms...do that next time
Modified:
ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/entitydef/entitymodel.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
Modified: ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml (original)
+++ ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml Fri Feb 20 05:59:03 2009
@@ -25,7 +25,7 @@
<UserLoginSecurityGroup userLoginId="AcctBuyer" groupId="ORDERPURCH" fromDate="2001-05-13 00:00:00"/>
<Party partyId="AcctBigSupplier" partyTypeId="PARTY_GROUP"/>
- <PartyGroup partyId="AcctBigSupplier" groupName="Big Supplier"/>
+ <PartyGroup partyId="AcctBigSupplier" groupName="Acct Big Supplier"/>
<PartyRole partyId="AcctBigSupplier" roleTypeId="SUPPLIER"/>
<Payment paymentId="demo10000" paymentTypeId="CUSTOMER_PAYMENT" paymentMethodTypeId="EFT_ACCOUNT" partyIdFrom="AcctBuyer" partyIdTo="TESTING" statusId="PMNT_NOT_PAID" effectiveDate="2006-04-25 12:56:54.292" amount="190.97" currencyUomId="USD" lastUpdatedStamp="2006-04-25 13:13:27.746" lastUpdatedTxStamp="2006-04-25 13:13:27.711" createdStamp="2006-04-25 12:56:54.292" createdTxStamp="2006-04-25 12:56:54.292"/>
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Feb 20 05:59:03 2009
@@ -8167,6 +8167,9 @@
<value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸§à¸´à¸à¸µà¸à¸²à¸£à¸à¸à¸ªà¹à¸</value>
<value xml:lang="zh">éæ©éè´§æ¹æ³</value>
</property>
+ <property key="OrderSelectSupplier">
+ <value xml:lang="en">Select Supplier</value>
+ </property>
<property key="OrderSelectVariant">
<value xml:lang="de">Variante auswählen</value>
<value xml:lang="en">Select Variant</value>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy Fri Feb 20 05:59:03 2009
@@ -45,7 +45,7 @@
productStores = delegator.findList("ProductStore", null, null, ["storeName"], null, true);
context.productStores = productStores;
-suppliers = delegator.findByAnd("PartyRole", [roleTypeId : "SUPPLIER"]);
+suppliers = delegator.findByAnd("PartyRole", [roleTypeId : "SUPPLIER"], ["partyId"]);
context.suppliers = suppliers;
organizations = delegator.findByAnd("PartyRole", [roleTypeId : "INTERNAL_ORGANIZATIO"]);
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy Fri Feb 20 05:59:03 2009
@@ -33,8 +33,7 @@
context.shoppingCartSize = shoppingCart.size();
context.shoppingCart = shoppingCart;
context.currencyUomId = shoppingCart.getCurrency();
-
-mode = shoppingCart.getOrderType();
+context.orderType = shoppingCart.getOrderType();
// get all the possible gift wrap options
allgiftWraps = delegator.findByAnd("ProductFeature", [productFeatureTypeId : "GIFT_WRAP"], ["defaultSequenceNum"]);
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=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri Feb 20 05:59:03 2009
@@ -1456,6 +1456,7 @@
<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="LookupSupplierProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupSupplierProduct"/></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>
<request-map uri="LookupUserLoginAndPartyDetails"><security https="true" auth="true"/><response name="success" type="view" value="LookupUserLoginAndPartyDetails"/></request-map>
@@ -1637,6 +1638,7 @@
<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="LookupSupplierProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupSupplierProduct"/>
<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"/>
<view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Fri Feb 20 05:59:03 2009
@@ -28,8 +28,8 @@
<td align="right"><div>${uiLabelMap.ProductProductId} :</div></td>
<td><input type="text" size="25" name="add_product_id" value=""/>
<span class='tabletext'>
- <a href="javascript:quicklookup(document.quickaddform.add_product_id)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a>
- <a href="javascript:call_fieldlookup2(document.quickaddform.add_product_id,'<@o...@ofbizUrl>');">
+ <#--a href="javascript:quicklookup(document.quickaddform.add_product_id)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a-->
+ <a href="javascript:call_fieldlookup2(document.quickaddform.add_product_id,'<@ofbizUrl><#if orderType=="PURCHASE_ORDER">LookupSupplierProduct?partyId=${partyId?if_exists}<#e...@ofbizUrl>');">
<img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</span>
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=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Fri Feb 20 05:59:03 2009
@@ -49,7 +49,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom">
<tr>
<td > </td>
- <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.ProductProductStore}</div></td>
+ <td width=300 align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.ProductProductStore}</div></td>
<td > </td>
<td valign='middle'>
<div class='tabletext' valign='top'>
@@ -100,7 +100,7 @@
<td> </td>
<td valign='middle'>
<div class='tabletext' valign='top'>
- <input type="text" name="userLoginId" value="${requestParameters.userLoginId?if_exists}"/>
+ <input type="text" name="userLoginId" value="${parameters.userLogin.userLoginId}"/>
<a href="javascript:call_fieldlookup2(document.salesentryform.userLoginId,'LookupUserLoginAndPartyDetails');">
<img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
</a>
@@ -109,7 +109,7 @@
</tr>
<tr>
<td> </td>
- <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td>
+ <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.OrderCustomer}</div></td>
<td> </td>
<td valign='middle'>
<div class='tabletext' valign='top'>
@@ -151,7 +151,7 @@
</#if>
<tr>
<td> </td>
- <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.OrderOrderEntryInternalOrganization}</div></td>
+ <td width=300 align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.OrderOrderEntryInternalOrganization}</div></td>
<td> </td>
<td valign='middle'>
<div class='tabletext' valign='top'>
@@ -166,31 +166,32 @@
</div>
</td>
</tr>
+ <tr><td colspan="4"> </td></tr>
<tr>
<td> </td>
- <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartySupplier}</div></td>
+ <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td>
<td> </td>
<td valign='middle'>
<div class='tabletext' valign='top'>
- <select name="supplierPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>>
- <option value="">${uiLabelMap.PartyNoSupplier}</option>
- <#list suppliers as supplier>
- <option value="${supplier.partyId}"<#if supplier.partyId == thisPartyId> selected</#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>
- </#list>
- </select>
+ <input type='text' class='inputBox' name='userLoginId' value='${parameters.userLogin.userLoginId}'/>
+ <a href="javascript:call_fieldlookup2(document.poentryform.userLoginId,'LookupUserLoginAndPartyDetails');">
+ <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
+ </a>
</div>
</td>
</tr>
<tr>
<td> </td>
- <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td>
+ <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartySupplier}</div></td>
<td> </td>
<td valign='middle'>
<div class='tabletext' valign='top'>
- <input type='text' class='inputBox' name='userLoginId' value='${requestParameters.userLoginId?if_exists}'/>
- <a href="javascript:call_fieldlookup2(document.poentryform.userLoginId,'LookupUserLoginAndPartyDetails');">
- <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
- </a>
+ <select name="supplierPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>>
+ <option value="">${uiLabelMap.OrderSelectSupplier}</option>
+ <#list suppliers as supplier>
+ <option value="${supplier.partyId}"<#if supplier.partyId == thisPartyId> selected</#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>
+ </#list>
+ </select>
</div>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Fri Feb 20 05:59:03 2009
@@ -5390,6 +5390,9 @@
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸´à¸à¸à¹à¸²à¸à¸±à¹à¸à¸«à¸¡à¸</value>
<value xml:lang="zh">æ¥æ¾èæ产å</value>
</property>
+ <property key="PageTitleLookupSupplierProduct">
+ <value xml:lang="en">Lookup Product for supplier:</value>
+ </property>
<property key="PageTitleNewFacilityContactMech">
<value xml:lang="de">Neuer Einrichtungs-Kontaktmechanismus für ${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="en">New Facility Contact Mechanism for ${facility.facilityName} [${facility.facilityId}]</value>
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Fri Feb 20 05:59:03 2009
@@ -1,4 +1,3 @@
-<?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
@@ -4527,6 +4526,19 @@
<key-map field-name="agreementItemSeqId"/>
</relation>
</entity>
+ <view-entity entity-name="SupplierProductAndProduct"
+ package-name="org.ofbiz.product.supplier"
+ title="Supplier-product and product antityview for purchase order entry">
+ <member-entity entity-alias="SP" entity-name="SupplierProduct"/>
+ <member-entity entity-alias="PR" entity-name="Product"/>
+ <alias-all entity-alias="SP"/>
+ <alias-all entity-alias="PR">
+ <exclude field="productId"/>
+ </alias-all>
+ <view-link entity-alias="SP" rel-entity-alias="PR">
+ <key-map field-name="productId"/>
+ </view-link>
+ </view-entity>
<entity entity-name="SupplierProductFeature"
package-name="org.ofbiz.product.supplier"
title="Supplier-specific product feature information">
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Fri Feb 20 05:59:03 2009
@@ -2473,6 +2473,7 @@
<request-map uri="LookupCommEvent"><security auth="true" https="true"/><response name="success" type="view" value="LookupCommEvent"/></request-map>
<request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
+ <request-map uri="LookupSupplierProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupSupplierProduct"/></request-map>
<request-map uri="LookupVariantProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map>
<request-map uri="LookupVirtualProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVirtualProduct"/></request-map>
<request-map uri="LookupProductCategory"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductCategory"/></request-map>
@@ -2649,6 +2650,7 @@
<view-map name="LookupCommEvent" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupCommEvent"/>
<view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
+ <view-map name="LookupSupplier" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupSupplierProduct"/>
<view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/>
<view-map name="LookupVirtualProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVirtualProduct"/>
<view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/>
Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml Fri Feb 20 05:59:03 2009
@@ -31,7 +31,7 @@
<entity-options entity-name="ProductType" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
- </drop-down>
+ </drop-down>
</field>
<field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}">
<drop-down allow-empty="true">
@@ -40,7 +40,7 @@
</entity-options>
</drop-down>
</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="noConditionFind"><hidden value="Y"/></field>
<!-- NOTE DEJ20070829 not sure why this is here, but it doesn't seem applicable for a general product lookup, also doesn't handle case where isVariant is null <field name="isVariant"><hidden value="N"/></field> -->
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -62,6 +62,38 @@
<hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/>
</field>
</form>
+ <form name="lookupSupplierProduct" target="LookupSupplierProduct" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
+ <field name="brandName" title="${uiLabelMap.ProductBrandName}"><text-find/></field>
+ <field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find default-option="contains"/></field>
+ <field name="productTypeId" title="${uiLabelMap.ProductProductType}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="ProductType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="listLookupSupplierProduct" list-name="listIt" title="" type="list" paginate-target="LookupSupplierProduct"
+ odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="SupplierProductAndProduct"/>
+ <field-map field-name="orderBy" value="productId"/>
+ </service>
+ </actions>
+ <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+ </field>
+ <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
+ <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
+ <field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display-entity entity-name="ProductType"/></field>
+ <field name="supplierProductId"><display/></field>
+ <field name="minimumOrderQuantity"><display/></field>
+ </form>
<form name="lookupVirtualProduct" extends="lookupProduct" default-map-name= "inputFields" target="LookupVirtualProduct" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
@@ -135,6 +167,7 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="ProductAndPriceView"/>
+ <field-map field-name="orderBy" value="productId"/>
</service>
</actions>
<!--
Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=746158&r1=746157&r2=746158&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Fri Feb 20 05:59:03 2009
@@ -181,4 +181,28 @@
</widgets>
</section>
</screen>
+
+ <screen name="LookupSupplierProduct">
+ <section>
+ <condition>
+ <if-service-permission service-name="catalogPermissionCheck" main-action="VIEW"/>
+ </condition>
+ <actions>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <entity-one entity-name="PartyNameView" value-field="pnv"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupSupplierProduct} ${pnv.firstName} ${pnv.middleName} ${pnv.lastName} ${pnv.groupName} [${parameters.partyId}]"/>
+ <set field="queryString" from-field="result.queryString"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="lookupSupplierProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupSupplierProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>