svn commit: r556383 - in /ofbiz/branches/release4.0/applications: ecommerce/webapp/ecommerce/customer/ ecommerce/webapp/ecommerce/order/ ecommerce/webapp/ecommerce/shoppinglist/ order/webapp/ordermgr/entry/ party/webapp/partymgr/party/ product/webapp/c...

Author: jleroux
Date: Sun Jul 15 02:50:28 2007
New Revision: 556383

URL: http://svn.apache.org/viewvc?view=rev&rev=556383
Log:
Applied fix from trunk for revision: 556382

Modified:
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl
    ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl
    ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl
    ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Sun Jul 15 02:50:28 2007
@@ -212,7 +212,7 @@
       <td width="5">&nbsp;</td>
       <td width="74%">
         <select name="allowSolicitation" class='selectBox'>
-          <#if (((partyContactMechData.allowSolicitation)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+          <#if (((partyContactMechData.allowSolicitation)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
           <#if (((partyContactMechData.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
           <option></option>
           <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Sun Jul 15 02:50:28 2007
@@ -191,7 +191,7 @@
             <div class="form-label">${uiLabelMap.PartyAllowAddressSolicitation}</div>
             <div class="form-field">
                 <select name="CUSTOMER_ADDRESS_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -224,7 +224,7 @@
                 &nbsp;ext&nbsp;<input type="text" class='inputBox' name="CUSTOMER_HOME_EXT" value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}" size="6" maxlength="10">
                 <br/>
                 <select name="CUSTOMER_HOME_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL))!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL))!"" == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL))!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -242,7 +242,7 @@
                 &nbsp;ext&nbsp;<input type="text" class='inputBox' name="CUSTOMER_WORK_EXT" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10">
                 <br/>
                 <select name="CUSTOMER_WORK_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"" == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -259,7 +259,7 @@
                 -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT?if_exists}" size="15" maxlength="15">
                 <br/>
                 <select name="CUSTOMER_FAX_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"" == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -276,7 +276,7 @@
                 -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT?if_exists}" size="15" maxlength="15">
                 <br/>
                 <select name="CUSTOMER_MOBILE_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"" == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -300,7 +300,7 @@
                 <div><input type="text" class='inputBox' name="CUSTOMER_EMAIL" value="${requestParameters.CUSTOMER_EMAIL?if_exists}" size="40" maxlength="255" onchange="changeEmail()" onkeyup="changeEmail()"> *</div>
                 <div>
                     <select name="CUSTOMER_EMAIL_ALLOW_SOL" class='selectBox'>
-                            <#if ((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                            <#if ((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"" == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                             <#if ((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                             <option></option>
                             <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl Sun Jul 15 02:50:28 2007
@@ -84,7 +84,7 @@
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                 <select name="homeSol" class="selectBox">
-                    <#if (((parameters.homeSol?)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((parameters.homeSol?)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((parameters.homeSol?)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -124,7 +124,7 @@
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <select name="emailSol" class="selectBox">
-                    <#if (((parameters.emailSol)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((parameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((parameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl Sun Jul 15 02:50:28 2007
@@ -103,7 +103,7 @@
   <td width="5">&nbsp;</td>
   <td width="74%">
     <select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr?exists>disabled</#if>>
-      <#if ((parameters.allowSolicitation)!"" == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+      <#if ((parameters.allowSolicitation)!"" == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
       <#if ((parameters.allowSolicitatio)!"" == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
       <option></option>
       <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Sun Jul 15 02:50:28 2007
@@ -102,7 +102,7 @@
                 <td><div class="tableheadtext">${uiLabelMap.EcommercePublic}?</div></td>
                 <td>
                   <select name="isPublic" class="selectBox">
-                    <#if (((shoppingList.isPublic)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((shoppingList.isPublic)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((shoppingList.isPublic)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -114,7 +114,7 @@
                 <td><div class="tableheadtext">${uiLabelMap.EcommerceActive}?</div></td>
                 <td>
                   <select name="isActive" class="selectBox">
-                    <#if (((shoppingList.isActive)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((shoppingList.isActive)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((shoppingList.isActive)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl Sun Jul 15 02:50:28 2007
@@ -95,7 +95,7 @@
                   &nbsp;ext&nbsp;<input type="text" class="inputBox" name="homeExt" value="${requestParameters.homeExt?if_exists}" size="6" maxlength="10"/>
                   <BR>
                   <select name="homeSol" class="selectBox">
-                    <#if (((requestParameters.homeSol)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((requestParameters.homeSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -113,7 +113,7 @@
                   &nbsp;ext&nbsp;<input type="text" class="inputBox" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"/>
                   <BR>
                   <select name="workSol" class="selectBox">
-                    <#if (((requestParameters.workSol)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((requestParameters.workSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>
@@ -131,7 +131,7 @@
                   <input type="text" class="inputBox" name="emailAddress" value="" size="60" maxlength="255">
                   <BR>
                   <select name="emailSol" class="selectBox">
-                    <#if (((requestParameters.emailSol)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                    <#if (((requestParameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                     <#if (((requestParameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                     <option></option>
                     <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl Sun Jul 15 02:50:28 2007
@@ -215,7 +215,7 @@
     <td class="label">${uiLabelMap.PartyContactAllowSolicitation}?</td>
     <td>
       <select name="allowSolicitation">
-        <#if (((mechMap.partyContactMech.allowSolicitation)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+        <#if (((mechMap.partyContactMech.allowSolicitation)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
         <#if (((mechMap.partyContactMech.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
         <option></option>
         <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original)
+++ ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl Sun Jul 15 02:50:28 2007
@@ -52,7 +52,7 @@
         <td>
           <div class="tabletext">
             <select name="postedAnonymous" class="selectBox">
-              <#if (((review.postedAnonymous)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+              <#if (((review.postedAnonymous)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
               <#if (((review.postedAnonymous)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
               <option></option>
               <option value="N">${uiLabelMap.CommonN}</option>

Modified: ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl?view=diff&rev=556383&r1=556382&r2=556383
==============================================================================
--- ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl (original)
+++ ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl Sun Jul 15 02:50:28 2007
@@ -96,7 +96,7 @@
           <td><span class="tableheadtext">${uiLabelMap.ApplyToAll} ${uiLabelMap.ProductProducts}</span></td>
           <td>
               <select name="applyToAllProducts" class="smallSelect">
-                  <#if (((editSetting.applyToAllProducts)!"") == "Y")><option value="test">${uiLabelMap.CommonY}</option></#if>
+                  <#if (((editSetting.applyToAllProducts)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
                   <#if (((editSetting.applyToAllProducts)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
                   <option></option>
                   <option value="Y">${uiLabelMap.CommonY}</option>