You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/11/16 17:52:47 UTC
svn commit: r718059 - in /ofbiz/trunk/applications:
order/config/OrderEntityLabels.xml product/config/ProductUiLabels.xml
product/webapp/catalog/store/ProductStoreForms.xml
Author: jleroux
Date: Sun Nov 16 08:52:46 2008
New Revision: 718059
URL: http://svn.apache.org/viewvc?rev=718059&view=rev
Log:
Refactoring and correction of shipping rules screen (AddShipmentCostEstimate & ViewShipmentCostEstimate)
. I have introduced collapsible group of fields
. put a sentence (ProductOversizeNumber) instead of sparse words for a better translation (translation only done in English and French, sorry)
. introduced the label ProductNumber, since in French amount can't be translated to the same in this case (I wonder if it's not better in any languages anyway)
. Right French translation
Modified:
ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
Modified: ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderEntityLabels.xml?rev=718059&r1=718058&r2=718059&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderEntityLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderEntityLabels.xml Sun Nov 16 08:52:46 2008
@@ -258,7 +258,7 @@
<value xml:lang="de">Zuschlag</value>
<value xml:lang="en">Surcharge</value>
<value xml:lang="es">Sobretasa</value>
- <value xml:lang="fr">Surtaxe</value>
+ <value xml:lang="fr">Supplément</value>
<value xml:lang="it">Sovraccarico</value>
<value xml:lang="ro">Supraincarcare</value>
<value xml:lang="ru">Ðадбавка</value>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=718059&r1=718058&r2=718059&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun Nov 16 08:52:46 2008
@@ -33,7 +33,7 @@
<value xml:lang="de">Anlage</value>
<value xml:lang="en">Fixed Asset</value>
<value xml:lang="es">Activo Fijo</value>
- <value xml:lang="fr">Immobilisation fixe</value>
+ <value xml:lang="fr">immobilisation</value>
<value xml:lang="it">Cespite</value>
<value xml:lang="ro">Mijloace Fixe</value>
<value xml:lang="ru">ÐбÑÐµÐºÑ Ð¾ÑновнÑÑ
Ñондов</value>
@@ -44,7 +44,7 @@
<value xml:lang="de">Anlage ID</value>
<value xml:lang="en">Asset Id</value>
<value xml:lang="es">Código de Activo</value>
- <value xml:lang="fr">Réf. immobilisation fixe</value>
+ <value xml:lang="fr">Réf. immobilisation</value>
<value xml:lang="it">Codice Cespite</value>
<value xml:lang="ro">Cod Mijloace Fixe</value>
<value xml:lang="ru">Ðод ÐС</value>
@@ -55,7 +55,7 @@
<value xml:lang="de">Link zu Anlage hinzufügen</value>
<value xml:lang="en">Add link to Fixed Asset</value>
<value xml:lang="es">Añadir enlace a Activo Fijo</value>
- <value xml:lang="fr">Ajoutez un lien vers immobilisation fixe</value>
+ <value xml:lang="fr">Ajoutez un lien vers immobilisation</value>
<value xml:lang="it">Nuovo cespite</value>
<value xml:lang="ro">Nou Mijloc Fix</value>
<value xml:lang="ru">ÐобавиÑÑ ÑÑÑÐ»ÐºÑ Ðº ÐС</value>
@@ -66,7 +66,7 @@
<value xml:lang="de">Einen Link zu einer Anlage hinzufügen</value>
<value xml:lang="en">Add a link to a fixed Asset</value>
<value xml:lang="es">Añadir un enlace a un Activo Fijo</value>
- <value xml:lang="fr">Ajoutez un lien vers une immobilisation fixe</value>
+ <value xml:lang="fr">Ajoutez un lien vers une immobilisation</value>
<value xml:lang="it">Aggiungi un link al cespite</value>
<value xml:lang="ro">Adauga un link la Mijlocul Fix</value>
<value xml:lang="ru">ÐобавиÑÑ ÑÑÑÐ»ÐºÑ Ðº ÐС</value>
@@ -88,7 +88,7 @@
<value xml:lang="de">Link zu einer Anlage aktualisieren</value>
<value xml:lang="en">Update a link to a fixed Asset</value>
<value xml:lang="es">Actualizar un enlace a un activo fijo</value>
- <value xml:lang="fr">Mettre à jour un lien vers une immobilisation fixe</value>
+ <value xml:lang="fr">Mettre à jour un lien vers une immobilisation</value>
<value xml:lang="it">Aggiorna un link ad un Cespite</value>
<value xml:lang="ro">Actualizeaza un link la un Mijloc Fix</value>
<value xml:lang="ru">ÐбновиÑÑ ÑÑÑÐ»ÐºÑ Ðº ÐС</value>
@@ -99,7 +99,7 @@
<value xml:lang="de">Anlagen</value>
<value xml:lang="en">Fixed Assets</value>
<value xml:lang="es">Activos Fijos</value>
- <value xml:lang="fr">Mettre à jour un lien à une immobilisation fixe</value>
+ <value xml:lang="fr">Immobilisations</value>
<value xml:lang="it">Cespiti</value>
<value xml:lang="ro">Mijloace Fixe</value>
<value xml:lang="ru">ÐÑновнÑе ÑÑедÑÑва</value>
@@ -2754,7 +2754,7 @@
<property key="FormFieldTitle_priceBreakId">
<value xml:lang="de">Preissprung ID</value>
<value xml:lang="en">Price Break Id</value>
- <value xml:lang="fr">Réf. de prix promo</value>
+ <value xml:lang="fr">Réf. de rupture par prix</value>
<value xml:lang="it">Intervalli Prezzo</value>
<value xml:lang="ru">Ðод Ñенового поÑога</value>
<value xml:lang="th">รหัสราà¸à¸²à¸à¸µà¹à¹à¸à¸´à¸à¹à¸à¸¢</value>
@@ -9625,12 +9625,12 @@
<value xml:lang="zh">ç¨æ°æ è¯å¤å¶/å é¤å·²éç</value>
</property>
<property key="ProductEach">
- <value xml:lang="de">Jedes Produkt</value>
- <value xml:lang="en">Each Product</value>
- <value xml:lang="fr">Chaque article</value>
- <value xml:lang="it">Ogni Prodotto</value>
- <value xml:lang="ro">Orice Produs</value>
- <value xml:lang="ru">ÐаждÑй пÑодÑкÑ</value>
+ <value xml:lang="de">jedes Produkt</value>
+ <value xml:lang="en">each Product</value>
+ <value xml:lang="fr">pour chaque article dont</value>
+ <value xml:lang="it">ogni Prodotto</value>
+ <value xml:lang="ro">orice Produs</value>
+ <value xml:lang="ru">kаждÑй пÑодÑкÑ</value>
<value xml:lang="th">สิà¸à¸à¹à¸²à¹à¸à¹à¸¥à¸°</value>
<value xml:lang="zh">æ¯ä¸ªäº§å</value>
</property>
@@ -10639,7 +10639,7 @@
<property key="ProductFeatureMessage">
<value xml:lang="de">Untenstehende Zuschläge werden hinzugefügt pro Produkt * pro Merkmal</value>
<value xml:lang="en">Below surcharge(s) will be added per-product * per-feature</value>
- <value xml:lang="fr">En dessous une surtaxe sera ajoutée par article et par caractéristique</value>
+ <value xml:lang="fr">Les suppléments ci-dessous peuvent être ajoutés cumulativement par article * par caractéristique</value>
<value xml:lang="it">Sotto ricarico(i) saranno aggiunti per-prodotto * per-caratteristica</value>
<value xml:lang="ro">Sub incarcare va fi adaugata pe-produs * pentru -caracteristica</value>
<value xml:lang="ru">доплаÑа(Ñ)ниже бÑдÑÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ Ð½Ð°-пÑодÑÐºÑ * на-оÑобенноÑÑÑ</value>
@@ -10835,7 +10835,7 @@
<value xml:lang="de">Prozentangabe Pauschal Basis</value>
<value xml:lang="en">Flat Base Percent</value>
<value xml:lang="es">Porcentaje general base</value>
- <value xml:lang="fr">Pourcentage unique de base</value>
+ <value xml:lang="fr">Pourcentage du total commande</value>
<value xml:lang="it">Percentuale Base Fissa</value>
<value xml:lang="ro">Procent Baza Plata</value>
<value xml:lang="ru">ÐазовÑй пÑоÑенÑ</value>
@@ -10846,7 +10846,7 @@
<value xml:lang="de">Pauschalpreis Basis</value>
<value xml:lang="en">Flat Base Price</value>
<value xml:lang="es">Precio general base</value>
- <value xml:lang="fr">Prix unique de base</value>
+ <value xml:lang="fr">Coût fixe</value>
<value xml:lang="it">Prezzo Base Fisso</value>
<value xml:lang="ro">Pret Baza Plata</value>
<value xml:lang="ru">ÐÐ°Ð·Ð¾Ð²Ð°Ñ Ñена</value>
@@ -10857,7 +10857,7 @@
<value xml:lang="de">Pauschalpreis Position</value>
<value xml:lang="en">Flat Item Price</value>
<value xml:lang="es">Precio general del ArtÃculo</value>
- <value xml:lang="fr">Prix unique de l'article</value>
+ <value xml:lang="fr">Coût fixe par article</value>
<value xml:lang="it">Prezzo Prodotto Fisso</value>
<value xml:lang="ro">Pret Produs Plat</value>
<value xml:lang="ru">Цена позиÑии</value>
@@ -10867,10 +10867,15 @@
<property key="ProductFlatShippingPercent">
<value xml:lang="de">Prozentangabe Versand Pauschal</value>
<value xml:lang="en">Flat Shipping Percent</value>
+ <value xml:lang="fr">Pourcentage du coût d'expédition</value>
<value xml:lang="it">Percentuale Fissa Spedizione</value>
<value xml:lang="ru">ÐÑоÑÐµÐ½Ñ Ð¾Ñ Ð¿Ð¾ÑÑавки</value>
<value xml:lang="th">à¹à¸à¸à¸£à¹à¹à¸à¹à¸à¸à¹à¸à¸²à¸£à¸à¸à¸ªà¹à¸à¸à¸·à¹à¸à¸à¸²à¸</value>
</property>
+ <property key="ProductFlatTitle">
+ <value xml:lang="en">Flat charges</value>
+ <value xml:lang="fr">Frais fixes</value>
+ </property>
<property key="ProductFromGeo">
<value xml:lang="de">Von Geo</value>
<value xml:lang="en">From Geo</value>
@@ -12585,7 +12590,7 @@
<property key="ProductMaxWt">
<value xml:lang="de">Maximum Gewicht</value>
<value xml:lang="en">Max Wt</value>
- <value xml:lang="fr">Poids total</value>
+ <value xml:lang="fr">Poids maxi</value>
<value xml:lang="it">Peso Massimo</value>
<value xml:lang="ro">GRMax </value>
<value xml:lang="ru">ÐÐ°ÐºÑ ÐÑ</value>
@@ -12677,7 +12682,7 @@
<value xml:lang="de">0 min -> bis zum max; 0 max -> vom Minimum aufwärts</value>
<value xml:lang="en">0 min -> up to max; 0 max -> from min and up</value>
<value xml:lang="es">0 mÃnimo -> hasta máximo; 0 máximo -> de mÃnimo a más</value>
- <value xml:lang="fr">0 min -> jusqu'au max; 0 max -> Ã partir du min et jusqu'Ã </value>
+ <value xml:lang="fr">0 comme mini -> jusqu'Ã la valeur maxi; 0 comme maxi -> Ã partir du mini</value>
<value xml:lang="it">0 min -> fino al massimo; 0 max -> da min e sù</value>
<value xml:lang="ro">0 min -> pana la maxim; 0 max -> de la min si sù</value>
<value xml:lang="ru">0 мин -> до макÑ; 0 Ð¼Ð°ÐºÑ -> Ð¾Ñ Ð¼Ð¸Ð½ и вÑÑе</value>
@@ -12717,7 +12722,7 @@
<property key="ProductMinQt">
<value xml:lang="de">Mindestmenge</value>
<value xml:lang="en">Min Qt</value>
- <value xml:lang="fr">Qté Mini</value>
+ <value xml:lang="fr">Qantité Mini</value>
<value xml:lang="it">Qnt Minima</value>
<value xml:lang="ru">Ðин кол</value>
<value xml:lang="th">Min Qt</value>
@@ -13919,6 +13924,10 @@
<value xml:lang="th">Nt. Wt.</value>
<value xml:lang="zh">åé</value>
</property>
+ <property key="ProductNumber">
+ <value xml:lang="en">number</value>
+ <value xml:lang="fr">nombre</value>
+ </property>
<property key="ProductNumberQuantity">
<value xml:lang="de">Nummer / Menge</value>
<value xml:lang="en">Number / Quantity</value>
@@ -14154,7 +14163,7 @@
<property key="ProductOrderTotal">
<value xml:lang="de">Auftragstotal</value>
<value xml:lang="en">orderTotal</value>
- <value xml:lang="fr">Total de la commande</value>
+ <value xml:lang="fr">total de la commande</value>
<value xml:lang="it">Totale Ordine</value>
<value xml:lang="ro">Total Comanda</value>
<value xml:lang="ru">ÐÑоги заказа</value>
@@ -14329,27 +14338,35 @@
<property key="ProductOversize">
<value xml:lang="de">Ãbergrösse</value>
<value xml:lang="en">oversize</value>
- <value xml:lang="fr">Au-delà des limites</value>
+ <value xml:lang="fr">au-delà des limites</value>
<value xml:lang="it">oltre misura</value>
<value xml:lang="ro">Peste masura</value>
<value xml:lang="ru">негабаÑиÑ</value>
<value xml:lang="th">à¸à¸à¸²à¸à¸¡à¸²à¸à¸à¸§à¹à¸²</value>
<value xml:lang="zh">è¶
大</value>
</property>
+ <property key="ProductOversizeNumber">
+ <value xml:lang="en">number of product(s) in oversize</value>
+ <value xml:lang="fr">nombre d'article(s) au-delà des limites</value>
+ </property>
<property key="ProductOversizeSurcharge">
<value xml:lang="de">Zuschlag Ãbergrösse</value>
<value xml:lang="en">Oversize Surcharge</value>
- <value xml:lang="fr">Surtaxe de dépassement de limite</value>
+ <value xml:lang="fr">Supplément pour dépassement de taille</value>
<value xml:lang="it">Sovraccarico oltre misura</value>
<value xml:lang="ro">Supraincarcare peste masura</value>
<value xml:lang="ru">ÐоплаÑа за негабаÑиÑ</value>
<value xml:lang="th">à¸à¸£à¸£à¸à¸¸à¸à¹à¸à¸´à¸à¸à¸à¸²à¸</value>
<value xml:lang="zh">è¶
大éå è´¹</value>
</property>
+ <property key="ProductOversizeTitle">
+ <value xml:lang="en">Oversize surcharge</value>
+ <value xml:lang="fr">Supplément pour dépassement de taille</value>
+ </property>
<property key="ProductOversizeUnit">
<value xml:lang="de">Einheit Ãbergrösse</value>
<value xml:lang="en">Oversize Unit</value>
- <value xml:lang="fr">Unité au-delà des limites</value>
+ <value xml:lang="fr">Nombre fixant la limite</value>
<value xml:lang="it">Unità oltre misura</value>
<value xml:lang="ro">Unitate peste masura </value>
<value xml:lang="ru">ÐегабаÑиÑ. меÑÑо</value>
@@ -14928,6 +14945,10 @@
<value xml:lang="th">à¸à¹à¸à¸à¸³à¸«à¸à¸à¸£à¸²à¸à¸²</value>
<value xml:lang="zh">ä»·æ ¼è§å</value>
</property>
+ <property key="ProductPriceTitle1">
+ <value xml:lang="en">Price charge</value>
+ <value xml:lang="fr">Frais lié au prix</value>
+ </property>
<property key="ProductPriceType">
<value xml:lang="de">Preistyp</value>
<value xml:lang="en">Price Type</value>
@@ -15172,13 +15193,17 @@
<value xml:lang="de">Produktmerkmal Instandhaltung</value>
<value xml:lang="en">Product Feature Maintenance</value>
<value xml:lang="es">Mantenimiento de caracterÃsticas de producto</value>
- <value xml:lang="fr">Maintien de caractéristique de produits</value>
+ <value xml:lang="fr">Maintenance de caractéristique de produits</value>
<value xml:lang="it">Manutenzione Caratteristica Prodotto</value>
<value xml:lang="ro">Intretinere Caracteristica Produs</value>
<value xml:lang="ru">ÐоддеÑжка оÑобенноÑÑей пÑодÑкÑа</value>
<value xml:lang="th">à¸à¸²à¸£à¸£à¸±à¸à¸©à¸²à¸ªà¸ าà¸à¸¥à¸±à¸à¸©à¸à¸°à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">产åç¹å¾ç»´æ¤</value>
</property>
+ <property key="ProductFeatureTitle">
+ <value xml:lang="en">Features group charges</value>
+ <value xml:lang="fr">Frais par groupe de caractéristiques</value>
+ </property>
<property key="ProductProductHeight">
<value xml:lang="de">Produkt Höhe</value>
<value xml:lang="en">Product Height</value>
@@ -16006,6 +16031,10 @@
<value xml:lang="th">à¸à¸³à¸à¸§à¸à¸à¸²à¸£à¸à¸à¸ªà¹à¸</value>
<value xml:lang="zh">å·²éè´§çæ°é</value>
</property>
+ <property key="ProductQuantityTitle1">
+ <value xml:lang="en">Quantity charge</value>
+ <value xml:lang="fr">Frais lié à la quantité</value>
+ </property>
<property key="ProductQuantityToBin">
<value xml:lang="de">Menge zu Behälter</value>
<value xml:lang="en">Quantity To Bin</value>
@@ -17511,7 +17540,7 @@
<property key="ProductShipamount">
<value xml:lang="de">lieferbetrag</value>
<value xml:lang="en">shipamount</value>
- <value xml:lang="fr">Montant envoyé</value>
+ <value xml:lang="fr">montant de l'expédition</value>
<value xml:lang="it">importo spedizione</value>
<value xml:lang="ro">Valoare expediere</value>
<value xml:lang="ru">поÑÑавка</value>
@@ -17522,7 +17551,7 @@
<value xml:lang="de">lieferbetrag=lieferbetrag + (auftragsTotal * prozent)</value>
<value xml:lang="en">shipamount=shipamount + (orderTotal * percent)</value>
<value xml:lang="es">monto de envÃo = monto de envÃo + (total de la orden * porcentaje)</value>
- <value xml:lang="fr">montant de l'expédition= montant expédition + (total commande *pourcentage)</value>
+ <value xml:lang="fr">montant de l'expédition = montant de l'expédition + (total commande * pourcentage)</value>
<value xml:lang="it">importo spedizione=importo spedizione + (Totale Ordine * percentuale)</value>
<value xml:lang="ro">Valoare Expediere=Valoare Expediere + (Total Comanda * procent)</value>
<value xml:lang="ru">поÑÑавка=поÑÑавка + (ÑÑмма заказа * пÑоÑенÑ)</value>
@@ -17533,7 +17562,7 @@
<value xml:lang="de">lieferbetrag=lieferbetrag + preis</value>
<value xml:lang="en">shipamount=shipamount + price</value>
<value xml:lang="es">monto del envÃo = monto del envÃo + precio</value>
- <value xml:lang="fr">montant de l'expédition= montant expédition + prix</value>
+ <value xml:lang="fr">montant de l'expédition= montant de l'expédition + coût fixe</value>
<value xml:lang="it">importo spedizione=importo spedizione + prezzo</value>
<value xml:lang="ro">Valoare Expediere=Valoare Expediere + pret</value>
<value xml:lang="ru">поÑÑавка=поÑÑавка + Ñена</value>
@@ -17543,7 +17572,7 @@
<property key="ProductShipamountShippingTotalPercent">
<value xml:lang="de">lieferbetrag=lieferbetrag + (lieferbetrag * prozent)</value>
<value xml:lang="en">shipamount=shipamount + (shipamount * percent)</value>
- <value xml:lang="fr">montant de l'expédition = montant de l'expédition + (montant de l'expédition * prix)</value>
+ <value xml:lang="fr">montant de l'expédition = montant de l'expédition + (montant de l'expédition * pourcentage)</value>
<value xml:lang="it">importo spedizione=importo spedizione + (importo spedizione * percentuale)</value>
<value xml:lang="ru">поÑÑавка=поÑÑавка + (поÑÑавка * пÑоÑенÑ)</value>
<value xml:lang="th">à¸à¸³à¸à¸§à¸à¸à¸²à¸£à¸à¸à¸ªà¹à¸=à¸à¸³à¸à¸§à¸à¸à¸²à¸£à¸à¸à¸ªà¹à¸ + (à¸à¸³à¸à¸§à¸à¸à¸²à¸£à¸à¸à¸ªà¹à¸ * à¹à¸à¸à¸£à¹à¹à¸à¹à¸à¸à¹)</value>
@@ -17552,7 +17581,7 @@
<value xml:lang="de">lieferbetrag=lieferbetrag + (totalMenge * preis)</value>
<value xml:lang="en">shipamount=shipamount + (totalQuantity * price)</value>
<value xml:lang="es">monto del envÃo = monto del envÃo + (cantidad total * precio)</value>
- <value xml:lang="fr">montant de l'expédition = montant expédition + (total quantité * prix)</value>
+ <value xml:lang="fr">montant de l'expédition = montant de l'expédition + (quantité totale * coût fixe)</value>
<value xml:lang="it">importo spedizione=importo spedizione + (Totale Ordine * prezzo)</value>
<value xml:lang="ro">Valoare Expediere=Valoare expediere + (Total Comanda * pret)</value>
<value xml:lang="ru">поÑÑавка=поÑÑавка + (обÑее колиÑеÑÑво * Ñена)</value>
@@ -18552,7 +18581,7 @@
<property key="ProductSurcharge">
<value xml:lang="de">Zuschlag</value>
<value xml:lang="en">surcharge</value>
- <value xml:lang="fr">surtaxe</value>
+ <value xml:lang="fr">supplément</value>
<value xml:lang="it">ricarico</value>
<value xml:lang="ro">ReIncarcare</value>
<value xml:lang="ru">доплаÑа</value>
@@ -18894,7 +18923,7 @@
<property key="ProductTotalFeaturesApplied">
<value xml:lang="de">Total Merkmal(e) angewendet</value>
<value xml:lang="en">total feature(s) applied</value>
- <value xml:lang="fr">Caractéristique(s) appliquées en tout</value>
+ <value xml:lang="fr">nb de caract. appliquées</value>
<value xml:lang="it">totale caratteristica(e) applicate</value>
<value xml:lang="ro">total caracteristici(e) aplicate</value>
<value xml:lang="ru">вÑего пÑименено оÑобенноÑÑей</value>
@@ -19591,6 +19620,10 @@
<value xml:lang="ru">ÐеÑовой поÑог</value>
<value xml:lang="th">รหัสà¸à¹à¸³à¸«à¸à¸±à¸à¸à¸µà¹à¹à¸à¸´à¸à¹à¸à¸¢</value>
</property>
+ <property key="ProductWeightTitle1">
+ <value xml:lang="en">Weight charge</value>
+ <value xml:lang="fr">Frais lié au poids</value>
+ </property>
<property key="ProductWeightUnit">
<value xml:lang="de">Gewicht Einheit</value>
<value xml:lang="en">Weight Unit</value>
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=718059&r1=718058&r2=718059&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Sun Nov 16 08:52:46 2008
@@ -700,22 +700,18 @@
<field name="partyId"><text/></field>
<field name="roleTypeId"><text/></field>
- <field name="FlatTitle" title=" " title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="flatPercent" title="${uiLabelMap.ProductFlatBasePercent}" tooltip="${uiLabelMap.ProductShipamountOrderTotalPercent}"><text/></field>
<field name="flatPrice" title="${uiLabelMap.ProductFlatBasePrice}" tooltip="${uiLabelMap.ProductShipamountPrice}"><text/></field>
<field name="flatItemPrice" title="${uiLabelMap.ProductFlatItemPrice}" tooltip="${uiLabelMap.ProductShipamountTotalQuantityPrice}"><text/></field>
<field name="shippingPricePercent" title="${uiLabelMap.ProductFlatShippingPercent}" tooltip="${uiLabelMap.ProductShipamountShippingTotalPercent}"><text/></field>
- <field name="FeatureTitle" title=" " title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="productFeatureGroupId" title="${uiLabelMap.ProductFeatureGroup}" tooltip="${uiLabelMap.ProductFeatureMessage}"><text/></field>
<field name="featurePercent" title="${uiLabelMap.ProductFeaturePerFeaturePercent}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + ((${uiLabelMap.ProductOrderTotal} * ${uiLabelMap.ProductPercent}) * ${uiLabelMap.ProductTotalFeaturesApplied})"><text/></field>
<field name="featurePrice" title="${uiLabelMap.ProductFeaturePerFeaturePrice}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (${uiLabelMap.ProductPrice} * ${uiLabelMap.ProductTotalFeaturesApplied})"><text/></field>
- <field name="OversizeTitle" title=" " title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="oversizeUnit" title="${uiLabelMap.ProductOversizeUnit}" tooltip="${uiLabelMap.ProductEach} ((${uiLabelMap.ProductHeight} * 2) + (${uiLabelMap.ProductWidth} * 2) + ${uiLabelMap.ProductDept}) >= ${uiLabelMap.CommonThis} ${uiLabelMap.ProductAmount}"><text/></field>
- <field name="oversizePrice" title="${uiLabelMap.ProductOversizeSurcharge}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (# ${uiLabelMap.ProductOversize} ${uiLabelMap.ProductProducts} * ${uiLabelMap.ProductSurcharge})"><text/></field>
+ <field name="oversizeUnit" title="${uiLabelMap.ProductOversizeUnit}" tooltip="${uiLabelMap.ProductEach} ((${uiLabelMap.ProductHeight} * 2) + (${uiLabelMap.ProductWidth} * 2) + ${uiLabelMap.ProductDept}) >= ${uiLabelMap.CommonThis} ${uiLabelMap.ProductNumber}"><text/></field>
+ <field name="oversizePrice" title="${uiLabelMap.ProductOversizeSurcharge}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (${uiLabelMap.ProductOversizeNumber} * ${uiLabelMap.ProductSurcharge})"><text/></field>
- <field name="WeightTitle1" title="${uiLabelMap.ProductWeight}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="WeightTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="wmin" title="${uiLabelMap.ProductMinWt}"><text/></field>
<field name="wmax" title="${uiLabelMap.ProductMaxWt}"><text/></field>
@@ -738,7 +734,6 @@
</field>
<field name="wprice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><text/></field>
- <field name="QuantityTitle1" title="${uiLabelMap.ProductQuantity}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="QuantityTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="qmin" title="${uiLabelMap.ProductMinQt}"><text/></field>
<field name="qmax" title="${uiLabelMap.ProductMaxQt}"><text/></field>
@@ -760,7 +755,6 @@
</field>
<field name="qprice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><text/></field>
- <field name="PriceTitle1" title="${uiLabelMap.ProductPrice}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="PriceTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="pmin" title="${uiLabelMap.ProductMinPr}"><text/></field>
<field name="pmax" title="${uiLabelMap.ProductMaxPr}"><text/></field>
@@ -782,6 +776,56 @@
</field>
<field name="pprice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+
+ <sort-order>
+ <field-group>
+ <sort-field name="productStoreId"/>
+ <sort-field name="productStoreShipMethId"/>
+ <sort-field name="fromGeo"/>
+ <sort-field name="toGeo"/>
+ <sort-field name="partyId"/>
+ <sort-field name="roleTypeId"/>
+ </field-group>
+ <field-group title="${uiLabelMap.ProductFlatTitle}" collapsible="true">
+ <sort-field name="flatPercent"/>
+ <sort-field name="flatPrice"/>
+ <sort-field name="flatItemPrice"/>
+ <sort-field name="shippingPricePercent"/>
+ </field-group>
+ <field-group title="${uiLabelMap.ProductFeatureTitle}" collapsible="true" initially-collapsed="true">
+ <sort-field name="productFeatureGroupId"/>
+ <sort-field name="featurePercent"/>
+ <sort-field name="featurePrice"/>
+ </field-group>
+ <field-group title="${uiLabelMap.ProductOversizeTitle}" collapsible="true" initially-collapsed="true">
+ <sort-field name="oversizeUnit"/>
+ <sort-field name="oversizePrice"/>
+ </field-group>
+ <field-group title="${uiLabelMap.ProductWeightTitle1}" collapsible="true" initially-collapsed="true">
+ <sort-field name="WeightTitle2"/>
+ <sort-field name="wmin"/>
+ <sort-field name="wmax"/>
+ <sort-field name="weightBreakId"/>
+ <sort-field name="wuom"/>
+ <sort-field name="wprice"/>
+ </field-group>
+ <field-group title="${uiLabelMap.ProductQuantityTitle1}" collapsible="true" initially-collapsed="true">
+ <sort-field name="QuantityTitle2"/>
+ <sort-field name="qmin"/>
+ <sort-field name="qmax"/>
+ <sort-field name="quantityBreakId"/>
+ <sort-field name="quom"/>
+ <sort-field name="qprice"/>
+ </field-group>
+ <field-group title="${uiLabelMap.ProductPriceTitle1}" collapsible="true" initially-collapsed="true">
+ <sort-field name="PriceTitle2"/>
+ <sort-field name="pmin"/>
+ <sort-field name="pmax"/>
+ <sort-field name="priceBreakId"/>
+ <sort-field name="puom"/>
+ <sort-field name="pprice"/>
+ </field-group>
+ </sort-order>
</form>
<form name="ViewShipmentCostEstimate" type="single" title="" default-map-name="estimate"
header-row-style="header-row" default-table-style="basic-table">
@@ -799,22 +843,22 @@
<field name="partyId"><display/></field>
<field name="roleTypeId"><display/></field>
- <field name="FlatTitle" title=" " title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="FlatTitle" title="${uiLabelMap.ProductFlatTitle}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="orderPricePercent" title="${uiLabelMap.ProductFlatBasePercent}" tooltip="${uiLabelMap.ProductShipamountOrderTotalPercent}"><display/></field>
<field name="orderFlatPrice" title="${uiLabelMap.ProductFlatBasePrice}" tooltip="${uiLabelMap.ProductShipamountPrice}"><display/></field>
<field name="orderItemFlatPrice" title="${uiLabelMap.ProductFlatItemPrice}" tooltip="${uiLabelMap.ProductShipamountTotalQuantityPrice}"><display/></field>
<field name="shippingPricePercent" title="${uiLabelMap.ProductFlatShippingPercent}" tooltip="${uiLabelMap.ProductShipamountShippingTotalPercent}"><display/></field>
- <field name="FeatureTitle" title=" " title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="FeatureTitle" title="${uiLabelMap.ProductFeatureTitle}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="productFeatureGroupId" title="${uiLabelMap.ProductFeatureGroup}" tooltip="${uiLabelMap.ProductFeatureMessage}"><display/></field>
<field name="featurePercent" title="${uiLabelMap.ProductFeaturePerFeaturePercent}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + ((${uiLabelMap.ProductOrderTotal} * ${uiLabelMap.ProductPercent}) * ${uiLabelMap.ProductTotalFeaturesApplied})"><display/></field>
<field name="featurePrice" title="${uiLabelMap.ProductFeaturePerFeaturePrice}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (${uiLabelMap.ProductPrice} * ${uiLabelMap.ProductTotalFeaturesApplied})"><display/></field>
- <field name="OversizeTitle" title=" " title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="oversizeUnit" title="${uiLabelMap.ProductOversizeUnit}" tooltip="${uiLabelMap.ProductEach} ((${uiLabelMap.ProductHeight} * 2) + (${uiLabelMap.ProductWidth} * 2) + ${uiLabelMap.ProductDept}) >= ${uiLabelMap.CommonThis} ${uiLabelMap.ProductAmount}"><display/></field>
- <field name="oversizePrice" title="${uiLabelMap.ProductOversizeSurcharge}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (# ${uiLabelMap.ProductOversize} ${uiLabelMap.ProductProducts} * ${uiLabelMap.ProductSurcharge})"><display/></field>
+ <field name="OversizeTitle" title="${uiLabelMap.ProductOversizeTitle}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="oversizeUnit" title="${uiLabelMap.ProductOversizeUnit}" tooltip="${uiLabelMap.ProductEach} ((${uiLabelMap.ProductHeight} * 2) + (${uiLabelMap.ProductWidth} * 2) + ${uiLabelMap.ProductDept}) >= ${uiLabelMap.CommonThis} ${uiLabelMap.ProductNumber}"><display/></field>
+ <field name="oversizePrice" title="${uiLabelMap.ProductOversizeSurcharge}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (${uiLabelMap.ProductNumber} ${uiLabelMap.ProductOversize} ${uiLabelMap.ProductProducts} * ${uiLabelMap.ProductSurcharge})"><display/></field>
- <field name="WeightTitle1" title="${uiLabelMap.ProductWeight}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="WeightTitle1" title="${uiLabelMap.ProductWeightTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="WeightTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="weightBreakId">
<display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>
@@ -824,7 +868,7 @@
</field>
<field name="weightUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
- <field name="QuantityTitle1" title="${uiLabelMap.ProductQuantity}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="QuantityTitle1" title="${uiLabelMap.ProductQuantityTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="QuantityTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="quantityBreakId">
<display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>
@@ -834,7 +878,7 @@
</field>
<field name="quantityUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
- <field name="PriceTitle1" title="${uiLabelMap.ProductPrice}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="PriceTitle1" title="${uiLabelMap.ProductPriceTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="PriceTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="priceBreakId">
<display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>