svn commit: r774621 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml webapp/ordermgr/requirement/RequirementForms.xml widget/ordermgr/Menus.xml widget/ordermgr/RequirementScreens.xml

[jonesde]

Author: jonesde
Date: Thu May 14 02:50:37 2009
New Revision: 774621

URL: http://svn.apache.org/viewvc?rev=774621&view=rev
Log:
A few small changes to use more consistent terminology (supplier instead of vendor) and to have more flexible default options

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml
    ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=774621&r1=774620&r2=774621&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Thu May 14 02:50:37 2009
@@ -1439,15 +1439,6 @@
         <value xml:lang="th">ปรับปรุงคำร้องสินค้า</value>
         <value xml:lang="zh">已批准的产品需求</value>
     </property>
-    <property key="OrderApprovedProductRequirementsByVendor">
-        <value xml:lang="de">Bedarf nach Lieferant bestätigen</value>
-        <value xml:lang="en">Approved Requirements By vendor</value>
-        <value xml:lang="es">Aprobados requisitos por proveedor</value>
-        <value xml:lang="fr">Besoins approuvées par le vendeur</value>
-        <value xml:lang="it">Fabbisogni Per Fornitore Approvati</value>
-        <value xml:lang="ru">Утвержденные вендором требования</value>
-        <value xml:lang="th">ปรับปรุงคำร้องโดยผู้จำหน่าย</value>
-    </property>
     <property key="OrderAuthService">
         <value xml:lang="en">Auth Service</value>
         <value xml:lang="es">Servicio de autentificación</value>
@@ -9848,9 +9839,9 @@
         <value xml:lang="it">Ricerca Fabbisogni Approvati Per Prodotto</value>
         <value xml:lang="th">ค้นหาสินค้าที่ต้องการอนุมัติ</value>
     </property>
-    <property key="PageTitleFindApprovedRequirementsByVendor">
+    <property key="PageTitleFindApprovedRequirementsBySupplier">
         <value xml:lang="de">Genehmigten Bedarf pro Lieferant suchen</value>
-        <value xml:lang="en">Find Approved Requirements By Vendor</value>
+        <value xml:lang="en">Find Approved Requirements By Supplier</value>
         <value xml:lang="es">Encontrar requisitos aprobados por proveedor</value>
         <value xml:lang="fr">Chercher les besoins approuvés par le vendeur</value>
         <value xml:lang="it">Ricerca Fabbisogni Approvati Per Fornitore</value>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=774621&r1=774620&r2=774621&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Thu May 14 02:50:37 2009
@@ -260,7 +260,7 @@
         <field name="showList"><hidden value="Y"/></field>
         <field name="requirementId"><text-find/></field>
         <field name="billToCustomerPartyId">
-            <drop-down allow-empty="false">
+            <drop-down allow-empty="true">
                 <entity-options entity-name="PartyRole" key-field-name="partyId" description="${partyId}">
                     <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
                 </entity-options>
@@ -276,7 +276,7 @@
         </field>
         <field name="unassignedRequirements"><check/></field>
         <field name="facilityId">
-            <drop-down allow-empty="false">
+            <drop-down allow-empty="true">
                 <entity-options entity-name="Facility" description="${facilityId}"/>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml?rev=774621&r1=774620&r2=774621&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml Thu May 14 02:50:37 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -96,7 +96,7 @@
         <menu-item name="ApproveRequirements" title="${uiLabelMap.OrderApproveRequirements}">
             <link target="ApproveRequirements"/>
         </menu-item>
-        <menu-item name="ApprovedProductRequirementsByVendor" title="${uiLabelMap.OrderApprovedProductRequirementsByVendor}">
+        <menu-item name="ApprovedProductRequirementsByVendor" title="${uiLabelMap.PageTitleFindApprovedRequirementsBySupplier}">
             <link target="ApprovedProductRequirementsByVendor"/>
         </menu-item>
         <menu-item name="ApprovedProductRequirements" title="${uiLabelMap.OrderApprovedProductRequirements}">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=774621&r1=774620&r2=774621&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Thu May 14 02:50:37 2009
@@ -238,7 +238,7 @@
     <screen name="ApprovedProductRequirementsByVendor">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleFindApprovedRequirementsByVendor"/>
+                <set field="titleProperty" value="PageTitleFindApprovedRequirementsBySupplier"/>
                 <set field="headerItem" value="requirement"/>
                 <set field="tabButtonItem" value="ApprovedProductRequirementsByVendor"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -251,7 +251,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleFindApprovedRequirementsByVendor}"/>
+                                    <label text="${uiLabelMap.PageTitleFindApprovedRequirementsBySupplier}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">