svn commit: r1857173 - in /ofbiz: ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl

[jleroux]

Author: jleroux
Date: Tue Apr  9 11:49:10 2019
New Revision: 1857173

URL: http://svn.apache.org/viewvc?rev=1857173&view=rev
Log:
Fixed: Error message is displayed while click on create new quotes.
(OFBIZ-10882)

This feature has been removed with OFBIZ-10882, 

This removes the "Create New Quote" link, the redundant "Save" link (there is a 
Save button) and the OrderCreateQuoteFromShoppingList label which was only used 
there

Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml
    
ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl

Modified: 
ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml?rev=1857173&r1=1857172&r2=1857173&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml 
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml Tue 
Apr  9 11:49:10 2019
@@ -3603,25 +3603,6 @@
         <value xml:lang="zh">从请求创建询价</value>
         <value xml:lang="zh-TW">由請求建立報價</value>
     </property>
-    <property key="OrderCreateQuoteFromShoppingList">
-        <value xml:lang="ar">خلق عرض سعر جديد</value>
-        <value xml:lang="de">Neues Angebot erstellen</value>
-        <value xml:lang="de-CH">Neue Offerte erstellen</value>
-        <value xml:lang="en">Create New Quote</value>
-        <value xml:lang="es">Crear presupuesto desde lista de compras</value>
-        <value xml:lang="fr">Créer un nouveau devis</value>
-        <value xml:lang="it">Creare Nuovo Preventivo</value>
-        <value xml:lang="ja">新規見積を作成</value>
-        <value xml:lang="nl">Nieuwe offerte</value>
-        <value xml:lang="pt-BR">Criar nova cotação</value>
-        <value xml:lang="ro">Creare Noua Oferta</value>
-        <value xml:lang="ru">Создать новое 
предложение</value>
-        <value xml:lang="th">สร้างคำร้อง</value>
-        <value xml:lang="vi">Thêm mới Báo giá</value>
-        <value xml:lang="zh">新建询价</value>
-        <value xml:lang="zh-CN">新建报价</value>
-        <value xml:lang="zh-TW">建立報價</value>
-    </property>
     <property key="OrderCreateQuoteWorkEffort">
         <value xml:lang="ar">خلق عرض سعر جديد لجهد عم
ل</value>
         <value xml:lang="de">Neues Angebot für Arbeitsaufwand 
erstellen</value>

Modified: 
ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl?rev=1857173&r1=1857172&r2=1857173&view=diff
==============================================================================
--- 
ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl 
(original)
+++ 
ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl 
Tue Apr  9 11:49:10 2019
@@ -125,8 +125,6 @@ under the License.
   <div class="card-header">
     <strong>${uiLabelMap.EcommerceShoppingListDetail} - 
${shoppingList.listName}</strong>
           <a class="float-right ml-2" 
href='javascript:document.createCustRequestFromShoppingList.submit();'>${uiLabelMap.OrderCreateCustRequestFromShoppingList}</a>
-          <a class="float-right ml-2" 
href='javascript:document.createQuoteFromShoppingList.submit();'>${uiLabelMap.OrderCreateQuoteFromShoppingList}</a>
-          <a href="javascript:document.updateList.submit();" 
class="float-right ml-2">${uiLabelMap.CommonSave}</a>
   </div>
     <div class="card-body">
       <form name= "createCustRequestFromShoppingList" method= "post" action= 
"<@ofbizUrl>createCustRequestFromShoppingList</@ofbizUrl>">