You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bi...@apache.org on 2008/04/18 11:53:33 UTC
svn commit: r649439 - in /ofbiz/trunk/applications:
order/webapp/ordermgr/entry/ order/webapp/ordermgr/entry/cart/
order/webapp/ordermgr/order/ product/webapp/facility/facility/
product/webapp/facility/inventory/ product/webapp/facility/returns/
Author: bibryam
Date: Fri Apr 18 02:53:32 2008
New Revision: 649439
URL: http://svn.apache.org/viewvc?rev=649439&view=rev
Log:
Trivial cleanup.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl Fri Apr 18 02:53:32 2008
@@ -44,6 +44,7 @@
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
</#if>
</#if>
+ </ul>
</div>
<br/>
<div class="screenlet-title-bar">
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=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Fri Apr 18 02:53:32 2008
@@ -30,7 +30,7 @@
<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>');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</span>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl Fri Apr 18 02:53:32 2008
@@ -117,7 +117,6 @@
</select>
</td>
</tr>
- </td>
</table>
</form>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl Fri Apr 18 02:53:32 2008
@@ -48,7 +48,7 @@
<tr>
<td><b>${uiLabelMap.Party}</b>:</td>
<td>
- <a href="${customerDetailLink}${partyId}&${externalKeyParam?if_exists}" target="partymgr" class="buttontext">${partyId}</a>
+ <a href="${customerDetailLink}${partyId}${externalKeyParam?if_exists}" target="partymgr" class="buttontext">${partyId}</a>
<#if partyMap.person?exists>
${partyMap.person.firstName?if_exists} ${partyMap.person.lastName?if_exists}
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Fri Apr 18 02:53:32 2008
@@ -298,7 +298,8 @@
</tr>
</table>
</td>
- </tr>
+ </tr>
+ <tr>
<td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</td>
<td width='5%'> </td>
<td align='left'>
@@ -436,8 +437,8 @@
<#else>
<td width="20%" align="left">${uiLabelMap.CommonStatus}</td>
</#if>
- <td width="20%" align="left">${uiLabelMap.OrderDate}</div></td>
- <td width="5%" align="left">${uiLabelMap.PartyPartyId}</div></td>
+ <td width="20%" align="left">${uiLabelMap.OrderDate}</td>
+ <td width="5%" align="left">${uiLabelMap.PartyPartyId}</td>
<td width="10%"> </td>
</tr>
<#if orderList?has_content>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Fri Apr 18 02:53:32 2008
@@ -53,7 +53,7 @@
</#macro>
<#-- order list -->
-<div id="findOrdersList" class="screenlet">
+<div id="orderLookup" class="screenlet">
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.OrderLookupOrder}</li>
@@ -225,6 +225,5 @@
</div>
</div>
<#else>
-<tr><td>${uiLabelMap.OrderViewPermissionError}</td></tr>
-</#if>
-</table>
\ No newline at end of file
+<h3>${uiLabelMap.OrderViewPermissionError}</h3>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Fri Apr 18 02:53:32 2008
@@ -61,7 +61,7 @@
<td>
<input type="text" name="ownerPartyId" value="${facility.ownerPartyId?if_exists}"/>
<a href="javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Fri Apr 18 02:53:32 2008
@@ -39,7 +39,7 @@
<td>
<input type="text" name="locationSeqId" value="" size="19" maxlength="20">
<a href="javascript:call_fieldlookup2(document.findFacilityLocation.locationSeqId,'LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Fri Apr 18 02:53:32 2008
@@ -175,7 +175,7 @@
<td width="74%">
<input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20">
<a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</td>
</tr>
@@ -226,7 +226,7 @@
<td width="74%">
<input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20">
<a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Fri Apr 18 02:53:32 2008
@@ -188,7 +188,7 @@
<#else>
<input type="text" name="locationSeqId" size="20" maxlength="20"/>
<a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId,'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</#if>
</td>
@@ -387,7 +387,7 @@
<#else>
<input type="text" name="locationSeqId_o_${rowCount}" size="12"/>
<a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</#if>
</td>
@@ -483,7 +483,7 @@
<td width="25%">
<input type="text" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}">
<a href="javascript:call_fieldlookup2(document.selectAllForm.purchaseOrderId,'LookupPurchaseOrderHeaderAndShipInfo');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</td>
<td class="tooltip">${uiLabelMap.ProductLeaveSingleProductReceiving}</td>
Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=649439&r1=649438&r2=649439&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Fri Apr 18 02:53:32 2008
@@ -148,7 +148,7 @@
<input type="text" name="locationSeqId_o_${rowCount}" size="12"/>
<span>
<a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
</span>
</#if>