svn commit: r525509 - in /ofbiz/trunk/applications/product: config/ script/org/ofbiz/shipment/shipment/ servicedef/ webapp/catalog/WEB-INF/ webapp/catalog/WEB-INF/actions/store/ webapp/catalog/includes/ webapp/catalog/shipping/ webapp/catalog/store/ wi...

[jacopoc]

Author: jacopoc
Date: Wed Apr  4 06:31:08 2007
New Revision: 525509

URL: http://svn.apache.org/viewvc?view=rev&rev=525509
Log:
Refactored the product store shipping screens into two top level screens (grouped together under a new top level menu). Added services to delete ShipmentMethodTypes and CarrierShipmentMethods. Still some work needs to be done in the store->shipping screen.

Added:
    ofbiz/trunk/applications/product/webapp/catalog/shipping/
    ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml   (with props)
    ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl   (with props)
    ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml   (with props)
Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
    ofbiz/trunk/applications/product/servicedef/services_shipment.xml
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreShipSetup.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/catalog/includes/appheader.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
    ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Wed Apr  4 06:31:08 2007
@@ -352,6 +352,7 @@
 ProductCarrier=Carrier
 ProductCarrierServiceCode=Carrier Service Code
 ProductCarrierShipmentMethod=Carrier Shipment Method
+ProductCarrierShipmentMethods=Carrier Shipment Methods
 ProductCarrierStatus=Carrier Status
 ProductCatalog=Catalog
 ProductCatalogAdministrationMainPage=Catalog Administration Main Page
@@ -1206,6 +1207,7 @@
 ProductShipmentManifest=Manifest for Shipment
 ProductShipmentMethod=Shipment Method
 ProductShipmentMethodType=Shipment Method Type
+ProductShipmentMethodTypes=Shipment Method Types
 ProductShipmentNone=None
 ProductShipmentNotFoundId=The Shipment was not found with ID
 ProductShipmentPlan=Shipment Plan
@@ -1219,6 +1221,7 @@
 ProductShipmentUomAbbreviation_WT_kg=kg
 ProductShipments=Shipments
 ProductShipmentsFound=Shipments Found
+ProductShipping=Shipping
 ProductShippingAddress=Shipping Address
 ProductShippingLabel=Shipping Label
 ProductShipToAddress=Ship-To Address

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Wed Apr  4 06:31:08 2007
@@ -1095,6 +1095,10 @@
         <set-nonpk-fields map-name="parameters" value-name="carrierShipmentMethod"/>
         <store-value value-name="carrierShipmentMethod"/>
     </simple-method>
+    <simple-method method-name="deleteCarrierShipmentMethod" short-description="Removes a CarrierShipmentMethod">
+        <entity-one entity-name="CarrierShipmentMethod" value-name="carrierShipmentMethod"/>
+        <remove-value value-name="carrierShipmentMethod"/>
+    </simple-method>
 
     <simple-method method-name="createShipmentMethodType" short-description="Creates a ShipmentMethodType">
         <make-value value-name="shipmentMethodType" entity-name="ShipmentMethodType"/>
@@ -1106,6 +1110,10 @@
         <entity-one entity-name="ShipmentMethodType" value-name="shipmentMethodType"/>
         <set-nonpk-fields map-name="parameters" value-name="shipmentMethodType"/>
         <store-value value-name="shipmentMethodType"/>
+    </simple-method>
+    <simple-method method-name="deleteShipmentMethodType" short-description="Deletes a ShipmentMethodType">
+        <entity-one entity-name="ShipmentMethodType" value-name="shipmentMethodType"/>
+        <remove-value value-name="shipmentMethodType"/>
     </simple-method>
 
     <!-- quick ship entire order in one package per facility & ship group -->

Modified: ofbiz/trunk/applications/product/servicedef/services_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipment.xml?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_shipment.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_shipment.xml Wed Apr  4 06:31:08 2007
@@ -37,6 +37,11 @@
         <auto-attributes entity-name="CarrierShipmentMethod" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="CarrierShipmentMethod" include="nonpk" mode="IN" optional="true"/>
     </service>
+    <service name="deleteCarrierShipmentMethod" engine="simple"
+            location="org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="deleteCarrierShipmentMethod" auth="true">
+        <description>Deletes A CarrierShipmentMethod</description>
+        <auto-attributes entity-name="CarrierShipmentMethod" include="pk" mode="IN" optional="false"/>
+    </service>
     <service name="createShipmentMethodType" engine="simple"
             location="org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="createShipmentMethodType" auth="true">
         <description>Creates A ShipmentMethodType</description>
@@ -48,6 +53,11 @@
         <description>Updates A ShipmentMethodType</description>
         <auto-attributes entity-name="ShipmentMethodType" mode="IN" optional="false"/>
         <override name="sequenceNum" optional="true"/>
+    </service>
+    <service name="deleteShipmentMethodType" engine="simple"
+            location="org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="deleteShipmentMethodType" auth="true">
+        <description>Deletes A ShipmentMethodType</description>
+        <auto-attributes entity-name="ShipmentMethodType" include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="quickShipEntireOrder" engine="simple"

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreShipSetup.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreShipSetup.bsh?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreShipSetup.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreShipSetup.bsh Wed Apr  4 06:31:08 2007
@@ -29,25 +29,3 @@
 
 shipMeth = delegator.findAll("CarrierAndShipmentMethod", UtilMisc.toList("sequenceNumber"));
 context.put("shipmentMethods", shipMeth);
-
-shipMethTypes = delegator.findAll("ShipmentMethodType", UtilMisc.toList("description"));
-context.put("shipmentMethodTypes", shipMethTypes);
-
-roleTypes = delegator.findAll("RoleType", UtilMisc.toList("description"));
-context.put("roleTypes", roleTypes);
-
-editCarrier = request.getParameter("editCarrierShipmentMethodId");
-carrierShipmentMethod = new HashMap();
-if (editCarrier != null) {
-    splitKey = StringUtil.split(editCarrier, "|");
-    Debug.log(splitKey.toString());
-    carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod", UtilMisc.toMap("partyId", splitKey.get(0), "roleTypeId", splitKey.get(1), "shipmentMethodTypeId", splitKey.get(2)));
-}
-context.put("carrierShipmentMethod", carrierShipmentMethod);
-
-editMethod = request.getParameter("editShipmentMethodTypeId");
-shipmentMethodType = new HashMap();
-if (editMethod != null) {
-    shipmentMethodType = delegator.findByPrimaryKey("ShipmentMethodType", UtilMisc.toMap("shipmentMethodTypeId", editMethod));
-}
-context.put("shipmentMethodType", shipmentMethodType);

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?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Wed Apr  4 06:31:08 2007
@@ -1894,51 +1894,23 @@
         <response name="success" type="view" value="EditProductStoreShipSetup"/>
         <response name="error" type="view" value="EditProductStoreShipSetup"/>
     </request-map>
-    <request-map uri="createShipmentMethodType">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createShipmentMethodType"/>
-        <response name="success" type="view" value="EditProductStoreShipSetup"/>
-        <response name="error" type="view" value="EditProductStoreShipSetup"/>
-    </request-map>
-    <request-map uri="updateShipmentMethodType">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateShipmentMethodType"/>
-        <response name="success" type="view" value="EditProductStoreShipSetup"/>
-        <response name="error" type="view" value="EditProductStoreShipSetup"/>
-    </request-map>
-    <request-map uri="createCarrierShipmentMethod">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createCarrierShipmentMethod"/>
-        <response name="success" type="view" value="EditProductStoreShipSetup"/>
-        <response name="error" type="view" value="EditProductStoreShipSetup"/>
-    </request-map>
-    <request-map uri="updateCarrierShipmentMethod">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateCarrierShipmentMethod"/>
-        <response name="success" type="view" value="EditProductStoreShipSetup"/>
-        <response name="error" type="view" value="EditProductStoreShipSetup"/>
-    </request-map>
 
     <!-- ================ QuantityBreak Requests ================= -->
     <request-map uri="ListQuantityBreaks">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ListQuantityBreaks"/>
     </request-map>
-    <request-map uri="EditQuantityBreak">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditQuantityBreak"/>
-    </request-map>
     <request-map uri="createQuantityBreak">
         <security https="true" auth="true"/>
         <event type="service" invoke="createQuantityBreak"/>
         <response name="success" type="view" value="ListQuantityBreaks"/>
-        <response name="error" type="view" value="EditQuantityBreak"/>
+        <response name="error" type="view" value="ListQuantityBreaks"/>
     </request-map>
     <request-map uri="updateQuantityBreak">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateQuantityBreak"/>
         <response name="success" type="view" value="ListQuantityBreaks"/>
-        <response name="error" type="view" value="EditQuantityBreak"/>
+        <response name="error" type="view" value="ListQuantityBreaks"/>
     </request-map>
     <request-map uri="deleteQuantityBreak">
         <security https="true" auth="true"/>
@@ -1947,6 +1919,54 @@
         <response name="error" type="view" value="ListQuantityBreaks"/>
     </request-map>
 
+    <!-- ================ ShipmentMethodType Requests ================= -->
+    <request-map uri="ListShipmentMethodTypes">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ListShipmentMethodTypes"/>
+    </request-map>
+    <request-map uri="createShipmentMethodType">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createShipmentMethodType"/>
+        <response name="success" type="view" value="ListShipmentMethodTypes"/>
+        <response name="error" type="view" value="ListShipmentMethodTypes"/>
+    </request-map>
+    <request-map uri="updateShipmentMethodType">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateShipmentMethodType"/>
+        <response name="success" type="view" value="ListShipmentMethodTypes"/>
+        <response name="error" type="view" value="ListShipmentMethodTypes"/>
+    </request-map>
+    <request-map uri="deleteShipmentMethodType">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteShipmentMethodType"/>
+        <response name="success" type="view" value="ListShipmentMethodTypes"/>
+        <response name="error" type="view" value="ListShipmentMethodTypes"/>
+    </request-map>
+
+    <!-- ================ CarrierShipmentMethod Requests ================= -->
+    <request-map uri="ListCarrierShipmentMethods">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ListCarrierShipmentMethods"/>
+    </request-map>
+    <request-map uri="createCarrierShipmentMethod">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createCarrierShipmentMethod"/>
+        <response name="success" type="view" value="ListCarrierShipmentMethods"/>
+        <response name="error" type="view" value="ListCarrierShipmentMethods"/>
+    </request-map>
+    <request-map uri="updateCarrierShipmentMethod">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateCarrierShipmentMethod"/>
+        <response name="success" type="view" value="ListCarrierShipmentMethods"/>
+        <response name="error" type="view" value="ListCarrierShipmentMethods"/>
+    </request-map>
+    <request-map uri="deleteCarrierShipmentMethod">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteCarrierShipmentMethod"/>
+        <response name="success" type="view" value="ListCarrierShipmentMethods"/>
+        <response name="error" type="view" value="ListCarrierShipmentMethods"/>
+    </request-map>
+
     <!-- ================ ProductStore Survey Requests ================= -->
     <request-map uri="EditProductStoreSurveys">
         <security https="true" auth="true"/>
@@ -2418,8 +2438,9 @@
     
     <view-map name="EditProductWorkEfforts" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductWorkEfforts"/>        
 
-    <view-map name="ListQuantityBreaks" type="screen" page="component://product/widget/catalog/StoreScreens.xml#ListQuantityBreaks"/>
-    <view-map name="EditQuantityBreak" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditQuantityBreak"/>
+    <view-map name="ListQuantityBreaks" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListQuantityBreaks"/>
+    <view-map name="ListShipmentMethodTypes" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListShipmentMethodTypes"/>
+    <view-map name="ListCarrierShipmentMethods" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListCarrierShipmentMethods"/>
 
     <!-- Lookup request mappings -->
     <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/includes/appheader.ftl?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/includes/appheader.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/includes/appheader.ftl Wed Apr  4 06:31:08 2007
@@ -38,7 +38,7 @@
   <div class="col"><a href="<@ofbizUrl>pendingReviews</@ofbizUrl>" class="${selectedLeftClassMap.reviews?default(unselectedLeftClassName)}">${uiLabelMap.ProductReviews}</a></div>
   <div class="col"><a href="<@ofbizUrl>FindProductConfigItems</@ofbizUrl>" class="${selectedLeftClassMap.configs?default(unselectedLeftClassName)}">${uiLabelMap.ProductConfigItems}</a></div>
   <div class="col"><a href="<@ofbizUrl>FindSubscription</@ofbizUrl>" class="${selectedLeftClassMap.Subscription?default(unselectedLeftClassName)}">${uiLabelMap.ProductSubscriptions}</a></div>
-  <div class="col"><a href="<@ofbizUrl>ListQuantityBreaks</@ofbizUrl>" class="${selectedLeftClassMap.ListQuantityBreaks?default(unselectedLeftClassName)}">${uiLabelMap.ProductQuantityBreaks}</a></div>
+  <div class="col"><a href="<@ofbizUrl>ListShipmentMethodTypes</@ofbizUrl>" class="${selectedLeftClassMap.shipping?default(unselectedLeftClassName)}">${uiLabelMap.ProductShipping}</a></div>
 
   <#if userLogin?has_content>
     <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>

Added: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml?view=auto&rev=525509
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml (added)
+++ ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml Wed Apr  4 06:31:08 2007
@@ -0,0 +1,102 @@
+<?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
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+    <!-- QuantityBreak forms -->
+    <form name="ListQuantityBreaks" target="" title="" type="list"  list-name="quantityBreaks"
+        paginate-target="ListQuantityBreaks">
+        <auto-fields-entity entity-name="QuantityBreak" default-field-type="display"/>
+        <field name="quantityBreakId" widget-style="buttontext">
+            <hyperlink target="ListQuantityBreaks?quantityBreakId=${quantityBreakId}" description="${quantityBreakId}" also-hidden="false"/>
+        </field>
+        <field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}"><display-entity also-hidden="false" entity-name="QuantityBreakType"/></field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink target="deleteQuantityBreak?quantityBreakId=${quantityBreakId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+        </field>
+    </form>
+    <form name="EditQuantityBreak" type="single" target="createQuantityBreak" title="" default-map-name="quantityBreak">
+        <alt-target use-when="quantityBreak!=null" target="updateQuantityBreak"/>
+        <auto-fields-entity entity-name="QuantityBreak" default-field-type="edit"/>
+        <field name="quantityBreakId"><hidden/></field>
+        <field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="QuantityBreakType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListShipmentMethodTypes" target="" title="" type="list"  list-name="shipmentMethodTypes"
+        paginate-target="ListQuantityBreaks">
+        <auto-fields-entity entity-name="ShipmentMethodType" default-field-type="display"/>
+        <field name="shipmentMethodTypeId" widget-style="buttontext">
+            <hyperlink target="ListShipmentMethodTypes?shipmentMethodTypeId=${shipmentMethodTypeId}" description="${shipmentMethodTypeId}" also-hidden="false"/>
+        </field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink target="deleteShipmentMethodType?shipmentMethodTypeId=${shipmentMethodTypeId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+        </field>
+    </form>
+    <form name="EditShipmentMethodType" type="single" target="createShipmentMethodType" title="" default-map-name="shipmentMethodType">
+        <alt-target use-when="shipmentMethodType!=null" target="updateShipmentMethodType"/>
+        <auto-fields-service service-name="createShipmentMethodType" default-field-type="edit"/>
+        <field name="shipmentMethodTypeId" use-when="shipmentMethodType!=null"><display/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListCarrierShipmentMethods" target="" title="" type="list"  list-name="carrierShipmentMethods"
+        paginate-target="ListQuantityBreaks">
+        <auto-fields-entity entity-name="CarrierShipmentMethod" default-field-type="display"/>
+        <field name="shipmentMethodTypeId"><display-entity also-hidden="false" entity-name="ShipmentMethodType"/></field>
+        <field name="roleTypeId"><display-entity also-hidden="false" entity-name="RoleType"/></field>
+        <field name="editLink" widget-style="buttontext">
+            <hyperlink target="ListCarrierShipmentMethods?shipmentMethodTypeId=${shipmentMethodTypeId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
+        </field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink target="deleteCarrierShipmentMethod?shipmentMethodTypeId=${shipmentMethodTypeId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+        </field>
+    </form>
+    <form name="EditCarrierShipmentMethod" type="single" target="createCarrierShipmentMethod" title="" default-map-name="carrierShipmentMethod">
+        <alt-target use-when="carrierShipmentMethod!=null" target="updateCarrierShipmentMethod"/>
+        <auto-fields-service service-name="createCarrierShipmentMethod" default-field-type="edit"/>
+        <field name="shipmentMethodTypeId" use-when="carrierShipmentMethod==null">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="ShipmentMethodType" description="${description} [${shipmentMethodTypeId}]">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="shipmentMethodTypeId" use-when="carrierShipmentMethod!=null"><display/></field>
+        <field name="partyId" use-when="carrierShipmentMethod!=null"><display/></field>
+        <field name="partyId" use-when="carrierShipmentMethod==null">
+            <lookup target-form-name="LookupPartyName"/>
+        </field>
+        <field name="roleTypeId" use-when="carrierShipmentMethod!=null"><display/></field>
+        <field name="roleTypeId" use-when="carrierShipmentMethod==null">
+            <drop-down allow-empty="false" no-current-selected-key="CARRIER">
+                <entity-options entity-name="RoleType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="sequenceNumber" tooltip="${uiLabelMap.ProductUsedForDisplayOrdering}"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+</forms>

Propchange: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl?view=auto&rev=525509
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl (added)
+++ ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl Wed Apr  4 06:31:08 2007
@@ -0,0 +1,25 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#assign unselectedClassName = "tabButton">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<div class="tabContainer">
+  <a href="<@ofbizUrl>ListShipmentMethodTypes</@ofbizUrl>" class="${selectedClassMap.ListShipmentMethodTypes?default(unselectedClassName)}">${uiLabelMap.ProductShipmentMethodTypes}</a>
+  <a href="<@ofbizUrl>ListQuantityBreaks</@ofbizUrl>" class="${selectedClassMap.ListQuantityBreaks?default(unselectedClassName)}">${uiLabelMap.ProductQuantityBreaks}</a>
+  <a href="<@ofbizUrl>ListCarrierShipmentMethods</@ofbizUrl>" class="${selectedClassMap.ListCarrierShipmentMethods?default(unselectedClassName)}">${uiLabelMap.ProductCarrierShipmentMethods}</a>
+</div>

Propchange: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl Wed Apr  4 06:31:08 2007
@@ -305,145 +305,3 @@
         </tr>
       </form>
     </table>
-    <br/>
-
-    <div class="head2">${uiLabelMap.ProductShipmentMethodType} :</div>
-    <table cellspacing="2" cellpadding="2">
-      <form name="editmeth" method="post" action="<@ofbizUrl>EditProductStoreShipSetup</@ofbizUrl>">
-        <input type="hidden" name="viewProductStoreId" value="${productStoreId}">
-        <input type="hidden" name="newShipMethod" value="Y">
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.ProductSelectToEdit}</span></td>
-          <td>
-            <select class="selectBox" name="editShipmentMethodTypeId">
-              <#list shipmentMethodTypes as shipmentMethodType>
-                <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.description?default(shipmentMethodType.shipmentMethodTypeId)}</option>
-              </#list>
-            </select>
-            <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonEdit}">
-          </td>
-        </tr>
-      </form>
-      <#if shipmentMethodType?has_content>
-        <#assign webRequest = "/updateShipmentMethodType">
-        <#assign buttonText =uiLabelMap.CommonUpdate>
-      <#else>
-        <#assign webRequest = "/createShipmentMethodType">
-        <#assign buttonText = uiLabelMap.CommonCreate>
-      </#if>
-      <form name="addmeth" method="post" action="<@ofbizUrl>${webRequest}</@ofbizUrl>">
-        <input type="hidden" name="viewProductStoreId" value="${productStoreId}">
-        <input type="hidden" name="newShipMethod" value="Y">
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.ProductShipmentMethodType}</span></td>
-          <td>
-            <#if shipmentMethodType?has_content>
-              <div class="tabletext">${shipmentMethodType.shipmentMethodTypeId}</div>
-              <input type="hidden" name="shipmentMethodTypeId" value="${shipmentMethodType.shipmentMethodTypeId}">
-            <#else>
-              <input type="text" class="inputBox" name="shipmentMethodTypeId" size="20"> *</td>
-            </#if>
-          </td>
-        </tr>
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.ProductDescription}</span></td>
-          <td><input type="text" class="inputBox" name="description" size="30" value="${shipmentMethodType.description?if_exists}"> *</td>
-        </tr>
-        <tr>
-          <td>
-            <input type="submit" class="smallSubmit" value="${buttonText}">
-          </td>
-        </tr>
-      </form>
-    </table>
-
-    <br/>
-
-    <div class="head2">${uiLabelMap.ProductCarrierShipmentMethod} :</div>
-    <table cellspacing="2" cellpadding="2">
-      <form name="editcarr" method="post" action="<@ofbizUrl>EditProductStoreShipSetup</@ofbizUrl>">
-        <input type="hidden" name="viewProductStoreId" value="${productStoreId}">
-        <input type="hidden" name="newShipMethod" value="Y">
-
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.ProductSelectToEdit}</span></td>
-          <td>
-            <select class="selectBox" name="editCarrierShipmentMethodId">
-              <#list shipmentMethods as shipmentMethod>
-                <option value="${shipmentMethod.partyId}|${shipmentMethod.roleTypeId}|${shipmentMethod.shipmentMethodTypeId}">${shipmentMethod.description} (${shipmentMethod.partyId}/${shipmentMethod.roleTypeId})</option>
-              </#list>
-            </select>
-            <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonEdit}">
-          </td>
-        </tr>
-      </form>
-      <#if carrierShipmentMethod?has_content>
-        <#assign webRequest = "/updateCarrierShipmentMethod">
-        <#assign buttonText = uiLabelMap.CommonUpdate>
-      <#else>
-        <#assign webRequest = "/createCarrierShipmentMethod">
-        <#assign buttonText = uiLabelMap.CommonCreate>
-      </#if>
-      <form name="addcarr" method="post" action="<@ofbizUrl>${webRequest}</@ofbizUrl>">
-        <input type="hidden" name="viewProductStoreId" value="${productStoreId}">
-        <input type="hidden" name="newShipMethod" value="Y">
-      
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.ProductShipmentMethod}</span></td>
-          <td>
-            <#if carrierShipmentMethod?has_content>
-              <input type="hidden" name="shipmentMethodTypeId" value="${carrierShipmentMethod.shipmentMethodTypeId}">
-              <div class="tabletext">${carrierShipmentMethod.shipmentMethodTypeId}</div>
-            <#else>
-              <select class="selectBox" name="shipmentMethodTypeId">
-                <#list shipmentMethodTypes as shipmentMethodType>
-                  <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.description?default(shipmentMethodType.shipmentMethodTypeId)}</option>
-                </#list>
-              </select> *
-            </#if>
-          </td>
-        </tr>
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.PartyRoleType}</span></td>
-          <td>
-            <#if carrierShipmentMethod?has_content>
-              <input type="hidden" name="roleTypeId" value="${carrierShipmentMethod.roleTypeId}">
-              <div class="tabletext">${carrierShipmentMethod.roleTypeId}</div>
-            <#else>
-              <select class="selectBox" name="roleTypeId">
-                <#list roleTypes as roleType>
-                  <option value="${roleType.roleTypeId}" <#if roleType.roleTypeId == "CARRIER" && !carrierShipmentMethod?has_content>${uiLabelMap.ProductSelected}</#if>>${roleType.get("description",locale)?default(roleType.roleTypeId)}</option>
-                </#list>
-              </select> *
-            </#if>
-          </td>
-        </tr>
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.PartyParty}</span></td>
-          <td>
-            <#if carrierShipmentMethod?has_content>
-              <input type="hidden" name="partyId" value="${carrierShipmentMethod.partyId}">
-              <div class="tabletext">${carrierShipmentMethod.partyId}</div>
-            <#else>
-              <input type="text" class="inputBox" name="partyId" size="20" value="${carrierShipmentMethod.partyId?if_exists}"> *
-            </#if>
-          </td>
-        </tr>
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.ProductCarrierServiceCode}</span></td>
-          <td><input type="text" class="inputBox" name="carrierServiceCode" size="20" value="${carrierShipmentMethod.carrierServiceCode?if_exists}"></td>
-        </tr>
-        <tr>
-          <td align="right"><span class="tableheadtext">${uiLabelMap.ProductSequence} #</span></td>
-          <td>
-            <input type="text" class="inputBox" name="sequenceNumber" size="5" value="${carrierShipmentMethod.sequenceNumber?if_exists}">
-            <span class="tabletext">${uiLabelMap.ProductUsedForDisplayOrdering}</span>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <input type="submit" class="smallSubmit" value="${buttonText}">
-          </td>
-        </tr>
-      </form>
-    </table>

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Wed Apr  4 06:31:08 2007
@@ -351,33 +351,6 @@
                 description="${uiLabelMap.CommonDelete}" also-hidden="false" target-type="inter-app"/>
         </field>
     </form>
-    <!-- QuantityBreak forms -->
-    <form name="ListQuantityBreaks" target="" title="" type="list"  list-name="quantityBreaks"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="ListQuantityBreaks">
-        <auto-fields-entity entity-name="QuantityBreak" default-field-type="display"/>
-        <field name="quantityBreakId" widget-style="buttontext">
-            <hyperlink target="EditQuantityBreak?quantityBreakId=${quantityBreakId}" description="${quantityBreakId}" also-hidden="false"/>
-        </field>
-        <field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}"><display-entity also-hidden="false" entity-name="QuantityBreakType"/></field>
-        <field name="deleteLink" title="" widget-style="buttontext">
-            <hyperlink target="deleteQuantityBreak?quantityBreakId=${quantityBreakId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
-        </field>
-    </form>
-    <form name="EditQuantityBreak" type="single" target="createQuantityBreak" title="" default-map-name="quantityBreak"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-        <alt-target use-when="quantityBreak!=null" target="updateQuantityBreak"/>
-        <auto-fields-entity entity-name="QuantityBreak" default-field-type="edit"/>
-        <field name="quantityBreakId"><hidden/></field>
-        <field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="QuantityBreakType" description="${description}">
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
     <form name="ListShipmentCostEstimates" target="" title="" type="list"  list-name="estimates"
         paginate-target="EditProductStoreShipmentCostEstimates">
         <auto-fields-entity entity-name="ShipmentCostEstimate" default-field-type="display"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml Wed Apr  4 06:31:08 2007
@@ -179,7 +179,42 @@
             </widgets>
         </section>
     </screen>
-    
+
+    <screen name="CommonShippingDecorator">
+        <section>
+            <actions>
+                <set field="leftbarScreenName" value="leftbar"/>
+                <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
+                <set field="MainColumnStyle" value="leftonly"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for CATALOG, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="CATALOG" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <platform-specific>
+                                    <html><html-template location="component://product/webapp/catalog/shipping/ShippingTabBar.ftl"/></html>
+                                </platform-specific>
+                                <!--<include-menu name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionMenus.xml"/>-->
+                                <container>
+                                    <label style="head1">${uiLabelMap.${labelTitleProperty}}</label>
+                                </container>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="head3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>                    
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="leftbar">
         <section>
             <widgets>

Added: ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml?view=auto&rev=525509
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml (added)
+++ ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml Wed Apr  4 06:31:08 2007
@@ -0,0 +1,115 @@
+<?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
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+
+    <!-- QuantityBreak screens -->
+    <screen name="ListQuantityBreaks">
+       <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListQuantityBreaks"/>
+                <set field="headerItem" value="shipping"/>
+                <set field="tabButtonItem" value="ListQuantityBreaks"/>
+
+                <set field="leftbarScreenName" value="leftbar"/>
+                <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
+                <set field="MainColumnStyle" value="leftonly"/>
+
+                <entity-condition entity-name="QuantityBreak" list-name="quantityBreaks">
+                    <order-by field-name="quantityBreakId"/>
+                </entity-condition>
+                <entity-one entity-name="QuantityBreak" value-name="quantityBreak" auto-field-map="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container>
+                            <label style="head1">${uiLabelMap.ProductQuantityBreaks}</label>
+                        </container>
+                        <include-form name="ListQuantityBreaks" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                        <include-form name="EditQuantityBreak" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+       </section>
+    </screen>
+    <screen name="ListShipmentMethodTypes">
+       <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListShipmentMethodTypes"/>
+                <set field="headerItem" value="shipping"/>
+                <set field="tabButtonItem" value="ListShipmentMethodTypes"/>
+
+                <set field="leftbarScreenName" value="leftbar"/>
+                <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
+                <set field="MainColumnStyle" value="leftonly"/>
+
+                <entity-condition entity-name="ShipmentMethodType" list-name="shipmentMethodTypes">
+                    <order-by field-name="sequenceNum"/>
+                    <order-by field-name="description"/>
+                </entity-condition>
+                <entity-one entity-name="ShipmentMethodType" value-name="shipmentMethodType" auto-field-map="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container>
+                            <label style="head1">${uiLabelMap.ProductShipmentMethodTypes}</label>
+                        </container>
+                        <include-form name="ListShipmentMethodTypes" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                        <include-form name="EditShipmentMethodType" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+       </section>
+    </screen>
+    
+    <screen name="ListCarrierShipmentMethods">
+       <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListCarrierShipmentMethods"/>
+                <set field="headerItem" value="shipping"/>
+                <set field="tabButtonItem" value="ListCarrierShipmentMethods"/>
+
+                <set field="leftbarScreenName" value="leftbar"/>
+                <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
+                <set field="MainColumnStyle" value="leftonly"/>
+
+                <entity-condition entity-name="CarrierShipmentMethod" list-name="carrierShipmentMethods">
+                    <order-by field-name="sequenceNumber"/>
+                </entity-condition>
+                <entity-one entity-name="CarrierShipmentMethod" value-name="carrierShipmentMethod" auto-field-map="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container>
+                            <label style="head1">${uiLabelMap.ProductCarrierShipmentMethods}</label>
+                        </container>
+                        <include-form name="ListCarrierShipmentMethods" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                        <include-form name="EditCarrierShipmentMethod" location="component://product/webapp/catalog/shipping/ShippingForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+       </section>
+    </screen>
+
+</screens>

Propchange: ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?view=diff&rev=525509&r1=525508&r2=525509
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Wed Apr  4 06:31:08 2007
@@ -388,62 +388,4 @@
             </widgets>
        </section>
     </screen>
-
-    <!-- QuantityBreak screens -->
-    <screen name="ListQuantityBreaks">
-       <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleListQuantityBreaks"/>
-                <set field="headerItem" value="ListQuantityBreaks"/>
-
-                <set field="leftbarScreenName" value="leftbar"/>
-                <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
-                <set field="MainColumnStyle" value="leftonly"/>
-
-                <entity-condition entity-name="QuantityBreak" list-name="quantityBreaks">
-                    <order-by field-name="quantityBreakId"/>
-                </entity-condition>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.QuantityBreaks}</label>
-                        </container>
-                        <container>
-                            <link target="EditQuantityBreak" text="${uiLabelMap.CommonNew}" style="buttontext"/>
-                        </container>
-                        <include-form name="ListQuantityBreaks" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-       </section>
-    </screen>
-
-    <screen name="EditQuantityBreak">
-       <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditQuantityBreak"/>
-                <set field="headerItem" value="ListQuantityBreaks"/>
-
-                <set field="leftbarScreenName" value="leftbar"/>
-                <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
-                <set field="MainColumnStyle" value="leftonly"/>
-
-                <!--<set field="quantityBreakId" from-field="parameters.quantityBreakId"/>-->
-                <entity-one entity-name="QuantityBreak" value-name="quantityBreak" auto-field-map="true"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.QuantityBreaks}</label>
-                        </container>
-                        <include-form name="EditQuantityBreak" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-       </section>
-    </screen>
-
 </screens>