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 2007/09/04 16:34:35 UTC
svn commit: r572690 - in /ofbiz/trunk/applications/order:
config/OrderUiLabels.properties config/OrderUiLabels_fr.properties
webapp/ordermgr/entry/billsettings.ftl
Author: jleroux
Date: Tue Sep 4 07:34:34 2007
New Revision: 572690
URL: http://svn.apache.org/viewvc?rev=572690&view=rev
Log:
Very inor change : suppressed OrderOfflineCheckMoney (was a one case used duplicate of OrderPaymentOfflineCheckMoney). Cleaned only french and default properties files (french l10n was a non sense, certainly me)
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.properties
ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties
ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=572690&r1=572689&r2=572690&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Tue Sep 4 07:34:34 2007
@@ -578,7 +578,6 @@
OrderNotesPrivate=Make Private
OrderNotesPublic=Make Public
OrderNumberOfPersons=Number of persons
-OrderOfflineCheckMoney=Offline: Check/Money Order
OrderOnOrder=On Order
OrderOrder=Order
OrderOrderBillFromParty=Bill From Party
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties?rev=572690&r1=572689&r2=572690&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties Tue Sep 4 07:34:34 2007
@@ -478,7 +478,6 @@
OrderNotes=Notes
OrderNotesCreateNew=Cr\u00E9er une nouvelle note
OrderNotesForRequestItem=Notes pour une demande d'article
-OrderOfflineCheckMoney=En diff\u00E9r\u00E9 : V\u00E9rifiez le mandat
OrderOrder=Commande
OrderOrderBillFromParty=Acteur D\u00E9bit\u00E9
OrderOrderBillToParty=Acteur Cr\u00E9dit\u00E9
@@ -502,7 +501,6 @@
OrderOrderNeedingAttention=Commandes n\u00E9cessitant de l'attention
OrderOrderNumber=Num\u00E9ro de commande
OrderOrderOptionSettings=Renseignements des options de commande
-OrderPackShipmentForShipGroup=Emballer l'exp\u00E9dition pour le groupe
OrderOrderPurchaseToBeScheduled=Commandes d'achat \u00E0 lancer
OrderOrderQuote=Devis
OrderOrderQuoteAttributeName=Nom de la donn\u00E9e
@@ -552,9 +550,10 @@
OrderOtherOrders=Autres commandes
OrderOverridePrice=Ecraser le prix
OrderPONumber=R\u00E9f. Commande d'achat
+OrderPackShipmentForShipGroup=Emballer l'exp\u00E9dition pour le groupe
OrderPaidDollarAmountsIncludesAdjustments=Montants pay\u00E9s (incluant les ajustements)
OrderPaidItemsSoldIncludesPromotions=Lignes de commande de vente pay\u00E9es (incluant les promotions)
-OrderPaymentOfflineCheckMoney=Selon condition g\u00E9n\u00E9ral de vente
+OrderPaymentOfflineCheckMoney=Paiement en diff\u00E9r\u00E9 : esp\u00E8ces ou ch\u00E8que
OrderPaymentType=Type de paiement
OrderPendingPaymentDollarAmountsIncludesAdjustments=Montants des paiements en cours (incluant les ajustements)
OrderPendingPaymentItemsSoldIncludesPromotions=Lignes de commande en attente de paiement (incluant les promotions)
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=572690&r1=572689&r2=572690&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Tue Sep 4 07:34:34 2007
@@ -78,7 +78,7 @@
<input type="radio" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
</td>
<td colspan="2" width="50%">
- <span class="tabletext">${uiLabelMap.OrderOfflineCheckMoney}</span>
+ <span class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</span>
</td>
</tr>
<tr><td colspan="3"><hr class="sepbar"/></td></tr>
@@ -270,7 +270,7 @@
<td colspan="3"><hr class="sepbar"/></td>
</tr>
- <tr>
+ <tr>
<td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCompanyNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
@@ -414,14 +414,14 @@
<input type="text" class="inputBox" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/>
</td>
</tr>
- </#if>
-
- <#-- eft fields -->
- <#if paymentMethodType =="EFT">
- <#if !eftAccount?has_content>
- <#assign eftAccount = requestParameters>
- </#if>
- <tr>
+ </#if>
+
+ <#-- eft fields -->
+ <#if paymentMethodType =="EFT">
+ <#if !eftAccount?has_content>
+ <#assign eftAccount = requestParameters>
+ </#if>
+ <tr>
<td colspan="3"><hr class="sepbar"/></td>
</tr>
<tr>