svn commit: r1646204 - in /ofbiz/trunk: applications/order/webapp/ordermgr/return/returnItems.ftl framework/common/config/CommonUiLabels.xml

[jleroux]

Author: jleroux
Date: Wed Dec 17 11:38:04 2014
New Revision: 1646204

URL: http://svn.apache.org/r1646204
Log:
Fixes "FTL error message is displayed on Return screen, when clicked on Return 
selected items button" https://issues.apache.org/jira/browse/OFBIZ-5909

This is a trivial error, I don't want to spend too much time on that, user 
should be careful else use the browser back button!

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=1646204&r1=1646203&r2=1646204&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Wed 
Dec 17 11:38:04 2014
@@ -94,7 +94,7 @@ under the License.
     </div>
     <div class="screenlet-body">
 <!-- if we're called with loadOrderItems or createReturn, then orderId would 
exist -->
-<#if !requestParameters.orderId??>
+<#if !requestParameters.orderId?? && returnHeader?has_content>
           <form method="post" 
action="<@ofbizUrl>updateReturnItems</@ofbizUrl>">
           <input type="hidden" name="_useRowSubmit" value="Y" />
         <table cellspacing="0" class="basic-table">
@@ -386,13 +386,14 @@ under the License.
         </form>
         </#if>
 <!-- if no requestParameters.orderId??, then show list of items -->
-<#else>
-        <#assign selectAllFormName = "returnItems"/>
+<#elseif returnHeader?has_content>
         <form name="returnItems" method="post" 
action="<@ofbizUrl>createReturnItems</@ofbizUrl>">
           <input type="hidden" name="returnId" value="${returnId}" />
           <input type="hidden" name="_useRowSubmit" value="Y" />
           <#include "returnItemInc.ftl"/>
         </form>
+<#else>
+  ${uiLabelMap.CommonErrorMessage2} : ${uiLabelMap.CommonPleaseSelect}. 
${uiLabelMap.CommonUseBackButton}
 </#if>
     </div>
 </div>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1646204&r1=1646203&r2=1646204&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Wed Dec 17 11:38:04 
2014
@@ -8291,7 +8291,7 @@
         <value xml:lang="de">Bitte wählen</value>
         <value xml:lang="en">please select</value>
         <value xml:lang="es">Por favor, seleccione</value>
-        <value xml:lang="fr">SVP, séléctionnez</value>
+        <value xml:lang="fr">SVP, sélectionnez</value>
         <value xml:lang="ja">選択してください</value>
         <value xml:lang="pt_BR">Por favor, selecione</value>
         <value xml:lang="ru">Пожалуйста выберите</value>
@@ -11797,6 +11797,10 @@
         <value xml:lang="zh_CN">上传</value>
         <value xml:lang="zh_TW">上傳</value>
     </property>
+    <property key="CommonUseBackButton">
+        <value xml:lang="en">Use the browser Back button for that</value>
+        <value xml:lang="fr">Utilisez le bouton de retour de votre navigateur 
pour cela</value>
+    </property>
     <property key="CommonUsed">
         <value xml:lang="ar">مستعمل</value>
         <value xml:lang="cs">Použito</value>