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 2009/10/31 09:54:14 UTC
svn commit: r831522 - in /ofbiz/trunk/specialpurpose/pos:
config/PosUiLabels.xml config/XuiLabels.properties
config/XuiLabels_fr.properties screens/800x600/menu/mgrmain.xml
screens/default/menu/mgrmain.xml src/org/ofbiz/pos/PosTransaction.java
Author: jleroux
Date: Sat Oct 31 08:54:14 2009
New Revision: 831522
URL: http://svn.apache.org/viewvc?rev=831522&view=rev
Log:
Replace client by customer in English in POS labels (in French it's only Client). I feel it's more a customer than a client.
+ new button label in MGR panel : "Void a sale", it's not the same than "Void the sale"
Modified:
ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml
ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties
ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties
ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml
ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
Modified: ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml?rev=831522&r1=831521&r2=831522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml Sat Oct 31 08:54:14 2009
@@ -76,8 +76,8 @@
<value xml:lang="zh">æ¶é¶å:</value>
</property>
<property key="PosClientProfile">
- <value xml:lang="en">Client informations, selection adds the card number as a promo code</value>
- <value xml:lang="fr">Informations sur le client, sa sélection entraîne celle de son n° de carte comme code promo</value>
+ <value xml:lang="en">Customer informations, selection adds the card number as a promo code</value>
+ <value xml:lang="fr">Informations sur le client, sa sélection entraîne celle de son n° de carte comme code de promotion.</value>
</property>
<property key="PosConfigureItem">
<value xml:lang="en">Item Configuration</value>
@@ -311,7 +311,7 @@
<value xml:lang="zh">ä½ å¯ä»¥åå»é¼ æ æ¥æ¿æ¢å½åçéå®å¹¶å é¤è¿ä¸ª</value>
</property>
<property key="PosNoClientProfile">
- <value xml:lang="en">Any client profile to update</value>
+ <value xml:lang="en">Any customer profile to update</value>
<value xml:lang="fr">Aucun client à mettre à jour</value>
</property>
<property key="PosOpDrAm">
@@ -432,7 +432,7 @@
<value xml:lang="zh">éæ©ä¸ä¸ªäº§å</value>
</property>
<property key="PosSelectClientToEdit">
- <value xml:lang="en">Select a client to edit or select</value>
+ <value xml:lang="en">Select a customer to edit or select</value>
<value xml:lang="fr">Choisissez le client à modifier ou à sélectionner</value>
</property>
<property key="PosSelectProductListDblClickTip">
Modified: ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties?rev=831522&r1=831521&r2=831522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/pos/config/XuiLabels.properties Sat Oct 31 08:54:14 2009
@@ -27,7 +27,7 @@
CLEAR_ALL=CLEAR ALL
CLEAR_CACHE=CLEAR CACHE
CLEAR_ONE=CLEAR ONE
-CLIENT_PROFILE=CLIENT PROFILE
+CLIENT_PROFILE=CUSTOMER PROFILE
CLOSE=CLOSE
CLR=CLR
CLR_DISC=CLR DISC
@@ -93,12 +93,13 @@
TRANS_RET=LOAD SALE
TRANS_SAVE=SAVE SALE
UNKNOWN_CARD_TYPE=UNKNOWN CARD TYPE
+VOID_A_SALE=VOID A SALE
VOID_ITEM=VOID ITEM
VOID_SALE=VOID SALE
cardClient=Card number
emailClient=Email address
item_not_configurable=The selected item is not configurable.
-listClient=Clients list
+listClient=Customers list
nameClient=Name
nameContains=Contains
nameEquals=Equals
Modified: ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties?rev=831522&r1=831521&r2=831522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties (original)
+++ ofbiz/trunk/specialpurpose/pos/config/XuiLabels_fr.properties Sat Oct 31 08:54:14 2009
@@ -71,7 +71,7 @@
RECEIPT_PRINTER_COMMUNICATION_ERROR=Erreur lors de la communication avec l'imprimante de caisse
RECEIPT_SERIALISE_ERROR=Erreur lors de la tentative de s\u00e9rialisation du ticket
REPRINT=R\u00e9imprimer
-RESET_XUI=R\u00e9initialiser
+RESET_XUI=R\u00e9initialiser XUI
ReasonInOut=Raison
Replace=Remplacer
ReplaceAndDelete=<html><center>Remplacer et<br>supprimer
@@ -93,6 +93,7 @@
TRANS_RET=Recharger une vente
TRANS_SAVE=Sauver la vente
UNKNOWN_CARD_TYPE=Type de carte inconnu
+VOID_A_SALE=Annuler une vente
VOID_ITEM=Annuler l'article
VOID_SALE=Annuler la vente
cardClient=N\u00b0 de carte
Modified: ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml?rev=831522&r1=831521&r2=831522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/800x600/menu/mgrmain.xml Sat Oct 31 08:54:14 2009
@@ -36,7 +36,7 @@
<Button name="mgrOpenTerm" x="400" y="49" w="78" h="47" style="posButton" content="OPEN" alignment="Center"/>
<!-- line 3 -->
- <Button name="mgrVoidSale" x="0" y="98" w="78" h="47" style="posButton" content="VOID_SALE" alignment="Center"/>
+ <Button name="mgrVoidSale" x="0" y="98" w="78" h="47" style="posButton" content="VOID_A_SALE" alignment="Center"/>
<Button name="" x="80" y="98" w="78" h="47" style="posButton" content="" alignment="Center"/>
<Button name="mgrPaidOut" x="160" y="98" w="78" h="47" style="posButton" content="PAID_OUT" alignment="Center"/>
<Button name="mgrPaidIn" x="240" y="98" w="78" h="47" style="posButton" content="PAID_IN" alignment="Center"/>
Modified: ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml?rev=831522&r1=831521&r2=831522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/screens/default/menu/mgrmain.xml Sat Oct 31 08:54:14 2009
@@ -36,7 +36,7 @@
<Button name="mgrOpenTerm" x="510" y="62" w="100" h="60" style="posButton" content="OPEN" alignment="Center"/>
<!-- line 3 -->
- <Button name="mgrVoidSale" x="0" y="124" w="100" h="60" style="posButton" content="VOID_SALE" alignment="Center"/>
+ <Button name="mgrVoidSale" x="0" y="124" w="100" h="60" style="posButton" content="VOID_A_SALE" alignment="Center"/>
<Button name="" x="102" y="124" w="100" h="60" style="posButton" content="" alignment="Center"/>
<Button name="mgrPaidOut" x="204" y="124" w="100" h="60" style="posButton" content="PAID_OUT" alignment="Center"/>
<Button name="mgrPaidIn" x="306" y="124" w="100" h="60" style="posButton" content="PAID_IN" alignment="Center"/>
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=831522&r1=831521&r2=831522&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Sat Oct 31 08:54:14 2009
@@ -1919,12 +1919,12 @@
if (UtilValidate.isNotEmpty(email)) {
// Update email
- String infoString = null;
svcCtx.clear();
svcCtx.put("partyId", partyId);
svcCtx.put("thruDate", null); // last one
svcCtx.put("contactMechTypeId", "EMAIL_ADDRESS");
String contactMechId = null;
+ String infoString = null;
try {
List<GenericValue> PartyEmails = session.getDelegator().findByAnd("PartyAndContactMech", svcCtx);
if (UtilValidate.isNotEmpty(PartyEmails)) {