You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/06/18 08:34:37 UTC
svn commit: r1748932 - in /ofbiz/trunk/applications/order:
template/order/FindOrders.ftl webapp/ordermgr/WEB-INF/controller.xml
Author: deepak
Date: Sat Jun 18 08:34:37 2016
New Revision: 1748932
URL: http://svn.apache.org/viewvc?rev=1748932&view=rev
Log:
(OFBIZ-7302) Applied patch from jira issue
===================================
Add a look-up for Product Id, UserLogin Id and Billing Account in Find Order Screen
===================================
Thanks Pawan Verma for your contribution.
Modified:
ofbiz/trunk/applications/order/template/order/FindOrders.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/order/template/order/FindOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/FindOrders.ftl?rev=1748932&r1=1748931&r2=1748932&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/order/FindOrders.ftl (original)
+++ ofbiz/trunk/applications/order/template/order/FindOrders.ftl Sat Jun 18 08:34:37 2016
@@ -171,7 +171,9 @@ function toggleOrderIdList() {
<tr>
<td width='25%' align='right' class='label'>${uiLabelMap.ProductProductId}</td>
<td width='5%'> </td>
- <td align='left'><input type='text' name='productId' value='${requestParameters.productId!}'/></td>
+ <td align='left'>
+ <@htmlTemplate.lookupField value='${requestParameters.productId!}' formName="lookuporder" name="productId" id="productId" fieldFormName="LookupProduct"/>
+ </td>
</tr>
<#if goodIdentificationTypes?has_content>
<tr>
@@ -236,7 +238,9 @@ function toggleOrderIdList() {
<tr>
<td width='25%' align='right' class='label'>${uiLabelMap.CommonUserLoginId}</td>
<td width='5%'> </td>
- <td align='left'><input type='text' name='userLoginId' value='${requestParameters.userLoginId!}'/></td>
+ <td align='left'>
+ <@htmlTemplate.lookupField value='${requestParameters.userLoginId!}' formName="lookuporder" name="userLoginId" id="userLoginId" fieldFormName="LookupUserLoginAndPartyDetails"/>
+ </td>
</tr>
<tr>
<td width='25%' align='right' class='label'>${uiLabelMap.OrderOrderType}</td>
@@ -257,7 +261,9 @@ function toggleOrderIdList() {
<tr>
<td width='25%' align='right' class='label'>${uiLabelMap.AccountingBillingAccount}</td>
<td width='5%'> </td>
- <td align='left'><input type='text' name='billingAccountId' value='${requestParameters.billingAccountId!}'/></td>
+ <td align='left'>
+ <@htmlTemplate.lookupField value='${requestParameters.billingAccountId!}' formName="lookuporder" name="billingAccountId" id="billingAccountId" fieldFormName="LookupBillingAccount"/>
+ </td>
</tr>
<tr>
<td width='25%' align='right' class='label'>${uiLabelMap.CommonCreatedBy}</td>
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=1748932&r1=1748931&r2=1748932&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Jun 18 08:34:37 2016
@@ -1801,6 +1801,7 @@ under the License.
<request-map uri="LookupBulkAddProducts"><security https="true" auth="true"/><response name="success" type="view" value="LookupBulkAddProducts"/></request-map>
<request-map uri="LookupBulkAddSupplierProducts"><security https="true" auth="true"/><response name="success" type="view" value="LookupBulkAddSupplierProducts"/></request-map>
<request-map uri="LookupAssociatedProducts"><security https="true" auth="true"/><response name="success" type="view" value="LookupAssociatedProducts"/></request-map>
+ <request-map uri="LookupBillingAccount"><security auth="true" https="true"/><response name="success" type="view" value="LookupBillingAccount"/></request-map>
<!-- PDFs -->
<request-map uri="order.pdf"><security https="true" auth="true"/><response name="success" type="view" value="OrderPDF"/></request-map>
@@ -2079,6 +2080,7 @@ under the License.
<view-map name="LookupBulkAddSupplierProducts" type="screen" page="component://order/widget/ordermgr/OrderEntryCartScreens.xml#LookupBulkAddSupplierProducts"/>
<view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
<view-map name="LookupAssociatedProducts" type="screen" page="component://order/widget/ordermgr/OrderEntryCartScreens.xml#LookupAssociatedProducts"/>
+ <view-map name="LookupBillingAccount" page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount" type="screen"/>
<!-- PDFs -->
<view-map name="OrderPDF" type="screenfop" page="component://order/widget/ordermgr/OrderPrintScreens.xml#OrderPDF" content-type="application/pdf" encoding="none"/>
<view-map name="ReturnPDF" type="screenfop" page="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" content-type="application/pdf" encoding="none"/>