svn commit: r549403 - in /ofbiz/trunk: LICENSE applications/product/webapp/facility/WEB-INF/controller.xml applications/product/webapp/facility/shipment/ShipmentForms.xml

[jonesde]

Author: jonesde
Date: Wed Jun 20 23:12:12 2007
New Revision: 549403

URL: http://svn.apache.org/viewvc?view=rev&rev=549403
Log:
Added LICENSE section for OAGIS XSD files in specialpurpose/oagis; thanks to Anil Patel for seeding this

Modified:
    ofbiz/trunk/LICENSE
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?view=diff&rev=549403&r1=549402&r2=549403
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Wed Jun 20 23:12:12 2007
@@ -2212,4 +2212,56 @@
 About us: Our company provides offshore IT consulting services.
     Contact us at [hidden email] if you have any programming task you
     want to be handled by professionals. Our typical hourly rate is $20.
+
 =========================================================================
+Apache OFBiz includes the XML Schema files from the Open Applications Group, Inc
+NOTE: these files and the license are for an older version of the OAGIS
+specification, namely version 7.2.1.
+ofbiz/specialpurpose/oagis/dtd/002_confirm_bod_004.xsd
+ofbiz/specialpurpose/oagis/dtd/068_sync_inventory_005.xsd
+ofbiz/specialpurpose/oagis/dtd/161_show_shipment_005.xsd
+ofbiz/specialpurpose/oagis/dtd/161B_process_shipment_001.xsd
+ofbiz/specialpurpose/oagis/dtd/196_acknowledge_delivery_001.xsd
+ofbiz/specialpurpose/oagis/dtd/197_receive_delivery_001.xsd
+ofbiz/specialpurpose/oagis/dtd/oagis_fields.xsd
+ofbiz/specialpurpose/oagis/dtd/oagis_segments.xsd
+Open Applications Group Xml Schema is licensed as follows:
+=========================================================================
+Copyright (c) 1998-2001 Open Applications Group, Inc. All Rights Reserved
+
+Documents and resource files on the Open Applications Group, Inc. Internet site are
+provided under the following license.  By obtaining, using, and/or copying this file,
+or any related file obtained from this site, you agree that you have read, understood,
+and will comply with the following terms and conditions:
+
+Permissions to use, copy, and distribute the contents of this file, in any medium
+for any purpose and without fee or royalty is hereby granted, provided that you
+include the following on ALL copies of the file that you use:
+
+1. A reference to the original Open Applications Group resource
+2. A notice of the form "Copyright (c) Open Applications Group. All Rights Reserved
+
+When space permits, inclusion of the full text of this NOTICE should be provided.  
+Attribution is requested to be provided in any software, documentation, or other items
+or products that you create related to the implementation of the contents of this file.
+
+THIS RESOURCE IS PROVIDED AS IS, AND THE COPYRIGHT HOLDER MAKES NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT
+THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION
+OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
+OTHER RIGHTS.
+THE COPYRIGHT HOLDER WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR
+IMPLEMENTATION OF THE CONTENTS THEREOF.
+
+The name and trademarks of copyright holder may NOT be used in advertising or publicity
+pertaining to this file or its contents without specific, written prior permission.
+
+Title to copyright in this document will at all times remain with copyright holders.
+
+Please Note: This file is a work in process, and may be modified or enhanced, at the
+discretion of the Open Applications Group without notice, at any time.
+Please contact the Open Applications Group at www.openapplications.org with any
+questions or comments regarding the usage of this material.
+===============================================================================

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diff&rev=549403&r1=549402&r2=549403
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Wed Jun 20 23:12:12 2007
@@ -96,37 +96,6 @@
         <response name="success" type="view" value="main"/>
     </request-map>
 
-    <!-- ================ Lookup Requests ================= -->
-    <request-map uri="LookupOrderHeaderAndShipInfo">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="LookupOrderHeaderAndShipInfo"/>
-    </request-map>
-    <request-map uri="LookupPurchaseOrderHeaderAndShipInfo">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="LookupPurchaseOrderHeaderAndShipInfo"/>
-    </request-map>
-    <request-map uri="LookupProduct">
-        <security auth="true" https="true"/>
-        <response name="success" type="view" value="LookupProduct"/>
-    </request-map>
-    <request-map uri="LookupVariantProduct">
-        <security auth="true" https="true"/>
-        <response name="success" type="view" value="LookupVariantProduct"/>
-    </request-map>
-    <request-map uri="LookupProductCategory">
-        <security auth="true" https="true"/>
-        <response name="success" type="view" value="LookupProductCategory"/>
-    </request-map>
-    <request-map uri="LookupFacilityLocation">
-        <security auth="true" https="true"/>
-        <response name="success" type="view" value="LookupFacilityLocation"/>
-    </request-map>
-
-    <request-map uri="LookupPartyName">
-       <security https="true" auth="true"/>
-        <response name="success" type="view" value="LookupPartyName"/>
-    </request-map>
-
     <!-- ================ Facility Requests ================= -->
     <request-map uri="FindFacility">
         <security https="true" auth="true"/>
@@ -1142,6 +1111,17 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="InventoryReports"/>
     </request-map>
+
+    <!-- ================ Lookup Requests ================= -->
+    <request-map uri="LookupOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeaderAndShipInfo"/></request-map>
+    <request-map uri="LookupPurchaseOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupPurchaseOrderHeaderAndShipInfo"/></request-map>
+    <request-map uri="LookupOrderHeader"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeader"/></request-map>
+    <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
+    <request-map uri="LookupVariantProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map>
+    <request-map uri="LookupProductCategory"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductCategory"/></request-map>
+    <request-map uri="LookupFacilityLocation"><security auth="true" https="true"/><response name="success" type="view" value="LookupFacilityLocation"/></request-map>
+    <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
+    
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
@@ -1149,14 +1129,6 @@
     <view-map name="main" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacility"/>
     <view-map name="login" type="screen" page="component://product/widget/facility/CommonScreens.xml#login"/>
 
-    <view-map name="LookupOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeaderAndShipInfo"/>
-    <view-map name="LookupPurchaseOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupPurchaseOrderHeaderAndShipInfo"/>
-    <view-map name="LookupProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct" type="screen"/>
-    <view-map name="LookupVariantProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct" type="screen"/>
-    <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/>
-    <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/>
-    <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
-
     <view-map name="FindFacility" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacility"/>
     <view-map name="EditFacility" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacility"/>
     <view-map name="FindFacilityTransfers" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacilityTransfers"/>
@@ -1220,5 +1192,15 @@
     <view-map name="QuickShipOrder" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#QuickShipOrder"/>
     
     <view-map name="InventoryReports" type="screen" page="component://product/widget/facility/ReportScreens.xml#InventoryReports"/>
+
+    <view-map name="LookupOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeaderAndShipInfo"/>
+    <view-map name="LookupPurchaseOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupPurchaseOrderHeaderAndShipInfo"/>
+    <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/>
+    <view-map name="LookupProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct" type="screen"/>
+    <view-map name="LookupVariantProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct" type="screen"/>
+    <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/>
+    <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/>
+    <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
+
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml?view=diff&rev=549403&r1=549402&r2=549403
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Wed Jun 20 23:12:12 2007
@@ -51,7 +51,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="primaryOrderId" title="${uiLabelMap.ProductPrimaryOrderId}"><text/></field>
+        <field name="primaryOrderId" title="${uiLabelMap.ProductPrimaryOrderId}"><lookup target-form-name="LookupOrderHeader"/></field>
         <field name="primaryShipGroupSeqId" title="${uiLabelMap.ProductPrimaryShipGroupSeqId}"><text/></field>
         <field name="estimatedReadyDate" title="${uiLabelMap.ProductEstimatedReadyDate}"><date-time/></field>
         <field name="estimatedShipDate" title="${uiLabelMap.ProductEstimatedShipDate}"><date-time/></field>