OFBiz › OFBiz - Commits

svn commit: r609782 - in /ofbiz/trunk/applications/product: config/ webapp/catalog/config/ webapp/facility/facility/ webapp/facility/inventory/ webapp/facility/lookup/ webapp/facility/shipment/ widget/facility/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r609782 - in /ofbiz/trunk/applications/product: config/ webapp/catalog/config/ webapp/facility/facility/ webapp/facility/inventory/ webapp/facility/lookup/ webapp/facility/shipment/ widget/facility/

Author: mrisaliti
Date: Mon Jan 7 13:22:09 2008
New Revision: 609782

URL: http://svn.apache.org/viewvc?rev=609782&view=rev
Log:
Facility Groups/Reports forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1556)

Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.properties
ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Mon Jan 7 13:22:09 2008
@@ -204,6 +204,7 @@
PageTitleFindFacility=Find Facility
PageTitleFindFacilityGroup=Find Facility Group
PageTitleFindFacilityInventoryItems=Find Facility Inventory Items
+PageTitleFindFacilityInventoryItemsByProduct=Find Facility Inventory Items by Product
PageTitleFindFacilityLocation=Find Facility Location
PageTitleFindFacilityPhysicalInventory=Find Facility Physical Inventory
PageTitleFindFacilityTransfers=Find Facility Transfers
@@ -2038,4 +2039,10 @@
FormFieldTitle_facilityGroupTypeId=Facility Group Type Id
FormFieldTitle_primaryParentGroupId=Primary Parent Group Id
FormFieldTitle_facilityGroupName=Facility Group Name
-FormFieldTitle_parentFacilityGroupId=Parent Facility Group Id
\ No newline at end of file
+FormFieldTitle_parentFacilityGroupId=Parent Facility Group Id
+FormFieldTitle_locationTypeEnumId=Location Type Enum Id
+FormFieldTitle_areaId=Area Id
+FormFieldTitle_aisleId=Aisle Id
+FormFieldTitle_sectionId=Section Id
+FormFieldTitle_levelId=Level Id
+FormFieldTitle_positionId=Position Id
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Mon Jan 7 13:22:09 2008
@@ -202,6 +202,7 @@
PageTitleFindFacility=Ricerca Stabilimento
PageTitleFindFacilityGroup=Ricerca Gruppo Stabilimento
PageTitleFindFacilityInventoryItems=Ricerca Righe Inventario
+PageTitleFindFacilityInventoryItemsByProduct=Ricerca Righe Inventario per Prodotto
PageTitleFindFacilityLocation=Ricerca Posizione Stabilimento
PageTitleFindFacilityPhysicalInventory=Ricerca Stabilimento Inventario Fisico
PageTitleFindFacilityTransfers=Ricerca Trasferimenti Stabilimento
@@ -2021,4 +2022,10 @@
FormFieldTitle_facilityGroupTypeId=Tipo Gruppo Stabilimento
FormFieldTitle_primaryParentGroupId=Gruppo Primario Padre
FormFieldTitle_facilityGroupName=Nome Gruppo Stabilimento
-FormFieldTitle_parentFacilityGroupId=Gruppo Stabilimento Padre
\ No newline at end of file
+FormFieldTitle_parentFacilityGroupId=Gruppo Stabilimento Padre
+FormFieldTitle_locationTypeEnumId=Tipo Posizione
+FormFieldTitle_areaId=Area
+FormFieldTitle_aisleId=Corridoio
+FormFieldTitle_sectionId=Sezione
+FormFieldTitle_levelId=Livello
+FormFieldTitle_positionId=Posizione
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl Mon Jan 7 13:22:09 2008
@@ -54,7 +54,7 @@

<#if (configOption?has_content)>
<br/>
- <h1>${uiLabelMap.ProductComponents} - <span class="head2">${uiLabelMap.CommonId}: ${configOption.configOptionId?if_exists} - ${configOption.description?if_exists}</h1>
+ <h1>${uiLabelMap.ProductComponents} - ${uiLabelMap.CommonId}: ${configOption.configOptionId?if_exists} - ${configOption.description?if_exists}</h1>
<table cellspacing="0" class="basic-table">
<tr class="header-row">
<td>${uiLabelMap.CommonSequenceNum}</td>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl Mon Jan 7 13:22:09 2008
@@ -179,7 +179,7 @@
<td width="26%" align="right" valign="top">${uiLabelMap.PartyCountry}</td>
<td width="5"> </td>
<td width="74%">
- <select name="countryGeoId" class="selectBox">
+ <select name="countryGeoId">
<option>${(mechMap.postalAddress.countryGeoId)?if_exists}</option>
<option></option>
${screens.render("component://common/widget/CommonScreens.xml#countries")}

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=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Mon Jan 7 13:22:09 2008
@@ -18,7 +18,7 @@
-->

<#if security.hasEntityPermission("FACILITY", "_VIEW", session)>
-<span class="head1">${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span>
+<h1>${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1>
<br/>
<div class="button-bar">
<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" name="EditFacilityForm" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
@@ -59,12 +59,10 @@
<tr>
<td class="label">${uiLabelMap.ProductFacilityOwner}</td>
<td>
- <input type="text" class="inputBox" name="ownerPartyId" value="${facility.ownerPartyId?if_exists}"/>
- <span class="tabletext">
- <a href="javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');">
- <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ <input type="text" name="ownerPartyId" value="${facility.ownerPartyId?if_exists}"/>
+ <a href="javascript:call_fieldlookup2(document.EditFacilityForm.ownerPartyId,'LookupPartyName');">
+ <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
</a>
- </span>
</td>
</tr>
<tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Mon Jan 7 13:22:09 2008
@@ -21,7 +21,7 @@
<h3>${uiLabelMap.PageTitleEditFacilityLocation}</h3>
</div>
<div class="screenlet-body">
- <span class="head1">${uiLabelMap.ProductLocationFor}</span> <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}: ${facilityId?if_exists}]</span>
+ <h1>${uiLabelMap.ProductLocationFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}: ${facilityId?if_exists}]</h1>
<div class="button-bar">
<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
<a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Mon Jan 7 13:22:09 2008
@@ -177,20 +177,20 @@
<set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("inventoryItemId");return new Boolean(!(prev!=null&&prev.equals(inventoryItemId)));}" type="Boolean"/>
</row-actions>

- <field name="inventoryItemId" widget-style="buttontext" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <field name="inventoryItemId" widget-style="buttontext" position="1" use-when="showPosition1">
<hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/>
</field>
- <field name="productId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1" widget-style="buttontext">
+ <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext">
<hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/>
</field>
- <field name="quantityOnHandTotal" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <field name="quantityOnHandTotal" position="1" use-when="showPosition1">
<display description="${quantityOnHandTotal}"/>
</field>
- <field name="availableToPromiseTotal" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <field name="availableToPromiseTotal" position="1" use-when="showPosition1">
<display description="${availableToPromiseTotal}"/>
</field>
- <field name="serialNumber" position="1" use-when="showPosition1" widget-area-style="viewManyTR1"><display/></field>
- <field name="softIdentifier" position="1" use-when="showPosition1" widget-area-style="viewManyTR1"><display/></field>
+ <field name="serialNumber" position="1" use-when="showPosition1"><display/></field>
+ <field name="softIdentifier" position="1" use-when="showPosition1"><display/></field>

<field name="inventoryItemDetailSeqId" position="2"><display/></field>
<field name="effectiveDate" position="2"><display/></field>
@@ -228,7 +228,7 @@
<set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}" type="Boolean"/>
</row-actions>

- <field name="productId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1" widget-style="buttontext">
+ <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext">
<hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/>
</field>

@@ -437,10 +437,10 @@
<form name="FindPhysicalInventory" type="single" target="FindFacilityPhysicalInventory" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="facilityId"><hidden/></field>
- <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="inputBox">
+ <field name="productId" title="${uiLabelMap.ProductProductId}">
<text/>
</field>
- <field name="internalName" title="${uiLabelMap.ProductInternalName}" widget-style="inputBox">
+ <field name="internalName" title="${uiLabelMap.ProductInternalName}">
<text/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
@@ -536,19 +536,19 @@

<field name="inventoryItemGrandTotals"><hidden/></field>
<field name="productId" title="${uiLabelMap.ProductProductId}"><display/></field>
- <field name="quantityOnHand" title="${uiLabelMap.ProductQoh}" widget-area-style="tabletextright"><display/></field>
- <field name="availableToPromise" title="${uiLabelMap.ProductAtp}" widget-area-style="tabletextright"><display/></field>
- <field name="costPrice" title="${uiLabelMap.ProductCostPrice}" widget-area-style="tabletextright"><display/></field>
- <field name="retailPrice" title="${uiLabelMap.ProductRetailPrice}" widget-area-style="tabletextright"><display/></field>
- <field name="totalCostPrice" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductCostPrice}" widget-area-style="tabletextright"><display/></field>
- <field name="totalRetailPrice" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}" widget-area-style="tabletextright"><display/></field>
+ <field name="quantityOnHand" title="${uiLabelMap.ProductQoh}"><display/></field>
+ <field name="availableToPromise" title="${uiLabelMap.ProductAtp}"><display/></field>
+ <field name="costPrice" title="${uiLabelMap.ProductCostPrice}"><display/></field>
+ <field name="retailPrice" title="${uiLabelMap.ProductRetailPrice}"><display/></field>
+ <field name="totalCostPrice" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductCostPrice}"><display/></field>
+ <field name="totalRetailPrice" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}"><display/></field>
</form>
<form name="ListInventoryItemGrandTotals" type="list" list-name="inventoryItemGrandTotals"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="qohGrandTotal" title="${uiLabelMap.ProductQoh} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}" widget-area-style="tabletextright"><display/></field>
- <field name="atpGrandTotal" title="${uiLabelMap.ProductAtp} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}" widget-area-style="tabletextright"><display/></field>
- <field name="totalCostPriceGrandTotal" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductCostPrice}" widget-area-style="tabletextright"><display/></field>
- <field name="totalRetailPriceGrandTotal" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}" widget-area-style="tabletextright"><display/></field>
+ <field name="qohGrandTotal" title="${uiLabelMap.ProductQoh} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}"><display/></field>
+ <field name="atpGrandTotal" title="${uiLabelMap.ProductAtp} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}"><display/></field>
+ <field name="totalCostPriceGrandTotal" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductCostPrice}"><display/></field>
+ <field name="totalRetailPriceGrandTotal" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}"><display/></field>
</form>
<form name="InventoryItemTotalsExport" type="list" list-name="inventoryItemTotals"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">

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=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Mon Jan 7 13:22:09 2008
@@ -17,7 +17,7 @@
under the License.
-->

- <span class="head1">${uiLabelMap.ProductFindLocationsFor}</span> <span class="head2"><#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span>
+ <h1>${uiLabelMap.ProductFindLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1>
<br/>
<div class="button-bar">
<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
@@ -38,11 +38,9 @@
<td class="label">${uiLabelMap.ProductLocationSeqId}</td>
<td>
<input type="text" name="locationSeqId" value="" size="19" maxlength="20">
- <span class="tabletext">
- <a href="javascript:call_fieldlookup2(document.findFacilityLocation.locationSeqId,'LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>');">
- <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
- </a>
- </span>
+ <a href="javascript:call_fieldlookup2(document.findFacilityLocation.locationSeqId,'LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>');">
+ <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+ </a>
</td>
</tr>
<tr>
@@ -76,7 +74,7 @@
<#if foundLocations?exists>
<#-- TODO: Put this in a screenlet - make it look more like the party find screen -->
<br/>
- <span class="head1">${uiLabelMap.CommonFound}: </span><span class="head2"><b>${foundLocations.size()}</b> ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</span>
+ <h1>${uiLabelMap.CommonFound}: ${foundLocations.size()} ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</h1>
<br/>
<table class="basic-table hover-bar" cellspacing="0">
<tr class="header-row">

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Mon Jan 7 13:22:09 2008
@@ -109,7 +109,7 @@
<input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}">
<input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId?if_exists}">
<input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId?if_exists}">
- <input type="text" class="inputBox" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}">
+ <input type="text" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}">
</td>
<td align="right">
<input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Mon Jan 7 13:22:09 2008
@@ -17,7 +17,7 @@
under the License.
-->

-<span class="head1">${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span>
+<h1>${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1>
<div class="button-bar">
<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
<#if facilityId?has_content>

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Mon Jan 7 13:22:09 2008
@@ -104,7 +104,7 @@
<field name="partyId"><ignored/></field>
<field name="generalComments"><ignored/></field>
<field name="inventoryItemId" map-name="inventoryItem"><hidden/></field>
- <field name="varianceReasonId" widget-style="selectBox">
+ <field name="varianceReasonId">
<drop-down>
<entity-options entity-name="VarianceReason" description="${description}">
<entity-order-by field-name="description"/>

Modified: ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml Mon Jan 7 13:22:09 2008
@@ -53,14 +53,14 @@
<form name="lookupFacilityLocation" target="LookupFacilityLocation" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="FacilityLocation" default-field-type="find"/>
- <field name="facilityId" widget-style="selectBox">
+ <field name="facilityId">
<drop-down allow-empty="false">
<entity-options entity-name="Facility" description="${facilityName}" key-field-name="facilityId">
<entity-order-by field-name="facilityName"/>
</entity-options>
</drop-down>
</field>
- <field name="locationTypeEnumId" widget-style="selectBox">
+ <field name="locationTypeEnumId">
<drop-down allow-empty="false">
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="FACLOC_TYPE"/>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Mon Jan 7 13:22:09 2008
@@ -27,7 +27,7 @@
<div class="screenlet-body">
<form name="additemsfromorder" action="<@ofbizUrl>AddItemsFromOrder</@ofbizUrl>">
<input type="hidden" name="shipmentId" value="${shipmentId}"/>
- <div class="tabletext">
+ <div>
<span class="label">${uiLabelMap.ProductOrderId}</span>
<input type="text" size="20" name="orderId" value="${orderId?if_exists}"/>
<span>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl Mon Jan 7 13:22:09 2008
@@ -65,7 +65,7 @@
</td>
<td>
<span class="label">${uiLabelMap.ProductShipmentBoxType}</span>
- <select name="shipmentBoxTypeId" class="selectBox">
+ <select name="shipmentBoxTypeId">
<option value=""> </option>
<#list boxTypes as boxType>
<option value="${boxType.shipmentBoxTypeId}" <#if shipmentPackage.shipmentBoxTypeId?exists && shipmentPackage.shipmentBoxTypeId == boxType.shipmentBoxTypeId>selected</#if>>${boxType.get("description",locale)}</option>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Mon Jan 7 13:22:09 2008
@@ -151,18 +151,16 @@
<ul>
<li class="head3">${uiLabelMap.ProductShipmentsFound}</li>
<#if 0 < shipmentList?size>
- <#if (viewIndex > 1)>
- <li><a href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${paramList}&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li>
+ <#if (shipmentList?size > highIndex)>
+ <li><a class="nav-next" href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${paramList}&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>
<#else>
- <li>${uiLabelMap.CommonPrevious}</li>
- </#if>
- <#if (listSize > 0)>
- <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</li>
+ <li class="disabled">${uiLabelMap.CommonNext}</li>
</#if>
- <#if (listSize > highIndex)>
- <li><a href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${paramList}&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>
+ <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${shipmentList?size}</li>
+ <#if (viewIndex > 1)>
+ <li><a class="nav-previous" href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${paramList}&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li>
<#else>
- <li>${uiLabelMap.CommonNext}</li>
+ <li class="disabled">${uiLabelMap.CommonPrevious}</li>
</#if>
</#if>
</ul>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Mon Jan 7 13:22:09 2008
@@ -24,7 +24,7 @@
</script>

<#if security.hasEntityPermission("FACILITY", "_VIEW", session)>
- <span class="head1">${uiLabelMap.ProductQuickShipOrderFrom}</span><span class='head2'>${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span>
+ <h1>${uiLabelMap.ProductQuickShipOrderFrom} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1>
<div class="button-bar">
<a href="<@ofbizUrl>quickShipOrder?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNextShipment}</a>
<#if shipment?has_content>
@@ -35,7 +35,7 @@
<#if shipment?exists>
<#if 1 < shipmentPackages.size()>
<#-- multiple packages -->
- <div class="tabletext"><font color="red">${uiLabelMap.ProductMorePackageFoundShipment}.</font></div>
+ <div><font color="red">${uiLabelMap.ProductMorePackageFoundShipment}.</font></div>
<#else>
<#-- single package -->
<#assign shipmentPackage = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentPackages))?if_exists>
@@ -44,7 +44,7 @@
<#if (0 < weight?double) && !requestParameters.reweigh?exists>
<#if 1 < shipmentRoutes.size()>
<#-- multiple routes -->
- <div class="tabletext"><font color="red">${uiLabelMap.ProductMoreRouteSegmentFound}.</font></div>
+ <div><font color="red">${uiLabelMap.ProductMoreRouteSegmentFound}.</font></div>
<#elseif !requestParameters.shipmentRouteSegmentId?exists || requestAttributes._ERROR_MESSAGE_?exists>
<form name="routeForm" method="post" action="<@ofbizUrl>setQuickRouteInfo</@ofbizUrl>">
<#assign shipmentRoute = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRoutes))?if_exists>
@@ -56,7 +56,7 @@
<input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRoute.shipmentRouteSegmentId}"/>
<table border="0" cellpadding="2" cellspacing="0">
<tr>
- <td width="20%" align="right"><b>${uiLabelMap.ProductCarrier}</b></td>
+ <td width="20%" align="right"><span class="label">${uiLabelMap.ProductCarrier}</span></td>
<td> </td>
<td width="1%" align="left" nowrap>
<select name="carrierPartyId">
@@ -77,7 +77,7 @@
</td>
</tr>
<tr>
- <td width="20%" align="right"><b>${uiLabelMap.ProductShipMethod}</b></td>
+ <td width="20%" align="right"><span class="label">${uiLabelMap.ProductShipMethod}</span></td>
<td> </td>
<td width="1%" align="left" nowrap>
<select name="shipmentMethodTypeId">
@@ -127,13 +127,13 @@
<input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
<input type="hidden" name="shipmentId" value="${shipmentPackage.shipmentId}"/>
<input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/>
- <table border="0" cellpadding="2" cellspacing="0">
+ <table cellspacing="0" class="basic-table">
<tr>
- <td width="20%" align="right"><b>${uiLabelMap.ProductPackage} ${shipmentPackage.shipmentPackageSeqId} ${uiLabelMap.ProductWeight}</b></td>
+ <td width="20%" align="right"><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackage.shipmentPackageSeqId} ${uiLabelMap.ProductWeight}</td>
<td> </td>
<td width="80%" align="left">
<input type="text" name="weight"> 
- <select name="weightUomId" class="selectBox">
+ <select name="weightUomId">
<#if weightUom?has_content>
<option value="${weightUom.uomId}">${weightUom.get("description",locale)}</option>
<option value="${weightUom.uomId}">---</option>
@@ -181,7 +181,7 @@
<input type="hidden" name="setPackedOnly" value="Y">
<table border='0' cellpadding='2' cellspacing='0'>
<tr>
- <td width="25%" align='right'>${uiLabelMap.ProductOrderNumber}</td>
+ <td width="25%" align='right'><span class="label">${uiLabelMap.ProductOrderNumber}</span></td>
<td width="1"> </td>
<td width="25%">
<input type="text" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId?if_exists}">
@@ -201,4 +201,4 @@
document.selectOrderForm.orderId.focus();
</script>
</#if>
-</#if>
+</#if>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Mon Jan 7 13:22:09 2008
@@ -32,8 +32,14 @@
</script>

<#assign productId = parameters.productId?if_exists/>
- <h3>${uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrder}</h3>
-
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrder}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
<div class="errorMessage">
<#if ! isPurchaseShipment>
<#assign uiLabelWithVar=uiLabelMap.ProductErrorShipmentNotPurchaseShipment?interpret><@uiLabelWithVar/>
@@ -59,15 +65,15 @@

<form name="ReceiveInventoryAgainstPurchaseOrder" action="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder</@ofbizUrl>">
<input type="hidden" name="clearAll" value="Y"/>
- <div class="tabletext">
- ${uiLabelMap.ProductShipmentId} : <input type="text" class='inputBox' size="20" name="shipmentId" value="${shipmentId?if_exists}"/>
- ${uiLabelMap.ProductOrderId} : <input type="text" class='inputBox' size="20" name="purchaseOrderId" value="${orderId?if_exists}"/>
- <span class='tabletext'>
+ <div>
+ <span class="label">${uiLabelMap.ProductShipmentId}</span> <input type="text" size="20" name="shipmentId" value="${shipmentId?if_exists}"/>
+ <span class="label">${uiLabelMap.ProductOrderId}</span> <input type="text" size="20" name="purchaseOrderId" value="${orderId?if_exists}"/>
+ <span>
<a href="javascript:call_fieldlookup2(document.ReceiveInventoryAgainstPurchaseOrder.purchaseOrderId,'LookupOrderHeaderAndShipInfo');">
<img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'>
</a>
</span>
- ${uiLabelMap.ProductOrderShipGroupId} : <input type="text" class='inputBox' size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
+ <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span> <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
<input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/>
</div>
</form>
@@ -77,6 +83,7 @@

<#assign itemsAvailableToReceive = totalAvailableToReceive?default(0) > 0/>
<#if orderItemDatas?exists>
+ <br/>
<#assign rowCount = 0>
<#assign totalReadyToReceive = 0/>
<form action="<@ofbizUrl>issueOrderItemToShipmentAndReceiveAgainstPO?clearAll=Y</@ofbizUrl>" method="post" name="selectAllForm">
@@ -84,26 +91,27 @@
<input type="hidden" name="purchaseOrderId" value="${orderId}"/>
<input type="hidden" name="shipmentId" value="${shipmentId}">
<input type="hidden" name="_useRowSubmit" value="Y"/>
- <table width="100%" cellpadding="2" cellspacing="0" border="1">
- <tr>
- <td><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td>
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td>${uiLabelMap.ProductProduct}</td>

<#-- Must use the uiLabelMap[""] notation since the label key has . in it -->
- <td><div class="tableheadtext">${uiLabelMap["GoodIdentificationType.description.UPCA"]}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.OrderOrder}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.OrderCancelled}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.OrderBackOrdered}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.CommonReceived}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.ProductOpenQuantity}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.ProductBackOrders}</div></td>
+ <td>${uiLabelMap["GoodIdentificationType.description.UPCA"]}</td>
+ <td>${uiLabelMap.OrderOrder}</td>
+ <td>${uiLabelMap.OrderCancelled}</td>
+ <td>${uiLabelMap.OrderBackOrdered}</td>
+ <td>${uiLabelMap.CommonReceived}</td>
+ <td>${uiLabelMap.ProductOpenQuantity}</td>
+ <td>${uiLabelMap.ProductBackOrders}</td>
<#if itemsAvailableToReceive>
- <td><div class="tableheadtext">${uiLabelMap.CommonReceive}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.ProductInventoryItemType}</div></td>
+ <td>${uiLabelMap.CommonReceive}</td>
+ <td>${uiLabelMap.ProductInventoryItemType}</td>
<td colspan="2" align="right">
- <div class="tableheadtext">${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div>
+ <div>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div>
</td>
</#if>
</tr>
+ <#assign alt_row = false>
<#list orderItemDatas?if_exists as orderItemData>
<#assign orderItem = orderItemData.orderItem>
<#assign product = orderItemData.product?if_exists>
@@ -112,11 +120,10 @@
<#assign availableToReceive = orderItemData.availableToReceive?default(0)>
<#assign backOrderedQuantity = orderItemData.backOrderedQuantity?default(0)>
<#assign fulfilledReservations = orderItemData.fulfilledReservations>
-
- <tr>
- <td><div class="tabletext">${(product.internalName)?if_exists} [${orderItem.productId?default("N/A")}]</div></td>
+ <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+ <td>${(product.internalName)?if_exists} [${orderItem.productId?default("N/A")}]</div></td>
<td>
- <div class="tabletext">
+ <div>
<#assign upcaLookup = Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", product.productId, "goodIdentificationTypeId", "UPCA")/>
<#assign upca = delegator.findByPrimaryKeyCache("GoodIdentification", upcaLookup)?if_exists/>
<#if upca?has_content>
@@ -124,31 +131,17 @@
</#if>
</div>
</td>
+ <td>${orderItem.quantity}</td>
+ <td>${orderItem.cancelQuantity?default(0)}</td>
<td>
- <div class="tabletext">
- ${orderItem.quantity}
- </div>
- </td>
- <td>
- <div class="tabletext">
- ${orderItem.cancelQuantity?default(0)}
- </div>
- </td>
- <td>
- <div class="tabletext ${(backOrderedQuantity > 0)?string(" errorMessage","")}">
+ <div ${(backOrderedQuantity > 0)?string(" errorMessage","")}">
${backOrderedQuantity}
</div>
</td>
+ <td>${totalQuantityReceived}</td>
+ <td>${orderItem.quantity - orderItem.cancelQuantity?default(0) - totalQuantityReceived}</td>
<td>
- <div class="tabletext">${totalQuantityReceived}</div>
- </td>
- <td>
- <div class="tabletext">
- ${orderItem.quantity - orderItem.cancelQuantity?default(0) - totalQuantityReceived}
- </div>
- </td>
- <td>
- <div class="tabletext">
+ <div>
<#if fulfilledReservations?has_content>
<#list fulfilledReservations?sort_by("orderId") as fulfilledReservation>
${fulfilledReservation.orderId}<br/>
@@ -177,10 +170,10 @@
<#assign quantityToReceive = 0>
</#if>
<#assign totalReadyToReceive = totalReadyToReceive + quantityToReceive/>
- <input type="text" class='inputBox' size="5" name="quantityAccepted_o_${rowCount}" id="quantityAccepted_o_${rowCount}" value="${quantityToReceive}"/>
+ <input type="text" size="5" name="quantityAccepted_o_${rowCount}" id="quantityAccepted_o_${rowCount}" value="${quantityToReceive}"/>
</td>
<td>
- <select name="inventoryItemTypeId_o_${rowCount}" class="selectBox">
+ <select name="inventoryItemTypeId_o_${rowCount}">
<#list inventoryItemTypes as inventoryItemType>
<option value="${inventoryItemType.inventoryItemTypeId}"
<#if (facility.defaultInventoryItemTypeId?has_content) && (inventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
@@ -199,6 +192,8 @@
<#assign rowCount = rowCount + 1>
</#if>
</tr>
+ <#-- toggle the row color -->
+ <#assign alt_row = !alt_row>
</#list>
<#if itemsAvailableToReceive>
<tr>
@@ -225,13 +220,12 @@
<form name="addProductToReceive" method="post" action="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder</@ofbizUrl>">
<input type="hidden" name="shipmentId" value="${shipmentId}"/>
<input type="hidden" name="purchaseOrderId" value="${orderId}"/>
- <div class="tabletext">
- <span class="tabletext">
- ${uiLabelMap.ProductProductId}/${uiLabelMap.ProductGoodIdentification} <input type="text" class="inputBox" size="20" id="productId" name="productId" value=""/>
+ <div>
+ <span class="label">${uiLabelMap.ProductProductId}/${uiLabelMap.ProductGoodIdentification}</span>
+ <input type="text" size="20" id="productId" name="productId" value=""/>
@
- <input type="text" class="inputBox" name="quantity" size="6" maxlength="6" value="1" tabindex="0"/>
- <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
- </span>
+ <input type="text" name="quantity" size="6" maxlength="6" value="1" tabindex="0"/>
+ <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
</div>
</form>
<script language="javascript">
@@ -239,6 +233,8 @@
</script>
</#if>
</#if>
+ </div>
+</div>
<#elseif parameters.shipmentId?has_content>
<h3>${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId?if_exists}]</h3>
</#if>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl Mon Jan 7 13:22:09 2008
@@ -33,7 +33,7 @@
<li<#if selected="ReceiveInventory"> class="selected"</#if>><a href="<@ofbizUrl>ReceiveInventory?shipmentId=${shipmentId}&facilityId=${shipment.destinationFacilityId?if_exists}<#if shipment.primaryOrderId?exists>&purchaseOrderId=${shipment.primaryOrderId}</#if></@ofbizUrl>">${uiLabelMap.ProductReceiveInventory}</a></li>
</#if>
<#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT' && shipment.destinationFacilityId?exists && shipment.primaryOrderId?exists>
- <li<#if selected="ReceiveInventoryAgainstPurchaseOrder"> class="selected"</#if>><a href="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder?shipmentId=${shipmentId?if_exists}&purchaseOrderId=${shipment.primaryOrderId?if_exists}</@ofbizUrl>">${uiLabelMap.ProductReceiveInventoryAgainstPO}</a></li>
+ <li<#if selected="ProductReceiveInventoryAgainstPO"> class="selected"</#if>><a href="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder?shipmentId=${shipmentId?if_exists}&purchaseOrderId=${shipment.primaryOrderId?if_exists}</@ofbizUrl>">${uiLabelMap.ProductReceiveInventoryAgainstPO}</a></li>
</#if>
<#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='SALES_SHIPMENT'>
<li<#if selected="EditShipmentItems"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductItems}</a></li>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Mon Jan 7 13:22:09 2008
@@ -256,13 +256,26 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="head4">
- <label text="${uiLabelMap.PageTitleEditFacilityInventoryItems}"/>
+ <label text="${uiLabelMap.PageTitleFindFacilityInventoryItems}"/>
</container>
</container>
<container style="screenlet-body">
<section>
<widgets>
<include-form name="SearchInventoryItemsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindFacilityInventoryItems}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
<include-form name="ListFacilityInventoryItems" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
</widgets>
</section>
@@ -375,18 +388,31 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="head4">
- <label text="${uiLabelMap.PageTitleFindFacilityInventoryItems}"/>
+ <label text="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}"/>
</container>
</container>
<container style="screenlet-body">
<section>
<widgets>
<include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
<include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
</widgets>
</section>
</container>
- </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?rev=609782&r1=609781&r2=609782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Mon Jan 7 13:22:09 2008
@@ -25,7 +25,7 @@
<screen name="InventoryReports">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditFacilityInventoryItems"/>
+ <set field="titleProperty" value="CommonReports"/>
<set field="headerItem" value="reports"/>
<set field="tabButtonItem" value="EditFacilityInventoryItems"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
@@ -51,19 +51,43 @@
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <label style="head2" text="${uiLabelMap.ProductInventoryByProduct} ${uiLabelMap.CommonFor} ${facility.facilityName}"/>
+ <label style="head1" text="${uiLabelMap.ProductInventoryByProduct} ${uiLabelMap.CommonFor} ${facility.facilityName}"/>
</container>
<container>
<link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
</container>
-
- <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
- <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
-</screens>
+</screens>
\ No newline at end of file