svn commit: r656347 - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/webapp/ecommerce/order/ order/config/ order/webapp/ordermgr/entry/catalog/ order/webapp/ordermgr/entry/order/ order/webapp/ordermgr/quote/

Wed, 14 May 2008 11:18:35 -0700 

Author: mrisaliti
Date: Wed May 14 11:18:08 2008
New Revision: 656347

URL: http://svn.apache.org/viewvc?rev=656347&view=rev
Log:
First patch applied for clean up labels between order and ecommerce application 
(OFBIZ-1780)

Modified:
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=656347&r1=656346&r2=656347&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Wed May 14 
11:18:08 2008
@@ -1025,68 +1025,89 @@
         <value xml:lang="th">ของคุณ</value>
     </property>
     <property key="EcommerceAccountLogin">
-        <value xml:lang="en">Account Login</value>
-        <value xml:lang="fr">Compte identifiant</value>
+        <value xml:lang="en">Your account login is:</value>
+        <value xml:lang="es">Usuario</value>
+        <value xml:lang="fr">Votre identifiant est :</value>
         <value xml:lang="hi_IN">आपका प्रवेश 
ख़ाता है:</value>
+        <value xml:lang="it">Il tuo utente è :</value>
         <value xml:lang="ja">Your account login is:</value>
-        <value 
xml:lang="th">ชื่อผู้เข้าสู่ระบบ</value>
+        <value xml:lang="nl">Uw loginnaam is:</value>
+        <value xml:lang="ro">Utilizatorul logat este :</value>
+        <value xml:lang="ru">Ваше имя для учетной 
записи:</value>
+        <value 
xml:lang="th">บัญชีของคุณลอกอินเข้าสู่ระบบคือ</value>
+        <value xml:lang="zh">你登录的账户是：</value>
     </property>
     <property key="EcommerceActive">
         <value xml:lang="cs">Váš E-mail</value>
+        <value xml:lang="de">Aktiv</value>
         <value xml:lang="en">Active</value>
+        <value xml:lang="es">Activo</value>
         <value xml:lang="fr">Actif</value>
         <value xml:lang="hi_IN">सक्रिय</value>
+        <value xml:lang="it">Attivo</value>
         <value xml:lang="ja">Active</value>
-        <value xml:lang="th">ปฏิบัติ</value>
-    </property>
-    <property key="EcommerceAddAlltoCart">
-        <value xml:lang="cs">Přidat všechno do košíku</value>
-        <value xml:lang="en">Add All to Cart</value>
-        <value xml:lang="fr">Tout ajouter au panier</value>
-        <value xml:lang="en_GB">Add All to basket</value>
-        <value xml:lang="hi_IN">सभी को टोकरी में 
डालें</value>
-        <value xml:lang="ja">Add All to Cart</value>
-        <value 
xml:lang="th">เพิ่มรายการทั้งหมดลงตะกร้า</value>
-    </property>
-    <property key="EcommerceAddCheckedToCart">
-        <value xml:lang="cs">přidat vybrané do košíku</value>
-        <value xml:lang="en">Add Checked To Cart</value>
-        <value xml:lang="fr">Ajouter la sélection au panier</value>
-        <value xml:lang="en_GB">Add selected to basket</value>
-        <value xml:lang="hi_IN">सही निशान वाले को 
टोकरी में डालें</value>
-        <value xml:lang="ja">Add Checked to Cart</value>
-        <value 
xml:lang="th">เพิ่มรายการที่เลือกลงตะกร้า</value>
+        <value xml:lang="nl">Aktief</value>
+        <value xml:lang="ro">Activ</value>
+        <value xml:lang="ru">Активный</value>
+        <value xml:lang="th">ทำงานอยู่</value>
+        <value xml:lang="zh">有效</value>
     </property>
     <property key="EcommerceAddChildListsToCart">
         <value xml:lang="cs">Přidejte tento seznam a další seznam(-y) do 
košíku</value>
-        <value xml:lang="en">Add Child Lists To Cart</value>
-        <value xml:lang="fr">Ajouter les sous-listes au panier</value>
+        <value xml:lang="de">Fügen Sie diese Liste mit Unterliste(n) zum 
Warenkorb hinzu</value>
+        <value xml:lang="en">Add This List And Child List(s) To Cart</value>
         <value xml:lang="en_GB">Add This List And Child List(s) To 
basket</value>
+        <value xml:lang="es">Añadir listas hijas al carro</value>
+        <value xml:lang="fr">Ajouter la liste et sous liste(s) au 
panier</value>
         <value xml:lang="hi_IN">इस पूरी सूची को 
टोकरी में डालें</value>
+        <value xml:lang="it">Aggiungi Questa Lista e la(e) Lista(e) Figlie al 
Carrello</value>
         <value xml:lang="ja">Add This List And Child List(s) To Cart</value>
-        <value 
xml:lang="th">เพิ่มรายการสินค้าเด็กลงตะกร้า</value>
+        <value xml:lang="nl">Voeg deze (sub)lijsten toe aan de 
winkelwagen</value>
+        <value xml:lang="pt_PT">Adicionar Esta Lista E Sua(s) Derivada(s) Ao 
Cesto</value>
+        <value xml:lang="ro">Adauga Aceasta Lista si Lista(le) Fica(e) in 
Cos</value>
+        <value xml:lang="ru">Добавить этот и 
подчиненный список(ки) в корзину</value>
+        <value 
xml:lang="th">เพิ่มรายการนี้และรายการเด็กลงตระกร้า</value>
+        <value xml:lang="zh">把这个列表及子列表放入购物车</value>
     </property>
     <property key="EcommerceAddListToCart">
         <value xml:lang="cs">Přidat seznam do košíku</value>
+        <value xml:lang="de">Liste zum Warenkorb hinzufügen</value>
         <value xml:lang="en">Add List To Cart</value>
-        <value xml:lang="fr">Ajouter la liste au panier</value>
         <value xml:lang="en_GB">Add List To basket</value>
+        <value xml:lang="es">Añadir lista al carro</value>
+        <value xml:lang="fr">Ajouter la liste au panier</value>
         <value xml:lang="hi_IN">सूची को टोकरी में 
डालें</value>
+        <value xml:lang="it">Aggiungi Lista al Carrello</value>
         <value xml:lang="ja">Add List To Cart</value>
-        <value 
xml:lang="th">เพิ่มรายการลงตะกร้า</value>
+        <value xml:lang="nl">Voeg deze Lijst toe aan de winkelwagen</value>
+        <value xml:lang="pt_PT">Adicionar Lista Ao Cesto</value>
+        <value xml:lang="ro">Adauga Lista la Cos</value>
+        <value xml:lang="ru">Добавить список в 
корзину</value>
+        <value 
xml:lang="th">เพิ่มรายการลงตระกร้า</value>
+        <value xml:lang="zh">把列表放入购物车</value>
     </property>
     <property key="EcommerceAddNewDigitalProduct">
         <value xml:lang="en">Add New Digital Product</value>
         <value xml:lang="fr">Ajouter le nouveau produit numérique</value>
         <value xml:lang="hi_IN">नयी डिजीटल फल 
जोडें</value>
+        <value xml:lang="it">Aggiungi Nuovo Prodotto Digitale</value>
+        <value xml:lang="ro">Adauga Nou Produs Digital</value>
+        <value xml:lang="ru">Добавить новый цифровой 
продукт</value>
         <value 
xml:lang="th">เพิ่มสินค้าดิจิตัลใหม่</value>
+        <value xml:lang="zh">新建数字产品</value>
     </property>
     <property key="EcommerceAddResponseFor">
         <value xml:lang="en">Add Response For</value>
+        <value xml:lang="es">Añadir respuesta para</value>
         <value xml:lang="fr">Ajouter la réponse pour</value>
         <value xml:lang="hi_IN">उत्तर जोडें</value>
+        <value xml:lang="it">Aggiungi risponste per</value>
         <value xml:lang="ja">Add response for</value>
+        <value xml:lang="nl">Voeg antwoord toe aan</value>
+        <value xml:lang="ro">Adauga raspunsuri pentru 
EcommerceAddSelectedtoList=Adauga Selectionat La Lista</value>
+        <value xml:lang="ru">Добавить ответ на</value>
         <value 
xml:lang="th">เพิ่มคำตอบสำหรับ</value>
+        <value xml:lang="zh">新建答案用于</value>
     </property>
     <property key="EcommerceAddSelectedtoList">
         <value xml:lang="cs">Přidat vybrané do seznamu</value>
@@ -1144,6 +1165,12 @@
         <value xml:lang="ja">Always view cart after adding an item</value>
         <value 
xml:lang="th">ดูรายการในตะกร้าหลังจากเพิ่มสินค้าเสมอ</value>
     </property>
+    <property key="EcommerceANew">
+        <value xml:lang="en">a new</value>
+        <value xml:lang="fr">un nouvel</value>
+        <value xml:lang="it">una nuova</value>
+        <value xml:lang="th">ใหม่</value>
+    </property>
     <property key="EcommerceAnonymous">
         <value xml:lang="cs">anonymní</value>
         <value xml:lang="en">Anonymous</value>

Modified: 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=656347&r1=656346&r2=656347&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl 
(original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl 
Wed May 14 11:18:08 2008
@@ -27,7 +27,7 @@
             <#assign numColumns = 8>
             <#if maySelectItems?default("N") == "Y" && roleTypeId?if_exists == 
"PLACING_CUSTOMER">
                 <#assign numColumns = 11>
-                <a 
href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.EcommerceAddAlltoCart}</a><a 
href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.EcommerceAddCheckedToCart}</a><a 
href="<@ofbizUrl>createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>"
 class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
+                <a 
href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a 
href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.OrderAddCheckedToCart}</a><a 
href="<@ofbizUrl>createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>"
 class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
             </#if>
         </div>
         <div class="boxhead">&nbsp; ${uiLabelMap.OrderOrderItems}</div>

Modified: 
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=656347&r1=656346&r2=656347&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl 
(original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl 
Wed May 14 11:18:08 2008
@@ -21,7 +21,7 @@
     <div class="screenlet-header">
         <div class="boxlink">
           <#if maySelectItems?default(false)>
-              <a 
href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.EcommerceAddAlltoCart}</a><a 
href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()"
 class="submenutextright">${uiLabelMap.EcommerceAddCheckedToCart}</a>
+              <a 
href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a 
href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()"
 class="submenutextright">${uiLabelMap.OrderAddCheckedToCart}</a>
           </#if>
         </div>
         <div class="boxhead">&nbsp;${uiLabelMap.OrderReturnItems}</div>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=656347&r1=656346&r2=656347&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Wed May 14 11:18:08 
2008
@@ -196,111 +196,6 @@
         <value xml:lang="en">Added item to order: </value>
         <value xml:lang="fr">Article ajouté à la commande : </value>
     </property>
-    <property key="EcommerceANew">
-        <value xml:lang="en">a new</value>
-        <value xml:lang="fr">un nouvel</value>
-        <value xml:lang="th">ใหม่</value>
-    </property>
-    <property key="EcommerceAccountLogin">
-        <value xml:lang="en">Your account login is:</value>
-        <value xml:lang="es">Usuario</value>
-        <value xml:lang="fr">Votre identifiant est :</value>
-        <value xml:lang="it">Il tuo utente loggato è :</value>
-        <value xml:lang="nl">Uw loginnaam is:</value>
-        <value xml:lang="ro">Utilizatorul logat este :</value>
-        <value xml:lang="ru">Ваше имя для учетной 
записи:</value>
-        <value 
xml:lang="th">บัญชีของคุณลอกอินเข้าสู่ระบบคือ</value>
-        <value xml:lang="zh">你登录的账户是：</value>
-    </property>
-    <property key="EcommerceActive">
-        <value xml:lang="de">Aktiv</value>
-        <value xml:lang="en">Active</value>
-        <value xml:lang="es">Activo</value>
-        <value xml:lang="fr">Actif</value>
-        <value xml:lang="it">Attivo</value>
-        <value xml:lang="nl">Aktief</value>
-        <value xml:lang="ro">Activ</value>
-        <value xml:lang="ru">Активный</value>
-        <value xml:lang="th">ทำงานอยู่</value>
-        <value xml:lang="zh">有效</value>
-    </property>
-    <property key="EcommerceAddAlltoCart">
-        <value xml:lang="de">Alles in den Warenkorb legen</value>
-        <value xml:lang="en">Add All to Cart</value>
-        <value xml:lang="es">Añadir todo al carro</value>
-        <value xml:lang="fr">Ajouter tout au panier</value>
-        <value xml:lang="it">Aggiungi Tutto al Carrello</value>
-        <value xml:lang="nl">Alles aan de winkelwagen toevoegen</value>
-        <value xml:lang="pt_PT">Adicionar Todos ao Cesto</value>
-        <value xml:lang="ro">Adauga Ttotul in Cos</value>
-        <value xml:lang="ru">Добавить в корзину все</value>
-        <value 
xml:lang="th">เพิ่มทั้งหมดลงตระกร้า</value>
-        <value xml:lang="zh">全部放入购物车</value>
-    </property>
-    <property key="EcommerceAddCheckedToCart">
-        <value xml:lang="de">Ausgewählte Artikel in den Warenkorb 
legen</value>
-        <value xml:lang="en">Add Checked to Cart</value>
-        <value xml:lang="es">Añadir selección al carro</value>
-        <value xml:lang="fr">Ajouter ceux cochés au panier</value>
-        <value xml:lang="it">Aggiungi Scelte al Carrello</value>
-        <value xml:lang="nl">Voeg aangevinkt toe aan de winkelwagen</value>
-        <value xml:lang="pt_PT">Adicionar Seleccionados ao Cesto</value>
-        <value xml:lang="ro">Adauga optiuni in Cos</value>
-        <value xml:lang="ru">Добавить в корзину 
отмеченное</value>
-        <value 
xml:lang="th">เช็คเพิ่มในตระกร้า</value>
-        <value xml:lang="zh">把选中的放入购物车</value>
-    </property>
-    <property key="EcommerceAddCheckedtoCart">
-        <value xml:lang="de">Ausgewählte Artikel in den Warenkorb 
legen</value>
-        <value xml:lang="en">Add Checked to Cart</value>
-        <value xml:lang="es">Agregar ítems seleccionados al carro</value>
-        <value 
xml:lang="th">เช็คเพิ่มในตระกร้า</value>
-    </property>
-    <property key="EcommerceAddChildListsToCart">
-        <value xml:lang="de">Fügen Sie diese Liste mit Unterliste(n) zum 
Warenkorb hinzu</value>
-        <value xml:lang="en">Add This List And Child List(s) To Cart</value>
-        <value xml:lang="es">Añadir listas hijas al carro</value>
-        <value xml:lang="fr">Ajouter la liste et sous liste(s) au 
panier</value>
-        <value xml:lang="it">Aggiungi Questa Lista e la(e) Lista(e) Figlie al 
Carrello</value>
-        <value xml:lang="nl">Voeg deze (sub)lijsten toe aan de 
winkelwagen</value>
-        <value xml:lang="pt_PT">Adicionar Esta Lista E Sua(s) Derivada(s) Ao 
Cesto</value>
-        <value xml:lang="ro">Adauga Aceasta Lista si Lista(le) Fica(e) in 
Cos</value>
-        <value xml:lang="ru">Добавить этот и 
подчиненный список(ки) в корзину</value>
-        <value 
xml:lang="th">เพิ่มรายการนี้และรายการเด็กลงตระกร้า</value>
-        <value xml:lang="zh">把这个列表及子列表放入购物车</value>
-    </property>
-    <property key="EcommerceAddListToCart">
-        <value xml:lang="de">Liste zum Warenkorb hinzufügen</value>
-        <value xml:lang="en">Add List To Cart</value>
-        <value xml:lang="es">Añadir lista al carro</value>
-        <value xml:lang="fr">Ajouter la liste au panier</value>
-        <value xml:lang="it">Aggiungi Lista al Carrello</value>
-        <value xml:lang="nl">Voeg deze Lijst toe aan de winkelwagen</value>
-        <value xml:lang="pt_PT">Adicionar Lista Ao Cesto</value>
-        <value xml:lang="ro">Adauga Lista la Cos</value>
-        <value xml:lang="ru">Добавить список в 
корзину</value>
-        <value 
xml:lang="th">เพิ่มรายการลงตระกร้า</value>
-        <value xml:lang="zh">把列表放入购物车</value>
-    </property>
-    <property key="EcommerceAddNewDigitalProduct">
-        <value xml:lang="en">Add New Digital Product</value>
-        <value xml:lang="it">Aggiungi Nuovo Prodotto Digitale</value>
-        <value xml:lang="ro">Adauga Nou Produs Digital</value>
-        <value xml:lang="ru">Добавить новый цифровой 
продукт</value>
-        <value 
xml:lang="th">เพิ่มสินค้าดิจิตอลใหม่</value>
-        <value xml:lang="zh">新建数字产品</value>
-    </property>
-    <property key="EcommerceAddResponseFor">
-        <value xml:lang="en">Add response for</value>
-        <value xml:lang="es">Añadir respuesta para</value>
-        <value xml:lang="fr">Ajoutez une réponse pour</value>
-        <value xml:lang="it">Aggiungi risponste per</value>
-        <value xml:lang="nl">Voeg antwoord toe aan</value>
-        <value xml:lang="ro">Adauga raspunsuri pentru 
EcommerceAddSelectedtoList=Adauga Selectionat La Lista</value>
-        <value xml:lang="ru">Добавить ответ на</value>
-        <value 
xml:lang="th">เพิ่มคำตอบสำหรับ</value>
-        <value xml:lang="zh">新建答案用于</value>
-    </property>
     <property key="EcommerceAddSelectedtoList">
         <value xml:lang="de">Ausgewählte Artikel in Liste aufnehmen</value>
         <value xml:lang="en">Add Selected To List</value>
@@ -4260,6 +4155,40 @@
         <value xml:lang="th">รหัสเว็บไซต์</value>
         <value xml:lang="zh">网站标识</value>
     </property>
+    <property key="OrderAddAllToCart">
+        <value xml:lang="cs">Přidat všechno do košíku</value>
+        <value xml:lang="de">Alles in den Warenkorb legen</value>
+        <value xml:lang="en">Add All to Cart</value>
+        <value xml:lang="en_GB">Add All to basket</value>
+        <value xml:lang="es">Añadir todo al carro</value>
+        <value xml:lang="fr">Ajouter tout au panier</value>
+        <value xml:lang="hi_IN">सभी को टोकरी में 
डालें</value>
+        <value xml:lang="it">Aggiungi Tutto al Carrello</value>
+        <value xml:lang="ja">Add All to Cart</value>
+        <value xml:lang="nl">Alles aan de winkelwagen toevoegen</value>
+        <value xml:lang="pt_PT">Adicionar Todos ao Cesto</value>
+        <value xml:lang="ro">Adauga Ttotul in Cos</value>
+        <value xml:lang="ru">Добавить в корзину все</value>
+        <value 
xml:lang="th">เพิ่มทั้งหมดลงตระกร้า</value>
+        <value xml:lang="zh">全部放入购物车</value>
+    </property>
+    <property key="OrderAddCheckedToCart">
+        <value xml:lang="cs">přidat vybrané do košíku</value>
+        <value xml:lang="de">Ausgewählte Artikel in den Warenkorb 
legen</value>
+        <value xml:lang="en">Add Checked to Cart</value>
+        <value xml:lang="en_GB">Add selected to basket</value>
+        <value xml:lang="es">Añadir selección al carro</value>
+        <value xml:lang="fr">Ajouter ceux cochés au panier</value>
+        <value xml:lang="hi_IN">सही निशान वाले को 
टोकरी में डालें</value>
+        <value xml:lang="it">Aggiungi Scelte al Carrello</value>
+        <value xml:lang="ja">Add Checked to Cart</value>
+        <value xml:lang="nl">Voeg aangevinkt toe aan de winkelwagen</value>
+        <value xml:lang="pt_PT">Adicionar Seleccionados ao Cesto</value>
+        <value xml:lang="ro">Adauga optiuni in Cos</value>
+        <value xml:lang="ru">Добавить в корзину 
отмеченное</value>
+        <value 
xml:lang="th">เช็คเพิ่มในตระกร้า</value>
+        <value xml:lang="zh">把选中的放入购物车</value>
+    </property>
     <property key="OrderAddCode">
         <value xml:lang="de">Code hinzufügen</value>
         <value xml:lang="en">Add Code</value>

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=656347&r1=656346&r2=656347&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl 
Wed May 14 11:18:08 2008
@@ -61,7 +61,7 @@
   <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" 
name="bulkaddform" style='margin: 0;'>
     <input type='hidden' name='category_id' value='${categoryId}'>
     <div class="tabletext" align="right">
-      <a href="javascript:document.bulkaddform.submit()" 
class="buttontext"><span style="white-space: 
nowrap;">${uiLabelMap.EcommerceAddAlltoCart}</span></a>
+      <a href="javascript:document.bulkaddform.submit()" 
class="buttontext"><span style="white-space: 
nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a>
     </div>     
     <table border='1' cellpadding='2' cellspacing='0'>      
       <#list productCategoryMembers as productCategoryMember>
@@ -73,7 +73,7 @@
       </#list> 
     </table>
     <div class="tabletext" align="right">
-      <a href="javascript:document.bulkaddform.submit()" 
class="buttontext"><span style="white-space: 
nowrap;">${uiLabelMap.EcommerceAddAlltoCart}</span></a>
+      <a href="javascript:document.bulkaddform.submit()" 
class="buttontext"><span style="white-space: 
nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a>
     </div>      
   </form>
   </center>

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=656347&r1=656346&r2=656347&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl 
Wed May 14 11:18:08 2008
@@ -21,8 +21,8 @@
     <div class="screenlet-header">
         <div class="boxlink">
             <#if maySelectItems?default(false)>
-                <a 
href="javascript:document.addOrderToCartForm.add_all.value="true";document.addOrderToCartForm.submit()"
 class="lightbuttontext">${uiLabelMap.EcommerceAddAlltoCart}</a>
-                <a 
href="javascript:document.addOrderToCartForm.add_all.value="false";document.addOrderToCartForm.submit()"
 class="lightbuttontext">${uiLabelMap.EcommerceAddCheckedtoCart}</a>
+                <a 
href="javascript:document.addOrderToCartForm.add_all.value="true";document.addOrderToCartForm.submit()"
 class="lightbuttontext">${uiLabelMap.OrderAddAllToCart}</a>
+                <a 
href="javascript:document.addOrderToCartForm.add_all.value="false";document.addOrderToCartForm.submit()"
 class="lightbuttontext">${uiLabelMap.OrderAddCheckedToCart}</a>
             </#if>
         </div>
         <div class="boxhead">&nbsp;${uiLabelMap.OrderOrderItems}</div>

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=656347&r1=656346&r2=656347&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl 
Wed May 14 11:18:08 2008
@@ -20,7 +20,7 @@
     <div class="screenlet-header">
         <div class="boxlink">
             <#if maySelectItems?default("N") == "Y">
-                <a 
href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
 class="buttontext">${uiLabelMap.EcommerceAddAlltoCart}</a>
+                <a 
href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
 class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
             </#if>
         </div>
         <div class="boxhead">&nbsp; ${uiLabelMap.OrderOrderQuoteItems}</div>

Reply via email to