Modified: ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml Fri Jan 16 13:03:44 2009 @@ -17,24 +17,9 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <property key="(ItemDiscount)"> - <value xml:lang="en">(Item discount)</value> - <value xml:lang="es">(Item discount)</value> - <value xml:lang="fr">Remise sur l'article</value> - <value xml:lang="it">(Item discount)</value> - <value xml:lang="ro">(Item discount)</value> - <value xml:lang="zh">(Item discount)</value> - </property> - <property key="(SalesDiscount)"> - <value xml:lang="en">(Sale discount)</value> - <value xml:lang="es">(Sales discount)</value> - <value xml:lang="fr">Remise sur la vente</value> - <value xml:lang="it">(Sales discount)</value> - <value xml:lang="ro">(Sales discount)</value> - <value xml:lang="zh">(Sales discount)</value> - </property> - <property key="(adjustment)"> +--> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <property key="PosAdjustment"> <value xml:lang="en">(adjustment)</value> <value xml:lang="es">(adjustment)</value> <value xml:lang="fr">(ajustement)</value> @@ -42,7 +27,7 @@ <value xml:lang="ro">(adjustment)</value> <value xml:lang="zh">(adjustment)</value> </property> - <property key="AMT"> + <property key="PosAmt"> <value xml:lang="en">AMT</value> <value xml:lang="es">Precio</value> <value xml:lang="fr">Prix</value> @@ -50,7 +35,7 @@ <value xml:lang="ro">IMP</value> <value xml:lang="zh">éé¢</value> </property> - <property key="AUTHCD"> + <property key="PosAuthCd"> <value xml:lang="en">Enter Auth Code:</value> <value xml:lang="es">Ingrese el código secreto :</value> <value xml:lang="fr">Entrez le code secret :</value> @@ -58,7 +43,7 @@ <value xml:lang="ro">Introduceti Codul de Autorizatie:</value> <value xml:lang="zh">è¾å ¥ææç :</value> </property> - <property key="CASH"> + <property key="PosCash"> <value xml:lang="en">CASH</value> <value xml:lang="es">CONTADO</value> <value xml:lang="fr">Espèces</value> @@ -66,7 +51,7 @@ <value xml:lang="ro">Numerar</value> <value xml:lang="zh">ç°é</value> </property> - <property key="CHANGE"> + <property key="PosChange"> <value xml:lang="en">Change Due:</value> <value xml:lang="es">Cambio :</value> <value xml:lang="fr">A rendre :</value> @@ -74,7 +59,7 @@ <value xml:lang="ro">Schimb Valutar:</value> <value xml:lang="zh">æ¾é¶:</value> </property> - <property key="CHECK"> + <property key="PosCheck"> <value xml:lang="en">CHECK</value> <value xml:lang="es">CHEQUE</value> <value xml:lang="fr">Chèque(s)</value> @@ -82,7 +67,41 @@ <value xml:lang="ro">CEC</value> <value xml:lang="zh">æ¯ç¥¨</value> </property> - <property key="CREDCF"> + <property key="PosClerk"> + <value xml:lang="en">Clerk:</value> + <value xml:lang="es">Empleado</value> + <value xml:lang="fr">Vendeur :</value> + <value xml:lang="it">Impieg.:</value> + <value xml:lang="ro">Ang:</value> + <value xml:lang="zh">æ¶é¶å:</value> + </property> + <property key="PosConfigureItem"> + <value xml:lang="en">Item Configuration</value> + <value xml:lang="fr">Configuration de l'article</value> + <value xml:lang="it">Riga configurazione</value> + </property> + <property key="PosCreateOrChooseReasonInOut"> + <value xml:lang="en">You have to create or choose a reason</value> + <value xml:lang="fr">Vous devez créer ou choisir le motif de ce mouvement de caisse</value> + <value xml:lang="it">Tu devi creare o scegliere una motivazione</value> + </property> + <property key="PosCredNo"> + <value xml:lang="en">Enter Card Number:</value> + <value xml:lang="es">Ingrese número de tarjeta :</value> + <value xml:lang="fr">Entrez le n° de la carte :</value> + <value xml:lang="it">Inserire Numero Carta:</value> + <value xml:lang="ro">Introduceti Numarul Cartii:</value> + <value xml:lang="zh">è¾å ¥å¡å·:</value> + </property> + <property key="PosCredZp"> + <value xml:lang="en">Enter Billing ZipCode:</value> + <value xml:lang="es">Ingrese código postal de facturación</value> + <value xml:lang="fr">Entrez le code postal de facturation :</value> + <value xml:lang="it">Inserire C.A.P. Fatturazione:</value> + <value xml:lang="ro">Introduceti zipCod Facturare:</value> + <value xml:lang="zh">è¾å ¥è´¦åé®æ¿ç¼ç :</value> + </property> + <property key="PosCredcf"> <value xml:lang="en">Enter Last 4 Digits:</value> <value xml:lang="es">Ingrese los últimos 4 dÃgitos</value> <value xml:lang="fr">Entrez les 4 derniers chiffres :</value> @@ -90,7 +109,7 @@ <value xml:lang="ro">Introduceti ultimale 4 Numere:</value> <value xml:lang="zh">è¾å ¥æå4ä½å¡å·:</value> </property> - <property key="CREDEX"> + <property key="PosCredex"> <value xml:lang="en">Enter Expiration Date (MMYY):</value> <value xml:lang="es">Ingrese fecha de expiración (MMYY)</value> <value xml:lang="fr">Entrez la date d'expiration (MMYY):</value> @@ -98,7 +117,7 @@ <value xml:lang="ro">Introduceti Data Expirarii (LLAA):</value> <value xml:lang="zh">è¾å ¥å°ææ¥ (MMYY):</value> </property> - <property key="CREDIT_CARD"> + <property key="PosCreditCard"> <value xml:lang="en">CREDIT CARD</value> <value xml:lang="es">TARJETA DE CRÃDITO</value> <value xml:lang="fr">Carte(s) de crédit</value> @@ -106,31 +125,7 @@ <value xml:lang="ro">CARTE DE CREDIT</value> <value xml:lang="zh">ä¿¡ç¨å¡</value> </property> - <property key="CREDNO"> - <value xml:lang="en">Enter Card Number:</value> - <value xml:lang="es">Ingrese número de tarjeta :</value> - <value xml:lang="fr">Entrez le n° de la carte :</value> - <value xml:lang="it">Inserire Numero Carta:</value> - <value xml:lang="ro">Introduceti Numarul Cartii:</value> - <value xml:lang="zh">è¾å ¥å¡å·:</value> - </property> - <property key="CREDZP"> - <value xml:lang="en">Enter Billing ZipCode:</value> - <value xml:lang="es">Ingrese código postal de facturación</value> - <value xml:lang="fr">Entrez le code postal de facturation :</value> - <value xml:lang="it">Inserire C.A.P. Fatturazione:</value> - <value xml:lang="ro">Introduceti zipCod Facturare:</value> - <value xml:lang="zh">è¾å ¥è´¦åé®æ¿ç¼ç :</value> - </property> - <property key="ConfigureItem"> - <value xml:lang="en">Item Configuration</value> - <value xml:lang="fr">Configuration de l'article</value> - </property> - <property key="CreateOrChooseReasonInOut"> - <value xml:lang="en">You have to create or choose a reason</value> - <value xml:lang="fr">Vous devez créer ou choisir le motif de ce mouvement de caisse</value> - </property> - <property key="DATE"> + <property key="PosDate"> <value xml:lang="en">DATE</value> <value xml:lang="es">FECHA</value> <value xml:lang="fr">Date</value> @@ -138,15 +133,7 @@ <value xml:lang="ro">DATA</value> <value xml:lang="zh">æ¥æ</value> </property> - <property key="DRWR"> - <value xml:lang="en">TILL</value> - <value xml:lang="es">Caja</value> - <value xml:lang="fr">Caisse</value> - <value xml:lang="it">CASSIERE</value> - <value xml:lang="ro">CASIER</value> - <value xml:lang="zh">éç®±</value> - </property> - <property key="DateFormat"> + <property key="PosDateFormat"> <value xml:lang="en">EEE MMM dd</value> <value xml:lang="es">EEE MMM dd</value> <value xml:lang="fr">EE dd MMM</value> @@ -154,13 +141,30 @@ <value xml:lang="ro">EEE MMM dd</value> <value xml:lang="zh">EEE MMM dd</value> </property> - <property key="DateTimeFormat"> + <property key="PosDateTimeFormat"> <value xml:lang="en">'the' yyyy MMMMM dd 'at' hh:mm:ss aaa</value> <value xml:lang="es">'the' yyyy MMMMM dd 'at' hh:mm:ss aaa</value> <value xml:lang="fr">'le' dd MMMMM yyyy 'à ' HH:mm:ss</value> + <value xml:lang="it">'il' yyyy MMMMM dd 'alle' hh:mm:ss aaa</value> <value xml:lang="ro">yyyy MMMMM dd 'la' hh:mm:ss aaa </value> </property> - <property key="EMPL"> + <property key="PosDraw"> + <value xml:lang="en">Dr:</value> + <value xml:lang="es">Dr.</value> + <value xml:lang="fr">Tiroir :</value> + <value xml:lang="it">Cass.:</value> + <value xml:lang="ro">Cas:</value> + <value xml:lang="zh">éç®±:</value> + </property> + <property key="PosDrwr"> + <value xml:lang="en">TILL</value> + <value xml:lang="es">Caja</value> + <value xml:lang="fr">Caisse</value> + <value xml:lang="it">CASSIERE</value> + <value xml:lang="ro">CASIER</value> + <value xml:lang="zh">éç®±</value> + </property> + <property key="PosEmpl"> <value xml:lang="en">EMPL</value> <value xml:lang="es">VENDEDOR</value> <value xml:lang="fr">Vendeur</value> @@ -168,7 +172,7 @@ <value xml:lang="ro">Angajat</value> <value xml:lang="zh">æ¶é¶å</value> </property> - <property key="ENTCAS"> + <property key="PosEntCas"> <value xml:lang="en">Enter Cash Amount:</value> <value xml:lang="es">Ingrese monto en efectivo</value> <value xml:lang="fr">Entrez le montant en espèce :</value> @@ -176,7 +180,7 @@ <value xml:lang="ro">Introduceti Valoare Numerar:</value> <value xml:lang="zh">è¾å ¥ç°éé¢:</value> </property> - <property key="ENTCHK"> + <property key="PosEntChk"> <value xml:lang="en">Enter Check Amount:</value> <value xml:lang="es">Ingrese monto en cheque</value> <value xml:lang="fr">Entrez le montant en chèque :</value> @@ -184,7 +188,7 @@ <value xml:lang="ro">Introduceti Valoare CEC:</value> <value xml:lang="zh">è¾å ¥æ¯ç¥¨é¢:</value> </property> - <property key="ENTCRC"> + <property key="PosEntCrc"> <value xml:lang="en">Enter Credit Card Amount:</value> <value xml:lang="es">Ingrese monto en tarjeta de crédito</value> <value xml:lang="fr">Entrez le montant en carte de crédit :</value> @@ -192,7 +196,7 @@ <value xml:lang="ro">Introduceti Valoare Carte de Credit:</value> <value xml:lang="zh">è¾å ¥ä¿¡ç¨å¡é¢:</value> </property> - <property key="ENTGFC"> + <property key="PosEntGfc"> <value xml:lang="en">Enter Gift Card Amount:</value> <value xml:lang="es">Ingrese monto de certificado de regalo: </value> <value xml:lang="fr">Entrez le montant en bon d'achat :</value> @@ -200,7 +204,7 @@ <value xml:lang="ro">Introduceti Valoare Carte Omagiu:</value> <value xml:lang="zh">è¾å ¥ç¤¼åå¡é¢:</value> </property> - <property key="ENTOTH"> + <property key="PosEntOth"> <value xml:lang="en">Enter Other Payment Amount:</value> <value xml:lang="es">Ingrese monto de otros pagos</value> <value xml:lang="fr">Entrez le mt en autre moyen de paiement :</value> @@ -208,10 +212,11 @@ <value xml:lang="ro">Introduceti Valoare Alte Plati:</value> <value xml:lang="zh">è¾å ¥å ¶ä»ä»æ¬¾é¢:</value> </property> - <property key="ENTPROMOCODE"> + <property key="PosEntPromoCode"> <value xml:lang="en">Enter Promo Code:</value> + <value xml:lang="it">Inserire codice promozione:</value> </property> - <property key="GIFT_CARD"> + <property key="PosGiftCard"> <value xml:lang="en">GIFT CARD</value> <value xml:lang="es">Certificado de regalo</value> <value xml:lang="fr">Bon(s) d'achat</value> @@ -219,7 +224,15 @@ <value xml:lang="ro">CARTE OMAGIU</value> <value xml:lang="zh">礼åå¡</value> </property> - <property key="GROSS_SALES"> + <property key="PosGrandTotal"> + <value xml:lang="en">Grand Total</value> + <value xml:lang="es">Gran total</value> + <value xml:lang="fr">Total</value> + <value xml:lang="it">Totale Generale</value> + <value xml:lang="ro">Total General</value> + <value xml:lang="zh">æ»è®¡</value> + </property> + <property key="PosGrossSales"> <value xml:lang="en">GROSS SALES</value> <value xml:lang="es">Total</value> <value xml:lang="fr">Total</value> @@ -227,15 +240,15 @@ <value xml:lang="ro">Valoare BRUTA-VANZARE</value> <value xml:lang="zh">æ¯éå®é¢</value> </property> - <property key="Grand_Total"> - <value xml:lang="en">Grand Total</value> - <value xml:lang="es">Gran total</value> - <value xml:lang="fr">Total</value> - <value xml:lang="it">Totale Generale</value> - <value xml:lang="ro">Total General</value> - <value xml:lang="zh">æ»è®¡</value> + <property key="PosInvalidSelection"> + <value xml:lang="en">Invalid Selection!</value> + <value xml:lang="es">Selección inválida</value> + <value xml:lang="fr">Sélection non valide !</value> + <value xml:lang="it">Selezione Non Valida!</value> + <value xml:lang="ro">Selectare InValida!</value> + <value xml:lang="zh">éæ³é项!</value> </property> - <property key="ISCLOSED"> + <property key="PosIsClosed"> <value xml:lang="en">Register Is Closed</value> <value xml:lang="es">El registro está cerrado</value> <value xml:lang="fr">Le registre est fermé.</value> @@ -243,7 +256,7 @@ <value xml:lang="ro">Registru de Casa este Inchis</value> <value xml:lang="zh">æ示çå·²å ³é</value> </property> - <property key="ISOPEN"> + <property key="PosIsOpen"> <value xml:lang="en">Register Is Open</value> <value xml:lang="es">El registro está abierto</value> <value xml:lang="fr">Le registre est ouvert.</value> @@ -251,7 +264,15 @@ <value xml:lang="ro">Registru de Casa este Deschis</value> <value xml:lang="zh">æ示çå·²æå¼</value> </property> - <property key="ITEM"> + <property key="PosItemDiscount"> + <value xml:lang="en">(Item discount)</value> + <value xml:lang="es">(Item discount)</value> + <value xml:lang="fr">Remise sur l'article</value> + <value xml:lang="it">(Item discount)</value> + <value xml:lang="ro">(Item discount)</value> + <value xml:lang="zh">(Item discount)</value> + </property> + <property key="PosItem"> <value xml:lang="en">ITEM</value> <value xml:lang="es">ITEM</value> <value xml:lang="fr">Désignation</value> @@ -259,24 +280,18 @@ <value xml:lang="ro">PRODUS</value> <value xml:lang="zh">项</value> </property> - <property key="Invalid_Selection"> - <value xml:lang="en">Invalid Selection!</value> - <value xml:lang="es">Selección inválida</value> - <value xml:lang="fr">Sélection non valide !</value> - <value xml:lang="it">Selezione Non Valida!</value> - <value xml:lang="ro">Selectare InValida!</value> - <value xml:lang="zh">éæ³é项!</value> - </property> - <property key="LoadASale"> + <property key="PosLoadASale"> <value xml:lang="en">Load a sale</value> <value xml:lang="fr">Charger une vente</value> + <value xml:lang="it">Carica una vendita</value> </property> - <property key="LoadSaleListDblClickTip"> + <property key="PosLoadSaleListDblClickTip"> <value xml:lang="en">You may use a double click to replace the current sale and delete this one</value> <value xml:lang="fr">Vous pouvez utiliser le double-clic pour remplacer la vente en cours et supprimer celle ci</value> + <value xml:lang="it">Tu devi usare un doppio click per sostituire l'attuale vendita and cancellarla</value> <value xml:lang="ro">Poti folosi dublu click pentru a rescrie vanzarea cruenta si pentru a o sterge.</value> </property> - <property key="OPDRAM"> + <property key="PosOpDrAm"> <value xml:lang="en">Starting Drawer Amount:</value> <value xml:lang="es">Monto inicial de la caja:</value> <value xml:lang="fr">Contenu initial du tiroir :</value> @@ -284,7 +299,7 @@ <value xml:lang="ro">Valoare Initiala Casierie:</value> <value xml:lang="zh">å¼å§éç®±éé¢:</value> </property> - <property key="OTHER"> + <property key="PosOther"> <value xml:lang="en">OTHER</value> <value xml:lang="es">OTROS</value> <value xml:lang="fr">Autres</value> @@ -292,7 +307,17 @@ <value xml:lang="ro">ALTE</value> <value xml:lang="zh">å ¶ä»</value> </property> - <property key="PAYFIN"> + <property key="PosPaidInTitle"> + <value xml:lang="en">Enter amount to paid in and create or choose a reason</value> + <value xml:lang="fr">Entrez le montant à remettre en caisse et créez ou choisissez un motif</value> + <value xml:lang="it">Inserire importo da pagare in ingresso e creare o scegliere una motivazione</value> + </property> + <property key="PosPaidOutTitle"> + <value xml:lang="en">Enter amount to withdraw and create or choose a reason</value> + <value xml:lang="fr">Entrez le montant à retirer et créez ou choisissez un motif</value> + <value xml:lang="it">Inserire un'importo da prelevare e crea o scegliere una motivazione</value> + </property> + <property key="PosPayFin"> <value xml:lang="en">Press Finish To Complete Sale</value> <value xml:lang="es">Presione FINISH para completar la venta</value> <value xml:lang="fr">Appuyez sur [Fin] pour terminer la vente !</value> @@ -300,19 +325,12 @@ <value xml:lang="ro">Apasa Terminare(FINISH) Pentru a Completa Vanzarea</value> <value xml:lang="zh">æå®æé®ç»æéå®</value> </property> - <property key="POSTALCODE"> + <property key="PosPostalCode"> <value xml:lang="en">Enter the billing postal code:</value> <value xml:lang="fr">Entrez le code postal :</value> + <value xml:lang="it">Inserire il codice postale di fatturazione:</value> </property> - <property key="PaidInTitle"> - <value xml:lang="en">Enter amount to paid in and create or choose a reason</value> - <value xml:lang="fr">Entrez le montant à remettre en caisse et créez ou choisissez un motif</value> - </property> - <property key="PaidOutTitle"> - <value xml:lang="en">Enter amount to withdraw and create or choose a reason</value> - <value xml:lang="fr">Entrez le montant à retirer et créez ou choisissez un motif</value> - </property> - <property key="Processing"> + <property key="PosProcessing"> <value xml:lang="en">Processing payments...</value> <value xml:lang="es">Procesando pagos...</value> <value xml:lang="fr">Traitement du paiement...</value> @@ -320,7 +338,7 @@ <value xml:lang="ro">Executie plati...</value> <value xml:lang="zh">å¤çæ¯ä»...</value> </property> - <property key="QTY"> + <property key="PosQty"> <value xml:lang="en">QTY</value> <value xml:lang="es">Cantidad</value> <value xml:lang="fr">Nb</value> @@ -328,7 +346,7 @@ <value xml:lang="ro">CANT</value> <value xml:lang="zh">件æ°</value> </property> - <property key="REFNUM"> + <property key="PosRefNum"> <value xml:lang="en">Enter Reference Number:</value> <value xml:lang="es">Ingrese número de referencia</value> <value xml:lang="fr">Entrez la référence (nombre) :</value> @@ -336,19 +354,15 @@ <value xml:lang="ro">Introduceti Numar de Referinta:</value> <value xml:lang="zh">è¾å ¥æµæ°´å·:</value> </property> - <property key="SECURITYCODE"> - <value xml:lang="en">Enter security code:</value> - <value xml:lang="fr">Entrez votre code :</value> - </property> - <property key="SKU"> - <value xml:lang="en">SKU</value> - <value xml:lang="es">SKU</value> - <value xml:lang="fr">Code</value> - <value xml:lang="it">CODICE PRODOTTO</value> - <value xml:lang="ro">COD PRODUS</value> - <value xml:lang="zh">SKU</value> + <property key="PosSalesDiscount"> + <value xml:lang="en">(Sale discount)</value> + <value xml:lang="es">(Sales discount)</value> + <value xml:lang="fr">Remise sur la vente</value> + <value xml:lang="it">(Sales discount)</value> + <value xml:lang="ro">(Sales discount)</value> + <value xml:lang="zh">(Sales discount)</value> </property> - <property key="Sales_Tax"> + <property key="PosSalesTax"> <value xml:lang="en">Sales Tax</value> <value xml:lang="es">Impuestos de ventas</value> <value xml:lang="fr">TVA</value> @@ -356,12 +370,13 @@ <value xml:lang="ro">Taxe de Vanzare</value> <value xml:lang="zh">éå®ç¨</value> </property> - <property key="SaveASale"> + <property key="PosSaveASale"> <value xml:lang="en">Save current sale</value> <value xml:lang="fr">Sauver la vente en cours</value> + <value xml:lang="it">Salvare attuale vendita</value> <value xml:lang="ro">Salveaza vanzarea curenta</value> </property> - <property key="Saving"> + <property key="PosSaving"> <value xml:lang="en">Saving sale...</value> <value xml:lang="es">Usted ahorra....</value> <value xml:lang="fr">Enregistrement de la vente...</value> @@ -369,15 +384,22 @@ <value xml:lang="ro">Salveaza vanzarea...</value> <value xml:lang="zh">ä¿åéå®...</value> </property> - <property key="SelectAProduct"> + <property key="PosSecurityCode"> + <value xml:lang="en">Enter security code:</value> + <value xml:lang="fr">Entrez votre code :</value> + <value xml:lang="it">Inserire codice sicurezza:</value> + </property> + <property key="PosSelectAProduct"> <value xml:lang="en">Select a product</value> <value xml:lang="fr">Sélectionnez un produit</value> + <value xml:lang="it">Selezionare un prodotto</value> </property> - <property key="SelectProductListDblClickTip"> + <property key="PosSelectProductListDblClickTip"> <value xml:lang="en">You may use a double click to select the current product</value> <value xml:lang="fr">Vous pouvez utiliser le double-clic pour choisir un produit</value> + <value xml:lang="it">Tu devi usare un doppio clieck per selezionare il prodotto corrente</value> </property> - <property key="Shutting_down"> + <property key="PosShuttingDown"> <value xml:lang="en">Shutting down...</value> <value xml:lang="es">Cerrando...</value> <value xml:lang="fr">Arrêt en cours...</value> @@ -385,7 +407,23 @@ <value xml:lang="ro">Inchidere...</value> <value xml:lang="zh">å ³é...</value> </property> - <property key="TOTAL"> + <property key="PosSku"> + <value xml:lang="en">SKU</value> + <value xml:lang="es">SKU</value> + <value xml:lang="fr">Code</value> + <value xml:lang="it">CODICE PRODOTTO</value> + <value xml:lang="ro">COD PRODUS</value> + <value xml:lang="zh">SKU</value> + </property> + <property key="PosTerm"> + <value xml:lang="en">Term:</value> + <value xml:lang="es">Terminal:</value> + <value xml:lang="fr">Terminal :</value> + <value xml:lang="it">Termine:</value> + <value xml:lang="ro">Term:</value> + <value xml:lang="zh">ç»ç«¯:</value> + </property> + <property key="PosTotal"> <value xml:lang="en">TOTAL</value> <value xml:lang="es">Total</value> <value xml:lang="fr">Total</value> @@ -393,7 +431,7 @@ <value xml:lang="ro">TOTAL</value> <value xml:lang="zh">å计</value> </property> - <property key="TOTALD"> + <property key="PosTotalD"> <value xml:lang="en">Total Due:</value> <value xml:lang="es">Total debido:</value> <value xml:lang="fr">Total dû :</value> @@ -401,7 +439,15 @@ <value xml:lang="ro">Total(dovuto)?:</value> <value xml:lang="zh">å计é¢:</value> </property> - <property key="TXID"> + <property key="PosTotalReport"> + <value xml:lang="en">TOTALS REPORT</value> + <value xml:lang="es">REPORTE TOTAL:</value> + <value xml:lang="fr">TOTAUX</value> + <value xml:lang="it">TOTALI STAMPA</value> + <value xml:lang="ro">TOTAL REPORT</value> + <value xml:lang="zh">å计æ¥è¡¨</value> + </property> + <property key="PosTxId"> <value xml:lang="en">TXID</value> <value xml:lang="es">Número de venta</value> <value xml:lang="fr">N°vente</value> @@ -409,7 +455,7 @@ <value xml:lang="ro">IDTAX</value> <value xml:lang="zh">交æå·</value> </property> - <property key="ULOGIN"> + <property key="PosULogin"> <value xml:lang="en">Enter User ID:</value> <value xml:lang="es">Ingrese su login:</value> <value xml:lang="fr">Entrez votre identifiant :</value> @@ -417,7 +463,7 @@ <value xml:lang="ro">Introduceti Id Utilizator:</value> <value xml:lang="zh">è¾å ¥ç¨æ· ID:</value> </property> - <property key="UPASSW"> + <property key="PosUPassw"> <value xml:lang="en">Enter Password:</value> <value xml:lang="es">Ingrese password</value> <value xml:lang="fr">Entrez votre mot de passe :</value> @@ -425,7 +471,7 @@ <value xml:lang="ro">Introduceti Parola:</value> <value xml:lang="zh">è¾å ¥å£ä»¤:</value> </property> - <property key="UserNotmanager"> + <property key="PosUserNotManager"> <value xml:lang="en">User is not a valid manager!</value> <value xml:lang="es">El usuario no es administrador válido</value> <value xml:lang="fr">Cet utilisateur n'est pas un gérant !</value> @@ -433,7 +479,7 @@ <value xml:lang="ro">Utilizatorul nu este un manager valid!</value> <value xml:lang="zh">ç¨æ·éåæ³ç®¡çå!</value> </property> - <property key="VOID"> + <property key="PosVoid"> <value xml:lang="en">Enter Order Number To Void:</value> <value xml:lang="es">Ingrese número de orden a anular</value> <value xml:lang="fr">Entrez le n° d'ordre à annuler :</value> @@ -441,7 +487,7 @@ <value xml:lang="ro">Introduceti Numarul Comenzii de Descarcat:</value> <value xml:lang="zh">è¾å ¥è¦ä½åºç订åå·:</value> </property> - <property key="Validating"> + <property key="PosValidating"> <value xml:lang="en">Validating...</value> <value xml:lang="es">Validando...</value> <value xml:lang="fr">Validation...</value> @@ -449,7 +495,7 @@ <value xml:lang="ro">Validare...</value> <value xml:lang="zh">确认...</value> </property> - <property key="WaitingFinalSales"> + <property key="PosWaitingFinalSales"> <value xml:lang="en">Waiting for final sales data transmission...</value> <value xml:lang="es">Esperando transmisión de datos...</value> <value xml:lang="fr">En attente de transmission de données ...</value> @@ -457,36 +503,4 @@ <value xml:lang="ro">Asteptare pentru transmiterea datelor de vanzare finale...</value> <value xml:lang="zh">çå¾ æç»éå®æ°æ®ä¼ è¾...</value> </property> - <property key="clerk"> - <value xml:lang="en">Clerk:</value> - <value xml:lang="es">Empleado</value> - <value xml:lang="fr">Vendeur :</value> - <value xml:lang="it">Impieg.:</value> - <value xml:lang="ro">Ang:</value> - <value xml:lang="zh">æ¶é¶å:</value> - </property> - <property key="draw"> - <value xml:lang="en">Dr:</value> - <value xml:lang="es">Dr.</value> - <value xml:lang="fr">Tiroir :</value> - <value xml:lang="it">Cass.:</value> - <value xml:lang="ro">Cas:</value> - <value xml:lang="zh">éç®±:</value> - </property> - <property key="term"> - <value xml:lang="en">Term:</value> - <value xml:lang="es">Terminal:</value> - <value xml:lang="fr">Terminal :</value> - <value xml:lang="it">Termine:</value> - <value xml:lang="ro">Term:</value> - <value xml:lang="zh">ç»ç«¯:</value> - </property> - <property key="total_report"> - <value xml:lang="en">TOTALS REPORT</value> - <value xml:lang="es">REPORTE TOTAL:</value> - <value xml:lang="fr">TOTAUX</value> - <value xml:lang="it">TOTALI STAMPA</value> - <value xml:lang="ro">TOTAL REPORT</value> - <value xml:lang="zh">å计æ¥è¡¨</value> - </property> </resource> 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=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Fri Jan 16 13:03:44 2009 @@ -240,7 +240,7 @@ itemInfo.put("adjustments", ""); if (item.getOtherAdjustments().compareTo(BigDecimal.ZERO) != 0) { itemInfo.put("itemDiscount", UtilFormatOut.padString( - UtilProperties.getMessage(PosTransaction.resource,"(ItemDiscount)",defaultLocale), Receipt.pridLength[0] + 1, true, ' ')); + UtilProperties.getMessage(PosTransaction.resource,"PosItemDiscount",defaultLocale), Receipt.pridLength[0] + 1, true, ' ')); itemInfo.put("adjustments", UtilFormatOut.formatPrice(item.getOtherAdjustments().doubleValue())); } @@ -788,14 +788,14 @@ cart.setOrderPartyId(partyId); // validate payment methods - output.print(UtilProperties.getMessage(PosTransaction.resource,"Validating",defaultLocale)); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosValidating",defaultLocale)); Map valRes = ch.validatePaymentMethods(); if (valRes != null && ServiceUtil.isError(valRes)) { throw new GeneralException(ServiceUtil.getErrorMessage(valRes)); } // store the "order" - output.print(UtilProperties.getMessage(PosTransaction.resource,"Saving",defaultLocale)); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosSaving",defaultLocale)); Map orderRes = ch.createOrder(session.getUserLogin()); //Debug.log("Create Order Resp : " + orderRes, module); @@ -806,7 +806,7 @@ } // process the payment(s) - output.print(UtilProperties.getMessage(PosTransaction.resource,"Processing",defaultLocale)); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosProcessing",defaultLocale)); Map payRes = null; try { payRes = ch.processPayment(ProductStoreWorker.getProductStore(productStoreId, session.getDelegator()), session.getUserLogin(), true); @@ -823,7 +823,7 @@ BigDecimal change = grandTotal.subtract(paymentAmt); // notify the change due - output.print(UtilProperties.getMessage(PosTransaction.resource,"CHANGE",defaultLocale) + " " + UtilFormatOut.formatPrice(this.getTotalDue().negate().doubleValue())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosChange",defaultLocale) + " " + UtilFormatOut.formatPrice(this.getTotalDue().negate().doubleValue())); // threaded drawer/receipt printing final PosTransaction currentTrans = this; @@ -927,7 +927,7 @@ // append the promo info XModel promo = Journal.appendNode(model, "tr", "itemadjustment", ""); Journal.appendNode(promo, "td", "sku", ""); - Journal.appendNode(promo, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"(ItemDiscount)",defaultLocale)); + Journal.appendNode(promo, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"PosItemDiscount",defaultLocale)); Journal.appendNode(promo, "td", "qty", ""); Journal.appendNode(promo, "td", "price", UtilFormatOut.formatPrice(adjustment.doubleValue())); } @@ -966,7 +966,7 @@ XModel adjustmentLine = Journal.appendNode(model, "tr", "adjustment", ""); Journal.appendNode(adjustmentLine, "td", "sku", ""); Journal.appendNode(adjustmentLine, "td", "desc", - UtilProperties.getMessage(PosTransaction.resource, "(SalesDiscount)",defaultLocale)); + UtilProperties.getMessage(PosTransaction.resource, "PosSalesDiscount",defaultLocale)); if (UtilValidate.isNotEmpty(amount)) { Journal.appendNode(adjustmentLine, "td", "qty", ""); Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount.doubleValue())); @@ -983,14 +983,14 @@ XModel taxLine = Journal.appendNode(model, "tr", "tax", ""); Journal.appendNode(taxLine, "td", "sku", ""); - Journal.appendNode(taxLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"Sales_Tax",defaultLocale)); + Journal.appendNode(taxLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"PosSalesTax",defaultLocale)); Journal.appendNode(taxLine, "td", "qty", ""); Journal.appendNode(taxLine, "td", "price", UtilFormatOut.formatPrice(taxAmount.doubleValue())); Journal.appendNode(taxLine, "td", "index", "-1"); XModel totalLine = Journal.appendNode(model, "tr", "total", ""); Journal.appendNode(totalLine, "td", "sku", ""); - Journal.appendNode(totalLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"Grand_Total",defaultLocale)); + Journal.appendNode(totalLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"PosGrandTotal",defaultLocale)); Journal.appendNode(totalLine, "td", "qty", ""); Journal.appendNode(totalLine, "td", "price", UtilFormatOut.formatPrice(total.doubleValue())); Journal.appendNode(totalLine, "td", "index", "-1"); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Fri Jan 16 13:03:44 2009 @@ -44,7 +44,7 @@ protected XProject currentProject = (XProject)XProjectManager.getCurrentProject(); private static String[] field = { "sku", "desc", "qty", "price" }; - private static String[] name = { "SKU", "ITEM", "QTY", "AMT" }; + private static String[] name = { "PosSku", "PosItem", "PosQty", "PosAmt" }; private static int[] width = { 100, 170, 50, 90}; private Locale defaultLocale = Locale.getDefault(); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java Fri Jan 16 13:03:44 2009 @@ -49,7 +49,7 @@ public static final String[] OPER_TXID = { "oper_txid", "TXID" }; public static final String[] OPER_DRWR = { "oper_drwr", "DRAWER" }; - public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"DateFormat",Locale.getDefault())); + public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"PosDateFormat",Locale.getDefault())); protected Component[] operatorField = null; protected XStyle titleStyle = null; protected XPanel operPanel = null; @@ -131,15 +131,15 @@ protected String getFieldTitle(String fieldName) { if (OPER_TOTAL[0].equals(fieldName)) { - return UtilProperties.getMessage(PosTransaction.resource,"TOTAL",defaultLocale); + return UtilProperties.getMessage(PosTransaction.resource,"PosTotal",defaultLocale); } else if (OPER_DATE[0].equals(fieldName)) { - return UtilProperties.getMessage(PosTransaction.resource,"DATE",defaultLocale); + return UtilProperties.getMessage(PosTransaction.resource,"PosDate",defaultLocale); } else if (OPER_EMPL[0].equals(fieldName)) { - return UtilProperties.getMessage(PosTransaction.resource,"EMPL",defaultLocale); + return UtilProperties.getMessage(PosTransaction.resource,"PosEmpl",defaultLocale); } else if (OPER_TXID[0].equals(fieldName)) { - return UtilProperties.getMessage(PosTransaction.resource,"TXID",defaultLocale); + return UtilProperties.getMessage(PosTransaction.resource,"PosTxId",defaultLocale); } else if (OPER_DRWR[0].equals(fieldName)) { - return UtilProperties.getMessage(PosTransaction.resource,"DRWR",defaultLocale); + return UtilProperties.getMessage(PosTransaction.resource,"PosDrwr",defaultLocale); } return ""; } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java Fri Jan 16 13:03:44 2009 @@ -45,12 +45,12 @@ public void setLock(boolean lock) { if (lock) { - this.print(UtilProperties.getMessage(PosTransaction.resource,"ULOGIN",defaultLocale)); + this.print(UtilProperties.getMessage(PosTransaction.resource,"PosULogin",defaultLocale)); } else { if (PosTransaction.getCurrentTx(session).isOpen()) { - this.print(UtilProperties.getMessage(PosTransaction.resource,"ISOPEN",defaultLocale)); + this.print(UtilProperties.getMessage(PosTransaction.resource,"PosIsOpen",defaultLocale)); } else { - this.print(UtilProperties.getMessage(PosTransaction.resource,"ISCLOSED",defaultLocale)); + this.print(UtilProperties.getMessage(PosTransaction.resource,"PosIsClosed",defaultLocale)); } } } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Fri Jan 16 13:03:44 2009 @@ -72,7 +72,7 @@ } if (sku == null) { - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"Invalid_Selection",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosInvalidSelection",Locale.getDefault())); pos.getJournal().refresh(pos); pos.getInput().clear(); } @@ -146,7 +146,7 @@ } else { input.clear(); input.setFunction("OPEN"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"OPDRAM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosOpDrAm",Locale.getDefault())); return; } } else { @@ -192,19 +192,19 @@ } switch (closeInfo.length) { case 0: - output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTCAS",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntCas",Locale.getDefault())); break; case 1: - output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTCHK",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntChk",Locale.getDefault())); break; case 2: - output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTCRC",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntCrc",Locale.getDefault())); break; case 3: - output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTGFC",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntGfc",Locale.getDefault())); break; case 4: - output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTOTH",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntOth",Locale.getDefault())); break; case 5: GenericValue state = trans.getTerminalState(); @@ -233,7 +233,7 @@ } // print the totals report - output.print(UtilProperties.getMessage(PosTransaction.resource,"WaitingFinalSales",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosWaitingFinalSales",Locale.getDefault())); //pos.showDialog("dialog/error/terminalclosed"); JLR 14/11/06 : Pb with that don't know why, useless => commented out printTotals(pos, state, true); @@ -268,7 +268,7 @@ trans.popDrawer(); input.clear(); input.setFunction("CLOSE"); - output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTCAS",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntCas",Locale.getDefault())); } } @@ -344,7 +344,7 @@ } } else { input.setFunction("VOID"); - output.print(UtilProperties.getMessage(PosTransaction.resource,"VOID",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosVoid",Locale.getDefault())); } } @@ -389,7 +389,7 @@ if (!mgrLoggedIn) { pos.showDialog("dialog/error/mgrnotloggedin"); } else { - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"Shutting_down",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosShuttingDown",Locale.getDefault())); PosTransaction.getCurrentTx(pos.getSession()).closeTx(); System.exit(0); } @@ -528,18 +528,18 @@ String reportTemplate = "totals.txt"; // miscellaneous - reportMap.put("term", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"term",Locale.getDefault()), 20, false, ' ')); - reportMap.put("draw", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"draw",Locale.getDefault()), 20, false, ' ')); - reportMap.put("clerk", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"clerk",Locale.getDefault()), 20, false, ' ')); - reportMap.put("total_report", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"total_report",Locale.getDefault()), 20, false, ' ')); + reportMap.put("term", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosTerm",Locale.getDefault()), 20, false, ' ')); + reportMap.put("draw", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosDraw",Locale.getDefault()), 20, false, ' ')); + reportMap.put("clerk", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosClerk",Locale.getDefault()), 20, false, ' ')); + reportMap.put("total_report", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosTotalReport",Locale.getDefault()), 20, false, ' ')); // titles - reportMap.put("cashTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"CASH",Locale.getDefault()), 20, false, ' ')); - reportMap.put("checkTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"CHECK",Locale.getDefault()), 20, false, ' ')); - reportMap.put("giftCardTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"GIFT_CARD",Locale.getDefault()), 20, false, ' ')); - reportMap.put("creditCardTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"CREDIT_CARD",Locale.getDefault()), 20, false, ' ')); - reportMap.put("otherTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"OTHER",Locale.getDefault()), 20, false, ' ')); - reportMap.put("grossSalesTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"GROSS_SALES",Locale.getDefault()), 20, false, ' ')); + reportMap.put("cashTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosCash",Locale.getDefault()), 20, false, ' ')); + reportMap.put("checkTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosCheck",Locale.getDefault()), 20, false, ' ')); + reportMap.put("giftCardTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosGiftCard",Locale.getDefault()), 20, false, ' ')); + reportMap.put("creditCardTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosCreditCard",Locale.getDefault()), 20, false, ' ')); + reportMap.put("otherTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosOther",Locale.getDefault()), 20, false, ' ')); + reportMap.put("grossSalesTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosGrossSales",Locale.getDefault()), 20, false, ' ')); reportMap.put("+/-", UtilFormatOut.padString("+/-", 20, false, ' ')); reportMap.put("spacer", UtilFormatOut.padString("", 20, false, ' ')); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Fri Jan 16 13:03:44 2009 @@ -67,7 +67,7 @@ } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) { if (ckInfo == null) { input.setFunction("CHECK"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault())); return; } else { processExternalPayment(pos, "PERSONAL_CHECK", ckInfo[1]); @@ -92,7 +92,7 @@ } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) { if (gcInfo == null) { input.setFunction("GIFTCARD"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault())); clearInputPaymentFunctions(pos); return; } else { @@ -124,7 +124,7 @@ } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) { if (crtInfo == null) { input.setFunction("CREDIT"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault())); return; } else { processExternalPayment(pos, "CREDIT_CARD", crtInfo[1]); @@ -138,7 +138,7 @@ input.clearLastFunction(); input.setFunction("TOTAL"); input.setFunction("CREDIT"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"CREDNO",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredNo",Locale.getDefault())); } else { Debug.log("Credit Func Info : " + crtInfo[1], module); if (msrInfo == null && (creditExpirationInfo == null)) { @@ -147,7 +147,7 @@ input.clearLastFunction(); input.setFunction("CREDIT"); input.setFunction("CREDITEXP"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"CREDEX",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredex",Locale.getDefault())); } else { Debug.log("Invalid card number - " + input.value(), module); clearInputPaymentFunctions(pos); @@ -161,7 +161,7 @@ input.clearLastFunction(); input.setFunction("CREDITEXP"); input.setFunction("SECURITYCODE"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"SECURITYCODE",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosSecurityCode",Locale.getDefault())); } else { Debug.log("Invalid expiration date", module); clearInputPaymentFunctions(pos); @@ -176,7 +176,7 @@ input.clearLastFunction(); input.setFunction("SECURITYCODE"); input.setFunction("POSTALCODE"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"POSTALCODE",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosPostalCodePosProcessing",Locale.getDefault())); } else { clearInputPaymentFunctions(pos); input.clearInput(); @@ -244,12 +244,12 @@ pos.refresh(); break; case 1: // card number only found - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"CREDEX",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredex",Locale.getDefault())); break; default: Debug.log("Hit the default switch case [" + allInfo + "] refreshing.", module); input.clearFunction("MSRINFO"); - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"CREDNO",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredNo",Locale.getDefault())); break; } } @@ -277,7 +277,7 @@ Input input = pos.getInput(); String refNum = input.value(); if (refNum == null) { - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault())); return; } input.clearInput(); @@ -330,7 +330,7 @@ if (UtilValidate.isNotEmpty(idx) && UtilValidate.isEmpty(sku)) { String refNum = pos.getInput().value(); if (UtilValidate.isEmpty(refNum)) { - pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault())); pos.getInput().setFunction("REFNUM"); } else { int index = -1; @@ -352,7 +352,7 @@ public static synchronized void processSale(PosScreen pos) { pos.setWaitCursor(); PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession()); - PosScreen.currentScreen.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"Processing",Locale.getDefault())); + PosScreen.currentScreen.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosProcessing",Locale.getDefault())); if (trans.isEmpty()) { PosScreen newPos = pos.showPage("pospanel"); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java Fri Jan 16 13:03:44 2009 @@ -43,7 +43,7 @@ if (lastFunc == null || !"PROMOCODE".equals(lastFunc[0])) { Output output = pos.getOutput(); input.setFunction("PROMOCODE"); - output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTPROMOCODE",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntPromoCode",Locale.getDefault())); } else if ("PROMOCODE".equals(lastFunc[0])) { String promoCode = input.value(); if (UtilValidate.isNotEmpty(promoCode)) { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java Fri Jan 16 13:03:44 2009 @@ -87,11 +87,11 @@ String text = input.value(); if (func != null && func[0].equals(loginFunc)) { if (UtilValidate.isEmpty(func[1]) && UtilValidate.isEmpty(text)) { - output.print(UtilProperties.getMessage(PosTransaction.resource,"ULOGIN",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosULogin",Locale.getDefault())); input.setFunction(loginFunc); input.setPasswordInput( false); } else if (UtilValidate.isEmpty(func[1])) { - output.print(UtilProperties.getMessage(PosTransaction.resource,"UPASSW",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosUPassw",Locale.getDefault())); input.setFunction(loginFunc); input.setPasswordInput( true); } else { @@ -106,7 +106,7 @@ } catch (XuiSession.UserLoginFailure e) { input.clear(); input.setFunction(loginFunc); - output.print(e.getMessage() + " " + UtilProperties.getMessage(PosTransaction.resource,"ULOGIN",Locale.getDefault())); + output.print(e.getMessage() + " " + UtilProperties.getMessage(PosTransaction.resource,"PosULogin",Locale.getDefault())); } if (passed) { input.clear(); @@ -125,7 +125,7 @@ if (mgrUl != null) { boolean isMgr = session.hasRole(mgrUl, "MANAGER"); if (!isMgr) { - output.print(UtilProperties.getMessage(PosTransaction.resource,"UserNotmanager",Locale.getDefault())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosUserNotManager",Locale.getDefault())); input.clear(); } else { ManagerEvents.mgrLoggedIn = true; Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Fri Jan 16 13:03:44 2009 @@ -83,7 +83,7 @@ // cache must be set to false because there's no method to remove actionhandlers m_dialog = (XDialog) pageMgr.loadPage( m_pos.getScreenLocation() + "/dialog/ConfigureItem", false); - m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "ConfigureItem", Locale.getDefault())); + m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosConfigureItem", Locale.getDefault())); m_optionListPane = (XScrollPane) m_dialog.findComponent("optionListPane"); m_configList = (XList) m_dialog.findComponent("configList"); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java Fri Jan 16 13:03:44 2009 @@ -66,7 +66,7 @@ public void openDlg() { m_dialog = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/loadsale"); - m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "LoadASale", Locale.getDefault())); + m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosLoadASale", Locale.getDefault())); m_salesList = (XList) m_dialog.findComponent("salesList"); XEventHelper.addMouseHandler(this, m_salesList, "saleDoubleClick"); @@ -92,7 +92,7 @@ m_salesList.setVisibleRowCount(-1); m_salesList.ensureIndexIsVisible(m_salesList.getItemCount()); m_salesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - m_salesList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "LoadSaleListDblClickTip", Locale.getDefault())); + m_salesList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosLoadSaleListDblClickTip", Locale.getDefault())); m_dialog.pack(); m_salesList.requestFocusInWindow(); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java Fri Jan 16 13:03:44 2009 @@ -97,14 +97,14 @@ m_comboModel = new DefaultComboBoxModel(); List<GenericValue> posPaidReasons = FastList.newInstance(); if (m_type.equals("IN")) { - m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PaidInTitle", locale)); + m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosPaidInTitle", locale)); try { posPaidReasons = m_trans.getSession().getDelegator().findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "POS_PAID_REASON_IN")); } catch (GenericEntityException e) { Debug.logError(e, module); } } else { // OUT - m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PaidOutTitle", locale)); + m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosPaidOutTitle", locale)); try { posPaidReasons = m_trans.getSession().getDelegator().findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "POS_PAID_REASON_OUT")); } catch (GenericEntityException e) { @@ -114,7 +114,7 @@ m_comboModel.addElement(reason.get("description", locale)); } m_reasonCombo.setModel(m_comboModel); - m_reasonCombo.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "CreateOrChooseReasonInOut", locale)); + m_reasonCombo.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosCreateOrChooseReasonInOut", locale)); m_dialog.pack(); m_reasonCombo.requestFocusInWindow(); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Fri Jan 16 13:03:44 2009 @@ -216,25 +216,25 @@ operator.refresh(); if (updateOutput) { if (input.isFunctionSet("PAID")) { - output.print(UtilProperties.getMessage(PosTransaction.resource,"CHANGE",defaultLocale) + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosChange",defaultLocale) + UtilFormatOut.formatPrice(trans.getTotalDue().negate().doubleValue())); } else if (input.isFunctionSet("TOTAL")) { if (trans.getTotalDue().compareTo(BigDecimal.ZERO) > 0) { - output.print(UtilProperties.getMessage(PosTransaction.resource,"TOTALD",defaultLocale) + " " + UtilFormatOut.formatPrice(trans.getTotalDue().doubleValue())); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosTotalD",defaultLocale) + " " + UtilFormatOut.formatPrice(trans.getTotalDue().doubleValue())); } else { - output.print(UtilProperties.getMessage(PosTransaction.resource,"PAYFIN",defaultLocale)); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosPayFin",defaultLocale)); } } else { if (PosTransaction.getCurrentTx(session).isOpen()) { - output.print(UtilProperties.getMessage(PosTransaction.resource,"ISOPEN",defaultLocale)); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosIsOpen",defaultLocale)); } else { - output.print(UtilProperties.getMessage(PosTransaction.resource,"ISCLOSED",defaultLocale)); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosIsClosed",defaultLocale)); } } } //journal.focus(); } else { - output.print(UtilProperties.getMessage(PosTransaction.resource,"ULOGIN",defaultLocale)); + output.print(UtilProperties.getMessage(PosTransaction.resource,"PosULogin",defaultLocale)); //input.focus(); } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java Fri Jan 16 13:03:44 2009 @@ -52,7 +52,7 @@ // New button for Save and Print funtion protected XButton m_saveAndPrint = null; protected static PosTransaction m_trans = null; - public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"DateTimeFormat",Locale.getDefault())); + public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"PosDateTimeFormat",Locale.getDefault())); private static boolean ShowKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y"); //TODO : make getter and setter for members (ie m_*) if needed (extern calls). For that in Eclipse use Source/Generate Getters and setters @@ -67,7 +67,7 @@ m_saleName = (XEdit) m_dialog.findComponent("saleName"); //m_dialog.setM_focused(m_saleName); m_saleName.setText(m_pos.session.getUserId() + " " + sdf.format(new Date())); - m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "SaveASale", Locale.getDefault())); + m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosSaveASale", Locale.getDefault())); m_cancel = (XButton) m_dialog.findComponent("BtnCancel"); m_save = (XButton) m_dialog.findComponent("BtnSave"); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java?rev=735131&r1=735130&r2=735131&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java Fri Jan 16 13:03:44 2009 @@ -64,7 +64,7 @@ public String openDlg() { XDialog dlg = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/SelectProduct"); m_dialog = dlg; - dlg.setCaption(UtilProperties.getMessage(PosTransaction.resource, "SelectAProduct", Locale.getDefault())); + dlg.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosSelectAProduct", Locale.getDefault())); //dlg.setModal(true); m_productsList = (XList) dlg.findComponent("productsList"); XEventHelper.addMouseHandler(this, m_productsList, "DoubleClick"); @@ -86,7 +86,7 @@ m_productsList.setVisibleRowCount(-1); m_productsList.ensureIndexIsVisible(m_productsList.getItemCount()); m_productsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - m_productsList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "SelectProductListDblClickTip", Locale.getDefault())); + m_productsList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosSelectProductListDblClickTip", Locale.getDefault())); dlg.pack(); dlg.showDialog(this); |
Free forum by Nabble | Edit this page |