Loading... |
Reply to author |
Edit post |
Move post |
Delete this post |
Delete this post and replies |
Change post date |
Print post |
Permalink |
Raw mail |
1081 posts
|
Modified: ofbiz/branches/20111205EmailHandling/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/order/config/OrderErrorUiLabels.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/order/config/OrderErrorUiLabels.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/order/config/OrderErrorUiLabels.xml Mon Mar 26 20:56:02 2012 @@ -2040,6 +2040,7 @@ <value xml:lang="zh_TW">ç²å¾è¨å®æç´°è¨éæåºç¾åé¡</value> </property> <property key="OrderProblemGettingProductStoreRecords"> + <value xml:lang="de">Problem beim lesen der Laden-Informationen</value> <value xml:lang="en">Problem getting ProductStore records</value> <value xml:lang="es">Hay un problema al obtener entradas de tienda</value> <value xml:lang="fr">Problème à l'obtention des données du centre de profit</value> @@ -2051,6 +2052,7 @@ <value xml:lang="zh_TW">ç²å¾ç¢ååºéªè¨éæåºé¯</value> </property> <property key="OrderProblemGettingTheRecordIterator"> + <value xml:lang="de">Problem mit dem 'Record Iterator'</value> <value xml:lang="en">Problem getting the Record Iterator</value> <value xml:lang="es">Problema obteniendo el iterador de registro</value> <value xml:lang="fr">Problème en obtenant le rapport Iterator</value> @@ -2063,6 +2065,7 @@ <value xml:lang="zh_TW">ç²å¾è¨éè¿ä»£å¨æåºç¾åé¡</value> </property> <property key="OrderProblemOccurredInTaxService"> + <value xml:lang="de">Problem beim Steuer-Serviceprogramm</value> <value xml:lang="en">Problem occurred in tax service</value> <value xml:lang="es">Problema ocurrido en servicio de impuestos</value> <value xml:lang="fr">Problème est arrivé dans le service fiscal</value> @@ -2075,6 +2078,7 @@ <value xml:lang="zh_TW">ç¨ åæåéç¼çåé¡</value> </property> <property key="OrderProblemSendingEmail"> + <value xml:lang="de">Problem beim senden von Email</value> <value xml:lang="en">Problem sending email</value> <value xml:lang="es">Problema enviando email</value> <value xml:lang="fr">Problème en envoyant des messages</value> @@ -2087,6 +2091,7 @@ <value xml:lang="zh_TW">ç¼éé»åéµä»¶æåºç¾åé¡</value> </property> <property key="OrderProblemStoringReceivedPaymentInformation"> + <value xml:lang="de"> Problem beim speichern von erhaltenen Zahlungeinformationen.</value> <value xml:lang="en"> Problem storing received payment information.</value> <value xml:lang="es"> Problema almacenando la información recibida del pago.</value> <value xml:lang="fr"> Problème en enregistrant les informations de paiement recus. </value> @@ -2099,6 +2104,7 @@ <value xml:lang="zh_TW"> åå²æ¥æ¶å°çæ¯ä»è³è¨æåºç¾åé¡ã</value> </property> <property key="OrderProblemStoringReturnItemUpdates"> + <value xml:lang="de">Problem beim speichern von Retourenpositionen</value> <value xml:lang="en">Problem storing ReturnItem updates</value> <value xml:lang="es">Problema almacenando actualizaciones de los Ãtems de devolución</value> <value xml:lang="fr">Problème en enregistrant les mises à jour des retours d'articles</value> @@ -2123,6 +2129,7 @@ <value xml:lang="zh_TW">æ´æ°é貨æç´° (returnItemResponseId) æåºç¾åé¡</value> </property> <property key="OrderProblemWithEntityLookup"> + <value xml:lang="de">Problem beim lesen von der Datenbank</value> <value xml:lang="en">Problem with entity lookup</value> <value xml:lang="es">Problema con la consulta de entidades</value> <value xml:lang="fr">Problème avec la consultation d'entités</value> @@ -2135,6 +2142,7 @@ <value xml:lang="zh_TW">æ¥æ¾å¯¦é«æåºç¾åé¡</value> </property> <property key="OrderProblemWithEntityLookupSeeErrorLog"> + <value xml:lang="de">Problem beim lesen von der Datenbank, siehe Error-Log</value> <value xml:lang="en">Problem with entity lookup, see error log</value> <value xml:lang="es">Problema con la consulta de entidades, observe los registros de errores</value> <value xml:lang="fr">Problème avec la consultation d'entités, regardez les logs d'erreurs</value> @@ -2147,6 +2155,7 @@ <value xml:lang="zh_TW">æ¥æ¾å¯¦é«äºåºç¾åé¡ï¼åè¦é¯èª¤æ¥èª</value> </property> <property key="OrderProblemWithInvoiceCreationDigitalItemsNotFulfilled"> + <value xml:lang="de">Problem bei der Rechnungserstellung; Digitale Artikel konnten nicht ausgeliefert werden. </value> <value xml:lang="en">Problem with invoice creation; digital items not fulfilled. </value> <value xml:lang="es">Problema con la creación de una factura; artÃculos digitales no realizados</value> <value xml:lang="fr">Problème avec la création d'une facture; articles digitaux non accomplis. </value> @@ -2159,6 +2168,7 @@ <value xml:lang="zh_TW">åµå»ºç¼ç¥¨æåºç¾åé¡ï¼æ¸åæç´°æ²æå·è¡ã </value> </property> <property key="OrderProblemWithInvoiceCreationServiceItems"> + <value xml:lang="de">Problem bei der Rechnungserstellung mit Service-Positionen</value> <value xml:lang="en">Problem with invoice creation service items</value> <value xml:lang="fr">Problème dans la génération de la facture sur les lignes de service</value> <value xml:lang="it">Problema con il servizio di creazione righe fattura</value> @@ -2167,6 +2177,7 @@ <value xml:lang="zh_TW">é¨ç¼ç¥¨åµå»ºæåæç´°æåºé¯</value> </property> <property key="OrderProblemsAddingItemFromListToCart"> + <value xml:lang="de">Problem beim hinzufügen einer Position aus der Liste zum Warenkorb</value> <value xml:lang="en">Problems adding item from list to cart</value> <value xml:lang="es">Problemas agregando Ãtem de una lista hacia el carro</value> <value xml:lang="fr">Problèmes en ajoutant un article dans le chariot</value> @@ -2179,6 +2190,7 @@ <value xml:lang="zh_TW">ææç´°å¾å表添å å°è³¼ç©è»æåºç¾åé¡</value> </property> <property key="OrderProblemsCreatingBillingAccount"> + <value xml:lang="de">Problem bei der Erstellung des Rechnungskontos</value> <value xml:lang="en">Problems creating billing account</value> <value xml:lang="es">Problemas creando cuenta de facturación</value> <value xml:lang="fr">Problèmes en créant le compte de facturation</value> @@ -2191,11 +2203,13 @@ <value xml:lang="zh_TW">åµå»ºè³¬å®è³¬æ¶æåºç¾åé¡</value> </property> <property key="OrderProblemsCreatingFinAccountForStore"> + <value xml:lang="de">Problem bei der Erstellung des Finanzkontos für den Laden</value> <value xml:lang="en">Problems creating FinAccount for Store</value> <value xml:lang="fr">Problème lors de la création du compte financier pour le magasin</value> <value xml:lang="pt_BR">Problemas ao criar FinAccount (Conta de financiamento) para loja</value> </property> <property key="OrderProblemsCreatingReturnItemResponseEntity"> + <value xml:lang="de">Problem bei der Erstellung einer Retouren-Positions-Antwort</value> <value xml:lang="en">Problems creating ReturnItemResponse entity</value> <value xml:lang="es">Problemas creando la entidad de respuesta de devolución de Ãtem</value> <value xml:lang="fr">Problèmes en créant l'entité de réponse de retour d'article</value> @@ -2208,6 +2222,7 @@ <value xml:lang="zh_TW">åµå»ºé貨æç´°åç實é«æåºç¾åé¡</value> </property> <property key="OrderProblemsGettingContactMechFromOrderContactMech"> + <value xml:lang="de">Problem beim ermitteln einer Kontaktinformation von der Auftrags-Kontaktinformation</value> <value xml:lang="en">Problems getting contact mech from order contact mech</value> <value xml:lang="es">Problemas obteniendo método de contacto del método de contacto del pedido</value> <value xml:lang="fr">Problèmes en obtenant le contact mech du contact mech de la commande</value> @@ -2220,6 +2235,7 @@ <value xml:lang="zh_TW">å¾è¨å®è¯ç³»æ¹å¼ç²å¾è¯ç³»æ¹å¼æåºç¾åé¡</value> </property> <property key="OrderProblemsGettingOrderContactMechs"> + <value xml:lang="de">Problem beim ermitteln der Auftrags-Kontaktinformation</value> <value xml:lang="en">Problems getting order contact mechs</value> <value xml:lang="es">Problemas obteniendo métodos de contacto del pedido</value> <value xml:lang="fr">Problèmes en obtenant les contact mechs de la commande</value> @@ -2232,6 +2248,7 @@ <value xml:lang="zh_TW">ç²å¾è¨å®è¯ç³»æ¹å¼æåºç¾åé¡</value> </property> <property key="OrderProblemsGettingOrderItemTypeFor"> + <value xml:lang="de">Problem bei der Ermittlung der Auftrags-Positions-Art für : ${orderItemTypeId}</value> <value xml:lang="en">Problems getting OrderItemType for : ${orderItemTypeId}</value> <value xml:lang="es">Problemas obteniendo el tipo de Ãtem de pedido para: ${orderItemTypeId}</value> <value xml:lang="fr">Problèmes en obtenant le type d'article de la commande pour : ${orderItemTypeId}</value> @@ -2244,6 +2261,7 @@ <value xml:lang="zh_TW">ç²å¾è¨å®æç´°é¡åæåºé¯ï¼${orderItemTypeId}</value> </property> <property key="OrderProblemsGettingPartyRecord"> + <value xml:lang="de">Problem beim lesen des Akteurs</value> <value xml:lang="en">Problems getting Party record</value> <value xml:lang="es">Problemas obteniendo registro de participante</value> <value xml:lang="fr">Problèmes en obtenant l'enregistrement de l'acteur</value> @@ -2256,6 +2274,7 @@ <value xml:lang="zh_TW">ç²å¾æå¡è¨éæåºç¾åé¡</value> </property> <property key="OrderProblemsGettingTheCartItemByIndex"> + <value xml:lang="de">Problem beim ermitteln der Warenkorb-Position per Index</value> <value xml:lang="en">Problems getting the cart item by index</value> <value xml:lang="es">Problemas obteniendo el Ãtem del carro por el Ãndice</value> <value xml:lang="fr">Problèmes en obtenant l'article du chariot par l'index</value> @@ -2268,6 +2287,7 @@ <value xml:lang="zh_TW">ééç´¢å¼ç²å¾è³¼ç©è»æç´°æåºç¾åé¡</value> </property> <property key="OrderProblemsInvokingTheCompleteAssignmentService"> + <value xml:lang="de">Problem beim ausführen vom gesamten Zuweisungs-Services</value> <value xml:lang="en">Problems invoking the complete assignment service</value> <value xml:lang="es">Problemas invocando el servicio completo de asignación</value> <value xml:lang="fr">Problèmes à l'invocation du service d'achèvement d'affectation</value> @@ -2280,6 +2300,7 @@ <value xml:lang="zh_TW">ååå®æåæ´¾æåæåºç¾åé¡</value> </property> <property key="OrderProblemsPaymentParsingAmount"> + <value xml:lang="de"> Probleme beim verarbeiten des Zahlungsbetrages. </value> <value xml:lang="en"> Problems payment parsing amount. </value> <value xml:lang="es"> Problemas de pago analizando monto.</value> <value xml:lang="fr"> Problèmes de paiement en faisant l'analyse syntaxique de quantité. </value> @@ -2292,6 +2313,7 @@ <value xml:lang="zh_TW"> 解ææ¯ä»éé¡æåºç¾åé¡ã </value> </property> <property key="OrderProblemsReadingOrderHeaderInformation"> + <value xml:lang="de"> Problem beim lesen des Auftragskopfes.</value> <value xml:lang="en"> Problems reading order header information.</value> <value xml:lang="es"> Problemas leyendo la información del encabezado del pedido.</value> <value xml:lang="fr"> Problèmes en lisant les informations de l'en-tête de commande</value> @@ -2304,11 +2326,13 @@ <value xml:lang="zh_TW"> è®åè¨å®é è³è¨æåºç¾åé¡ã</value> </property> <property key="OrderProblemsReadingOrderItemInformation"> + <value xml:lang="de">Fehler beim lesen der Auftragsposition: ${errorString}</value> <value xml:lang="en">Error reading the OrderItem: ${errorString}</value> <value xml:lang="fr">Erreur lors de la lecture de la ligne de commande : ${errorString}</value> <value xml:lang="it">Errore durante la lettura informazioni della riga ordine: ${errorString}</value> </property> <property key="OrderProblemsStoringOrderEmailContactInformation"> + <value xml:lang="de">Problem beim speichern der Email-Kontaktinformationen</value> <value xml:lang="en">Problems storing order email contact information</value> <value xml:lang="es">Problemas almacenando la información del contacto de email</value> <value xml:lang="fr">Problèmes en stockant les informations des contacts mail</value> @@ -2321,6 +2345,7 @@ <value xml:lang="zh_TW">åå²è¨å®é»åéµä»¶è¯ç³»è³è¨æåºç¾åé¡</value> </property> <property key="OrderProblemsWithCheckPaymentAmountForRefund"> + <value xml:lang="de">Problem mit dem Betrag der Scheckzahlung für die Rückerstattung </value> <value xml:lang="en">Problems with check payment amount for refund</value> <value xml:lang="fr">Problème avec la vérification du montant du paiement pour le remboursement</value> <value xml:lang="it">Problema nel controllo importo pagamento per reso</value> @@ -2329,6 +2354,7 @@ <value xml:lang="zh_TW">檢æ¥é款æ¯ä»éé¡æåºç¾åé¡</value> </property> <property key="OrderProblemsWithGetPartyAcctgPreferences"> + <value xml:lang="de">Problem beim lesen der Akteurs-Konteneinstellungen. </value> <value xml:lang="en">Problems with getting PartyAcctgPreference. </value> <value xml:lang="es">Hay problemas al obtener preferencias de contabilidad de participante.</value> <value xml:lang="fr">Problème à l'obtention des préférences comptabilité de l'acteur</value> @@ -2338,6 +2364,7 @@ <value xml:lang="zh_TW">ç²åæå¡åªå 使ç¨ç賬æ¶æåºç¾åé¡</value> </property> <property key="OrderProblemsWithGetReturnAmountByOrder"> + <value xml:lang="de">Problem beim ermitteln der Retourenmenge zum Auftrag</value> <value xml:lang="en">Problems with getting return amount by order</value> <value xml:lang="fr">Problème avec la récupération du montant du retour par commande</value> <value xml:lang="it">Problema nell'ottenere importo reso dell'ordine</value> @@ -2346,6 +2373,7 @@ <value xml:lang="zh_TW">æè¨å®ç²åé貨éé¡æåºç¾åé¡</value> </property> <property key="OrderProblemsWithPaymentTypeLookup"> + <value xml:lang="de">Problem mit Zahlungsart-Suchhilfe. </value> <value xml:lang="en">Problems with PaymentType lookup. </value> <value xml:lang="es">Problemas con la consulta del tipo de pago.</value> <value xml:lang="fr">Problèmes à la consultation du type de paiement. </value> @@ -2358,6 +2386,7 @@ <value xml:lang="zh_TW">æ¥æ¾æ¯ä»é¡åæåºç¾åé¡ã </value> </property> <property key="OrderProblemsWithTheRefundSeeLogs"> + <value xml:lang="de">Probleme mit Rückerstattung; siehe Logs</value> <value xml:lang="en">Problems with the refund; see logs</value> <value xml:lang="es">Problemas con el reembolso; observe los registros</value> <value xml:lang="fr">Problèmes au remboursement; voir les logs</value> @@ -2370,6 +2399,7 @@ <value xml:lang="zh_TW">é款æåºç¾åé¡ï¼åè¦æ¥èª</value> </property> <property key="OrderProductNotExist"> + <value xml:lang="de">Produkt existiert nicht</value> <value xml:lang="en">Product not exist</value> <value xml:lang="es">Producto inexistente</value> <value xml:lang="fr">Article inexistant</value> @@ -2382,6 +2412,7 @@ <value xml:lang="zh_TW">ç¢åä¸åå¨</value> </property> <property key="OrderProductNotFound"> + <value xml:lang="de">Produkt nicht gefunden ! </value> <value xml:lang="en">Product not found ! </value> <value xml:lang="es">Producto no encontrado !</value> <value xml:lang="fr">Article introuvable ! </value> @@ -2394,6 +2425,7 @@ <value xml:lang="zh_TW">ç¢åæ²ææ¾å°ï¼ </value> </property> <property key="OrderProductStoreNotExist"> + <value xml:lang="de">Laden existiert nicht</value> <value xml:lang="en">Product store not exist</value> <value xml:lang="es">Tienda inexistente</value> <value xml:lang="fr">Centre de profit inexistant</value> @@ -2406,6 +2438,7 @@ <value xml:lang="zh_TW">ç¢ååºéªä¸åå¨</value> </property> <property key="OrderQuickAddOrderItemError"> + <value xml:lang="de">Schnelles Hinzufügen von Auftragspositionen</value> <value xml:lang="en">Quick Add Order Item</value> <value xml:lang="es">Agregar rápidamente Ãtems a el pedido</value> <value xml:lang="fr">Ajout rapide d'une ligne de commande</value> @@ -2416,6 +2449,7 @@ <value xml:lang="zh_TW">å¿«éæ·»å è¨å®æç´°</value> </property> <property key="OrderQuotePercent"> + <value xml:lang="de">Angebotsprozente</value> <value xml:lang="en">Quote Percent</value> <value xml:lang="es">Porcentaje de presupuesto</value> <value xml:lang="fr">Pourcentage de devis</value> @@ -2426,26 +2460,31 @@ <value xml:lang="zh_TW">è©¢å¹ç¾åæ¯</value> </property> <property key="OrderQuoteStatusChangeIsNotValid"> + <value xml:lang="de">Die Statusänderung von ${quote.statusId} nach ${parameters.statusId} ist kein gültiger Wechsel</value> <value xml:lang="en">The status change from ${quote.statusId} to ${parameters.statusId} is not a valid change</value> <value xml:lang="fr">Le changement de statut de ${quote.statusId} à ${parameters.statusId} n'est pas autorisé</value> <value xml:lang="it">Il cambio di stato da ${quote.statusId} a ${parameters.statusId} non è consentito</value> </property> <property key="OrderQuoteNotARequest"> + <value xml:lang="de">FEHLER: Kundenanfrage ${custRequest.custRequestId} ist keine Angebotsanfrage.</value> <value xml:lang="en">ERROR: CustRequest ${custRequest.custRequestId} is not a request for quote.</value> <value xml:lang="fr">ERREUR : La demande ${custRequest.custRequestId} n'est pas prévue pour générer un devis.</value> <value xml:lang="it">ERRORE: Richiesta ${custRequest.custRequestId} non è richiesta di preventivo.</value> </property> <property key="OrderQuoteNotAWorkEffort"> + <value xml:lang="de">FEHLER: Arbeitsaufwand für Angebot ${parameters.quoteId} ${parameters.workEffortId} ist schon vorhanden.</value> <value xml:lang="en">ERROR: QuoteWorkEffort ${parameters.quoteId} ${parameters.workEffortId} already exists.</value> <value xml:lang="fr">ERREUR : La tâche de devis ${parameters.quoteId} ${parameters.workEffortId} existe déjà .</value> <value xml:lang="it">ERRORE: Impegno di lavoro ${parameters.quoteId} ${parameters.workEffortId} non è preventivo di impegno di lavoro.</value> </property> <property key="OrderQuoteWorkEffortDoesNotExists"> + <value xml:lang="de">FEHLER: Arbeitsaufwand für Angebot ${parameters.quoteId} ${parameters.workEffortId} ist nicht vorhanden.</value> <value xml:lang="en">ERROR: QuoteWorkEffort ${parameters.quoteId} ${parameters.workEffortId} does not exist.</value> <value xml:lang="fr">ERREUR : La tâche de devis ${parameters.quoteId} ${parameters.workEffortId} n'existe pas.</value> <value xml:lang="it">ERRORE: Impegno di lavoro ${parameters.quoteId} ${parameters.workEffortId} non esiste.</value> </property> <property key="OrderReceivedNullForOrderItemRecordsOrderId"> + <value xml:lang="de">Angebotsposition zu Auftrag ${orderId} ist NULL</value> <value xml:lang="en">Received NULL for OrderItem records orderId : ${orderId}</value> <value xml:lang="es">Se recibió nulo para los registros de Ãtems del pedido con código: ${orderId}</value> <value xml:lang="fr">Reception nulle pour les enregistrements d'article de la commande de l'identifiant : ${orderId}</value> @@ -2458,6 +2497,7 @@ <value xml:lang="zh_TW">æ¥æ¶å°çè¨å®IDçº ${orderId} çè¨å®æç´°è¨éæ¯ NULL</value> </property> <property key="OrderRefundAmountExceedsOrderTotal"> + <value xml:lang="de">Rückerstattungsbetrag übersteigt Auftragssumme</value> <value xml:lang="en">Refund Amount Exceeds Order Total</value> <value xml:lang="fr">Le montant de remboursement dépasse le montant de la commande</value> <value xml:lang="it">Importo restituito eccede il totale ordine</value> @@ -2466,6 +2506,7 @@ <value xml:lang="zh_TW">é款éé¡è¶ åºè¨å®ç¸½é¡</value> </property> <property key="OrderRemoveCommunicationEventOrderPermissionError"> + <value xml:lang="de">Berechtigungsfehler bei löschen eines Kommunikationsereignisses</value> <value xml:lang="en">Remove Communication Event Order Permission Error</value> <value xml:lang="fr">Vous n'êtes pas autorisé à supprimer une communication associée à une commande</value> <value xml:lang="it">Errore permesso durante la rimozione di un'evento comunicazione</value> @@ -2474,6 +2515,7 @@ <value xml:lang="zh_TW">åªé¤æºéäºä»¶æç¼çè¨å®æ¬éé¯èª¤</value> </property> <property key="OrderRentalOrderItems"> + <value xml:lang="de">Auftrag enthält Miet-Positionen, jedoch keine Arbeitsaufwände mit Start- und End-Datum mit Personen</value> <value xml:lang="en">Rental order items in the order, however no workEfforts with start/end date and number of persons</value> <value xml:lang="es">Ãtems de alquiler en el pedido</value> <value xml:lang="fr">Articles de la commande louée</value> @@ -2486,6 +2528,7 @@ <value xml:lang="zh_TW">è¨å®ä¸çç§è³è¨å®æç´°ï¼å ¶ä¸ç人工æåæ²æéå§/çµææ¥æå人å¡æ¸é</value> </property> <property key="OrderRequestedReturnQuantityNotAvailablePreviousReturnsMayExist"> + <value xml:lang="de">Geforderte Retourenmenge [ ${parameters.returnQuantity} ] ist nicht verfügbar; es könnten vorherige Retouren vorhanden sein [ ${returnableQuantity} ].</value> <value xml:lang="en">Requested return quantity [ ${parameters.returnQuantity} ] not available; previous returns may exist [ ${returnableQuantity} ].</value> <value xml:lang="es">Cantidad de devolución [ ${parameters.returnQuantity} ]no disponible; pueden existir devoluciones previas [ ${returnableQuantity} ].</value> <value xml:lang="fr">Quantité de retour demandé [ ${parameters.returnQuantity} ] non disponibles; des précédents retours peuvent exister [ ${returnableQuantity} ]. </value> @@ -2498,6 +2541,7 @@ <value xml:lang="zh_TW">è«æ±çé貨æ¸é [ ${parameters.returnQuantity} ] ç¡æï¼å¯è½åå¨ä»¥åçé貨 [ ${returnableQuantity} ]ã</value> </property> <property key="OrderReservationLengthShouldBeAPositiveNumber"> + <value xml:lang="de">Reservierungsdauer sollte eine positive Zahl sein</value> <value xml:lang="en">Reservation length should be a positive number</value> <value xml:lang="es">La longitud de la reserva deberÃa ser un número positivo</value> <value xml:lang="fr">La longueur de la réservation doit être un nombre positif</value> @@ -2510,16 +2554,19 @@ <value xml:lang="zh_TW">é å®é·åº¦æ該æ¯ä¸åæ£æ¸</value> </property> <property key="OrderReturnItemTypeIsNotDefined"> + <value xml:lang="de">Retourenpositionsart ist für diese Position nicht definiert; oder es wurde keine Zuordnung gefunden.</value> <value xml:lang="en">Return Item Type is not defined for this item; or no mapping was found.</value> <value xml:lang="fr">Le type de retour n'est pas défini pour cette ligne.</value> <value xml:lang="it">Tipo riga reso non è definita per questa riga.</value> </property> <property key="OrderReturnItemTypeOrderItemNoMatching"> + <value xml:lang="de">Keine Zuordnung der Retourenpositionsart für diese Auftragsposition gefunden: ${orderItem}</value> <value xml:lang="en">No matching return item type map found for order item: ${orderItem}</value> <value xml:lang="fr">Pas de correspondance dans le type de ligne de retour sur la ligne de commande ${orderItem}</value> <value xml:lang="it">Nessuna corrispondenza trovata fra il tipo riga reso e la riga ordine: ${orderItem}</value> </property> <property key="OrderReturnPaymentMethodNeededForThisTypeOfReturn"> + <value xml:lang="de">Es muss eine Zahlungsart für diese Retourenart festgelegt werden</value> <value xml:lang="en">A payment method must be set for this type of return</value> <value xml:lang="es">Hay que fijar un método de pago para este tipo de devolución</value> <value xml:lang="fr">Une méthode de paiement doit être bien déterminé pour ce type de retour</value> @@ -2531,6 +2578,7 @@ <value xml:lang="zh_TW">å¿ é çºéåé貨é¡åè¨ç½®æ¯ä»æ¹æ³</value> </property> <property key="OrderReturnPriceCannotExceedTheOrderTotal"> + <value xml:lang="de">Der Gesamtbetrag aller Retourenpositionen [${returnTotal}] darf nicht die Auftragssumme übersteigen [ ${orderTotal} ].</value> <value xml:lang="en">Return total of all return items [${returnTotal}] cannot exceed the order total of [ ${orderTotal} ].</value> <value xml:lang="es">El precio de retorno [ ${parameters.returnPrice} ] no puede exceder el total del pedido [ ${orderTotal} ] con todos los totales.</value> <value xml:lang="fr">Le total des retours de tous les articles [${returnTotal}] ne doit pas excéder le total de la commande de [ ${orderTotal} ].</value> @@ -2543,6 +2591,7 @@ <value xml:lang="zh_TW">å ¨é¨é貨æç´°çé貨åè¨ [${returnTotal}] ä¸è½è¶ éè¨å®åè¨ [ ${orderTotal} ]ã</value> </property> <property key="OrderReturnPriceCannotExceedThePurchasePrice"> + <value xml:lang="de">Retourenpreis [ ${parameters.returnPrice} ] darf nicht den Kaufpreis übersteigen [ ${returnablePrice} ].</value> <value xml:lang="en">Return price [ ${parameters.returnPrice} ] cannot exceed the purchase price [ ${returnablePrice} ].</value> <value xml:lang="es">El precio de retorno [ ${parameters.returnPrice} ] no puede exceder el precio de compra [ ${returnablePrice} ].</value> <value xml:lang="fr">Le prix retourné [ ${parameters.returnPrice} ] ne peut pas excéder le prix d'achat [ ${returnablePrice} ]. </value> @@ -2555,6 +2604,7 @@ <value xml:lang="zh_TW">é貨å¹æ ¼ [ ${parameters.returnPrice} ] ä¸è½è¶ é購買å¹æ ¼ [ ${returnablePrice} ]ã</value> </property> <property key="OrderReturnQuantityCannotExceedTheOrderedQuantity"> + <value xml:lang="de">Retourenmenge [${parameters.returnQuantity}] darf nicht die bestellte Menge [ ${orderItem.quantity} ].</value> <value xml:lang="en">Return quantity [ ${parameters.returnQuantity} ] cannot exceed the ordered quantity [ ${orderItem.quantity} ]. </value> <value xml:lang="es">La cantidad de retorno [ ${parameters.returnQuantity} ] no puede exceder [ ${orderItem.quantity} ]</value> <value xml:lang="fr">La quantité retournée [ ${parameters.returnQuantity} ] ne peut pas excéder la quantité commandée [ ${orderItem.quantity} ]. </value> @@ -2567,16 +2617,19 @@ <value xml:lang="zh_TW">é貨æ¸é [ ${parameters.returnQuantity} ] ä¸è½è¶ éè¨å®æ¸é [ ${orderItem.quantity} ]ã </value> </property> <property key="OrderReturnRequestPartyRoleInternalOrg"> + <value xml:lang="de">Fehler: eine Retoure muss an einen Akteur in der Rolle 'interne Organisation' gehen</value> <value xml:lang="en">Error: a return must be to a party in the role of internal organization</value> <value xml:lang="fr">Erreur : le retour doit avoir un acteur avec le rôle d'organisation interne</value> <value xml:lang="it">Errore: un reso deve avere un soggetto con ruolo organizzazione interna</value> </property> <property key="OrderReturnRequestPartyRoleSupplier"> + <value xml:lang="de">Fehler: eine Retoure muss an einen Akteur in der Rolle 'Lieferant' gehen</value> <value xml:lang="en">Error: a return must be to a party in the role of supplier</value> <value xml:lang="fr">Erreur : le retour doit avoir un acteur avec le rôle de fournisseur</value> <value xml:lang="it">Errore: un reso deve avere un soggetto con ruolo fornitore</value> </property> <property key="OrderReturnTotalCannotLessThanZero"> + <value xml:lang="de">Der Gesamtbetrag der Retoure [${returnTotalAmount}] kann nicht kleiner Null sein.</value> <value xml:lang="en">Return total [${returnTotalAmount}] can not less than zero.</value> <value xml:lang="es">Total de la devolución [${returnTotalAmount}] no puede ser menor a cero</value> <value xml:lang="fr">Total du retour [${returnTotalAmount}] ne peut pas être à zéro</value> @@ -2589,6 +2642,7 @@ <value xml:lang="zh_TW">é貨åè¨ [${returnTotalAmount}] ä¸è½å°äºé¶ã</value> </property> <property key="OrderRunServiceGetInventoryAvailableByFacilityError"> + <value xml:lang="de">Fehler beim ausführen des Service [getInventoryAvailableByFacility] :</value> <value xml:lang="en">Run service [getInventoryAvailableByFacility] error :</value> <value xml:lang="es">Ejecutar el servicio [getInventoryAvailableByFacility] da error :</value> <value xml:lang="fr">Erreur à l'exécution du service [getInventoryAvailableByFacility] : </value> @@ -2600,6 +2654,7 @@ <value xml:lang="zh_TW">éè¡æå [getInventoryAvailableByFacility] åºé¯ï¼</value> </property> <property key="OrderRunServiceGetSuppliersForProductError"> + <value xml:lang="de">Fehler beim ausführen des Service [getSuppliersForProduct] :</value> <value xml:lang="en">Run service [getSuppliersForProduct] error :</value> <value xml:lang="es">Error al ejecutar el servicio [getSuppliersForProduct] :</value> <value xml:lang="fr">Erreur à l'exécution du service [getSuppliersForProduct] : </value> Modified: ofbiz/branches/20111205EmailHandling/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/order/config/OrderUiLabels.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/order/config/OrderUiLabels.xml Mon Mar 26 20:56:02 2012 @@ -26,6 +26,7 @@ <value xml:lang="it">Aggiungi nota</value> <value xml:lang="nl">Toegevoegde opmerking aan bestelling: </value> <value xml:lang="pt_BR">Adicionar uma nota</value> + <value xml:lang="vi">Thêm ghi chú</value> <value xml:lang="zh">æ·»å 便笺</value> <value xml:lang="zh_TW">æ°å¢ä¾¿ç®</value> </property> @@ -38,6 +39,7 @@ <value xml:lang="nl">Totaalbedrag</value> <value xml:lang="pt_BR">Quantia total</value> <value xml:lang="th">à¸à¸¥à¸£à¸§à¸¡à¸à¸³à¸à¸§à¸</value> + <value xml:lang="vi">Tá»ng doanh sá»</value> <value xml:lang="zh">éé¢å计</value> <value xml:lang="zh_TW">éé¡åè¨</value> </property> @@ -1429,6 +1431,7 @@ <value xml:lang="ro">Adauga Ttotul in Cos</value> <value xml:lang="ru">ÐобавиÑÑ Ð² коÑÐ·Ð¸Ð½Ñ Ð²Ñе</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸±à¹à¸à¸«à¸¡à¸à¸¥à¸à¸à¸£à¸°à¸à¸£à¹à¸²</value> + <value xml:lang="vi">Thêm toà n bá» và o giá» hà ng</value> <value xml:lang="zh">å ¨é¨æ¾å ¥è´ç©è½¦</value> <value xml:lang="zh_TW">å ¨é¨æ¾å ¥è³¼ç©è»</value> </property> @@ -1448,6 +1451,7 @@ <value xml:lang="ro">Adauga optiuni in Cos</value> <value xml:lang="ru">ÐобавиÑÑ Ð² коÑÐ·Ð¸Ð½Ñ Ð¾ÑмеÑенное</value> <value xml:lang="th">à¹à¸à¹à¸à¹à¸à¸´à¹à¸¡à¹à¸à¸à¸£à¸°à¸à¸£à¹à¸²</value> + <value xml:lang="vi">Thêm phần Äánh dấu và o giá» hà ng</value> <value xml:lang="zh">æéä¸çæ¾å ¥è´ç©è½¦</value> <value xml:lang="zh_TW">æé¸ä¸çæ¾å ¥è³¼ç©è»</value> </property> @@ -1462,6 +1466,7 @@ <value xml:lang="ro">Adauga Cod</value> <value xml:lang="ru">ÐобавиÑÑ ÐºÐ¾Ð´</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸£à¸«à¸±à¸ª</value> + <value xml:lang="vi">Thêm mã</value> <value xml:lang="zh">æ·»å 代ç </value> <value xml:lang="zh_CN">æ·»å 代ç </value> <value xml:lang="zh_TW">å¢å ä¿é·ç¢¼</value> @@ -1839,6 +1844,7 @@ <value xml:lang="ro">Aproba Necesar</value> <value xml:lang="ru">УÑвеÑдиÑÑ ÑÑебованиÑ</value> <value xml:lang="th">à¸à¸£à¸±à¸à¸à¸£à¸¸à¸à¸à¸³à¸£à¹à¸à¸</value> + <value xml:lang="vi">Phê duyá»t nhu cầu nguá»n lá»±c</value> <value xml:lang="zh">æ¹åéæ±</value> <value xml:lang="zh_TW">æ¹åéæ±</value> </property> @@ -1853,6 +1859,7 @@ <value xml:lang="ro">Aprobat</value> <value xml:lang="ru">УÑвеÑжден</value> <value xml:lang="th">à¸à¸£à¸±à¸à¸à¸£à¸¸à¸</value> + <value xml:lang="vi">Äã phê duyá»t</value> <value xml:lang="zh">å·²æ¹å</value> <value xml:lang="zh_CN">å·²æ¹å</value> <value xml:lang="zh_TW">å·²æ¹å</value> @@ -1868,6 +1875,7 @@ <value xml:lang="ro">Aproba Necesar Produs</value> <value xml:lang="ru">УÑвеÑжденнÑе ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð° пÑодÑкÑиÑ</value> <value xml:lang="th">à¸à¸£à¸±à¸à¸à¸£à¸¸à¸à¸à¸³à¸£à¹à¸à¸à¸ªà¸´à¸à¸à¹à¸²</value> + <value xml:lang="vi">Nhu cầu sản phẩm Äã phê duyá»t</value> <value xml:lang="zh">å·²æ¹åç产åéæ±</value> <value xml:lang="zh_TW">å·²æ¹åçç¢åéæ±</value> </property> @@ -1900,6 +1908,7 @@ <value xml:lang="pt_BR">Designar automaticamente</value> <value xml:lang="ru">ÐвÑомаÑиÑеÑкое назнаÑение</value> <value xml:lang="th">à¸à¸³à¸«à¸à¸à¸à¸±à¸à¹à¸à¸¡à¸±à¸à¸´</value> + <value xml:lang="vi">Tá»± Äá»ng phân bá»</value> <value xml:lang="zh">èªå¨æå®</value> <value xml:lang="zh_TW">èªåæå®</value> </property> @@ -2285,6 +2294,7 @@ <value xml:lang="ro">Breviar Cos</value> <value xml:lang="ru">ÐÑого в коÑзине</value> <value xml:lang="th">à¹à¸à¸¢à¸ªà¸£à¸¸à¸à¸à¸£à¸°à¸à¸£à¹à¸²</value> + <value xml:lang="vi">Tá»ng hợp giá» hà ng</value> <value xml:lang="zh">è´ç©è½¦æè¦</value> <value xml:lang="zh_TW">è³¼ç©è»æè¦</value> </property> @@ -2299,6 +2309,7 @@ <value xml:lang="ro">Total Cos</value> <value xml:lang="ru">СÑмма коÑзинÑ</value> <value xml:lang="th">à¸à¸¥à¸£à¸§à¸¡à¸à¸±à¸à¸£</value> + <value xml:lang="vi">Tá»ng cá»ng giá» hà ng</value> <value xml:lang="zh">è´ç©è½¦å计</value> <value xml:lang="zh_CN">è´ç©è½¦æ»éé¢</value> <value xml:lang="zh_TW">è³¼ç©è»åè¨</value> @@ -2319,6 +2330,7 @@ <value xml:lang="de">Von Benutzer geändert</value> <value xml:lang="en">Changed by user</value> <value xml:lang="fr">Par l'utilisateur</value> + <value xml:lang="vi">Thay Äá»i bá»i ngÆ°á»i dùng</value> </property> <property key="OrderCheckout"> <value xml:lang="cs">Objednávka</value> @@ -2335,6 +2347,7 @@ <value xml:lang="ro">Inchidere</value> <value xml:lang="ru">ÐодÑвеÑдиÑÑ</value> <value xml:lang="th">à¸à¸à¸à¸à¸²à¸à¸à¸²à¸£à¸à¸³à¸£à¸²à¸¢à¸à¸²à¸£</value> + <value xml:lang="vi">Thanh toán</value> <value xml:lang="zh">ç»è´¦</value> <value xml:lang="zh_TW">çµè³¬</value> </property> @@ -2351,6 +2364,7 @@ <value xml:lang="ro">Inchidere Rapida</value> <value xml:lang="ru">ÐÑÑÑÑое подÑвеÑждение</value> <value xml:lang="th">à¸à¸à¸à¸à¸²à¸à¸à¸²à¸£à¸à¸³à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸¢à¹à¸²à¸à¸£à¸§à¸à¹à¸£à¹à¸§</value> + <value xml:lang="vi">Thanh toán nhanh</value> <value xml:lang="zh">å¿«éç»è´¦</value> <value xml:lang="zh_TW">å¿«éçµè³¬</value> </property> @@ -2368,6 +2382,7 @@ <value xml:lang="ro">Alege Valoare</value> <value xml:lang="ru">ÐÑбеÑиÑе ÑÑммÑ</value> <value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸à¸³à¸à¸§à¸</value> + <value xml:lang="vi">Chá»n doanh sá»</value> <value xml:lang="zh">éæ©éé¢</value> <value xml:lang="zh_TW">é¸æéé¡</value> </property> @@ -2384,6 +2399,7 @@ <value xml:lang="ro">Alege Alt Omagiu</value> <value xml:lang="ru">ÐÑбеÑиÑе дÑÑгой подаÑок</value> <value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸à¸à¸à¸à¸§à¸±à¸à¸à¸à¸´à¸à¸à¸·à¹à¸</value> + <value xml:lang="vi">Chá»n quà tặng khác</value> <value xml:lang="zh">éæ©å ¶å®ç¤¼å</value> <value xml:lang="zh_TW">é¸æå ¶ä»ç¦®å</value> </property> @@ -2510,6 +2526,7 @@ <value xml:lang="ro">OFBiz: Gestiune Comanda </value> <value xml:lang="ru">OFBiz: УпÑавление заказами</value> <value xml:lang="th">OFBiz: à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸ªà¸´à¸à¸à¹à¸²</value> + <value xml:lang="vi">OFBiz: Quản lý Äặt hà ng</value> <value xml:lang="zh">OFBiz: 订å管ç</value> <value xml:lang="zh_CN">OFBiz: 订å管ç</value> <value xml:lang="zh_TW">OFBiz: è¨å®ç®¡ç</value> @@ -3849,6 +3866,7 @@ <value xml:lang="ro">Cauta Oferte</value> <value xml:lang="ru">ÐоиÑк пÑедложениÑ</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸³à¸£à¹à¸à¸</value> + <value xml:lang="vi">Tìm báo giá</value> <value xml:lang="zh">æ¥æ¾è¯¢ä»·</value> <value xml:lang="zh_TW">æ¥è©¢å ±å¹</value> </property> @@ -3863,6 +3881,7 @@ <value xml:lang="pt_BR">Buscar cotações</value> <value xml:lang="ru">ÐоиÑк пÑедложений</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸³à¸£à¹à¸à¸</value> + <value xml:lang="vi">TÃm báo giá</value> <value xml:lang="zh_TW">æ¥è©¢å ±å¹</value> </property> <property key="OrderFindRequests"> @@ -4813,6 +4832,7 @@ <value xml:lang="ro">Aplicatie Gestiune Comenzi</value> <value xml:lang="ru">УпÑавление заказами</value> <value xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value> + <value xml:lang="vi">Quản lý Äặt hà ng</value> <value xml:lang="zh">订å管çåºç¨ç¨åº</value> <value xml:lang="zh_CN">订å管ç</value> <value xml:lang="zh_TW">è¨å®ç®¡çæç¨ç¨å¼</value> @@ -4828,6 +4848,7 @@ <value xml:lang="ro">Aplicatie Gestiune Comenzi</value> <value xml:lang="ru">УпÑавление заказами</value> <value xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value> + <value xml:lang="vi">Ứng dụng quản lý Äặt hà ng</value> <value xml:lang="zh">订å管çåºç¨ç¨åº</value> <value xml:lang="zh_CN">订å管ç</value> <value xml:lang="zh_TW">è¨å®ç®¡çæç¨ç¨å¼</value> @@ -4843,6 +4864,7 @@ <value xml:lang="ro">Promotii Manuale</value> <value xml:lang="ru">ÐкÑионное пÑедложение в ÑÑÑном Ñежиме</value> <value xml:lang="th">à¸à¸¹à¹à¸¡à¸·à¸à¹à¸à¸°à¸à¸³à¹à¸à¸£à¹à¸¡à¸à¸±à¸</value> + <value xml:lang="vi">HÆ°á»ng dẫn khuyến mại</value> <value xml:lang="zh">æå·¥ä¿é</value> <value xml:lang="zh_CN">人工ä¿é</value> <value xml:lang="zh_TW">æåä¿é·</value> @@ -4853,6 +4875,7 @@ <value xml:lang="fr">Marquer comme vu</value> <value xml:lang="it">Marca come visionato</value> <value xml:lang="pt_BR">Marcar como visualizado</value> + <value xml:lang="vi">Äánh dấu Äã xem</value> <value xml:lang="zh_TW">æ¨ç¤ºå·²æª¢è¦</value> </property> <property key="OrderMarketingPackageComposedBy"> @@ -4928,6 +4951,10 @@ <value xml:lang="zh">éè´§æ°é</value> <value xml:lang="zh_TW">é貨æ¸é</value> </property> + <property key="OrderMyReturns"> + <value xml:lang="en">My returns</value> + <value xml:lang="fr">Mes retours</value> + </property> <property key="OrderNOTEMultipleShipmentsExist"> <value xml:lang="de">Anmerkung: Mehrere Lieferungen vorhanden, verwenden Sie Lieferung aufteilen.</value> <value xml:lang="en">NOTE: Multiple shipments exist, use Split Shipment.</value> @@ -6190,6 +6217,7 @@ <value xml:lang="ro">Include</value> <value xml:lang="ru">ÐклÑÑаеÑ</value> <value xml:lang="th">รวม</value> + <value xml:lang="vi">Bao gá»m</value> <value xml:lang="zh">å æ¬</value> <value xml:lang="zh_TW">å æ¬</value> </property> @@ -6204,6 +6232,7 @@ <value xml:lang="ro">Tip Linie</value> <value xml:lang="ru">Тип позиÑии</value> <value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸£à¸²à¸¢à¸à¸²à¸£</value> + <value xml:lang="vi">Loại Äá» mục</value> <value xml:lang="zh">æç»ç±»å</value> <value xml:lang="zh_TW">æç´°é¡å</value> </property> @@ -6222,6 +6251,7 @@ <value xml:lang="ro">Linii Comanda</value> <value xml:lang="ru">ÐозиÑии заказа</value> <value xml:lang="th">รายà¸à¸²à¸£à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value> + <value xml:lang="vi">Mục Äặt hà ng</value> <value xml:lang="zh">订åæç»</value> <value xml:lang="zh_CN">订å项</value> <value xml:lang="zh_TW">è¨å®æç´°</value> @@ -6237,6 +6267,7 @@ <value xml:lang="ro">Lista Comanda</value> <value xml:lang="ru">СпиÑок заказов</value> <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value> + <value xml:lang="vi">Danh sách Äặt hà ng</value> <value xml:lang="zh">订åå表</value> <value xml:lang="zh_CN">订åå表</value> <value xml:lang="zh_TW">è¨å®å表</value> @@ -6252,6 +6283,7 @@ <value xml:lang="ro">Nume Comanda</value> <value xml:lang="ru">Тема</value> <value xml:lang="th">à¸à¸·à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£</value> + <value xml:lang="vi">Tên Äặt hà ng</value> <value xml:lang="zh">订åå称</value> <value xml:lang="zh_TW">è¨å®å稱</value> </property> @@ -7306,6 +7338,7 @@ <value xml:lang="ro">Oferte</value> <value xml:lang="ru">ЦеновÑе пÑедложениÑ</value> <value xml:lang="th">à¸à¸³à¸£à¹à¸à¸</value> + <value xml:lang="vi">Báo giá</value> <value xml:lang="zh">询价</value> <value xml:lang="zh_CN">æ¥ä»·</value> <value xml:lang="zh_TW">å ±å¹</value> @@ -8329,6 +8362,7 @@ <value xml:lang="ro">Promovare/Coduri Cupoane</value> <value xml:lang="ru">ÐÐ¾Ð´Ñ Ð¿Ð¾ акÑиÑм/кÑпонам</value> <value xml:lang="th">à¹à¸à¸£à¹à¸¡à¸à¸±à¸/รหัสà¸à¸¹à¸à¸à¸</value> + <value xml:lang="vi">Mã khuyến mại/coupon</value> <value xml:lang="zh">ä¿é/ä¼æ å¸ä»£ç </value> <value xml:lang="zh_CN">ä¿éä¼æ 代ç </value> <value xml:lang="zh_TW">ä¿é·/åªæ å¸ä»£ç¢¼</value> @@ -8345,6 +8379,7 @@ <value xml:lang="ro">Detalii Promotie</value> <value xml:lang="ru">ÐодÑобноÑÑи акÑии</value> <value xml:lang="th">รายละà¹à¸à¸µà¸¢à¸à¹à¸à¸£à¹à¸¡à¸à¸±à¸</value> + <value xml:lang="vi">Chi tiết khuyến mại</value> <value xml:lang="zh">ä¿éæç»</value> <value xml:lang="zh_TW">ä¿é·æç´°</value> </property> @@ -8363,6 +8398,7 @@ <value xml:lang="ro">Informatii Promotie</value> <value xml:lang="ru">ÐнÑоÑмаÑÐ¸Ñ Ð¿Ð¾ акÑии</value> <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸£à¹à¸¡à¸à¸±à¹à¸</value> + <value xml:lang="vi">Thông tin khuyến mại</value> <value xml:lang="zh">ä¿éä¿¡æ¯</value> <value xml:lang="zh_TW">ä¿é·è³è¨</value> </property> @@ -8378,6 +8414,7 @@ <value xml:lang="ro">Aceasta promotie include toate produsele din aceste categorii</value> <value xml:lang="ru">ÐÑа акÑÐ¸Ñ Ð²ÐºÐ»ÑÑÐ°ÐµÑ Ð²Ñе пÑодÑкÑÑ Ð² ÑледÑÑÑÐ¸Ñ ÐºÐ°ÑегоÑиÑÑ </value> <value xml:lang="th">à¹à¸à¸£à¹à¸¡à¸à¸±à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> + <value xml:lang="vi">San phẩm khuyến mại trong các danh mục</value> <value xml:lang="zh">æ¬ä¿éå æ¬è¿äºåç±»ä¸çå ¨é¨äº§å</value> <value xml:lang="zh_TW">æ¬ä¿é·å æ¬éäºåé¡ä¸çå ¨é¨ç¢å</value> </property> @@ -8395,6 +8432,7 @@ <value xml:lang="ro">Promotii Aplicate</value> <value xml:lang="ru">ÐкÑÐ¸Ñ ÐºÐ°ÑаеÑÑÑ</value> <value xml:lang="th">à¹à¸à¸£à¹à¸¡à¸à¸±à¹à¸à¸à¸µà¹à¹à¸à¹à¹à¸à¹</value> + <value xml:lang="vi">Khuyến mại Äược áp dụng</value> <value xml:lang="zh">åºç¨äºçä¿é</value> <value xml:lang="zh_TW">æç¨äºçä¿é·</value> </property> @@ -8681,6 +8719,7 @@ <value xml:lang="ro">Adaugare Rapida</value> <value xml:lang="ru">ÐÑÑÑÑое добавление</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸¢à¹à¸²à¸£à¸§à¸à¹à¸£à¹à¸§</value> + <value xml:lang="vi">Thêm nhanh</value> <value xml:lang="zh">å¿«éæ·»å </value> <value xml:lang="zh_TW">å¿«éæ·»å </value> </property> @@ -8695,6 +8734,7 @@ <value xml:lang="ro">Adaugare Rapida Linie Comanda</value> <value xml:lang="ru">ÐÑÑÑÑое Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð·Ð¸Ñии заказа</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸£à¸²à¸¢à¸à¸²à¸£à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸¢à¹à¸²à¸à¸£à¸§à¸à¹à¸£à¹à¸§</value> + <value xml:lang="vi">Thêm nhanh Äặt hà ng</value> <value xml:lang="zh">å¿«éæ·»å 订åæç»</value> <value xml:lang="zh_CN">å¿«éæ·»å 订å项ç®</value> <value xml:lang="zh_TW">å¿«éæ·»å è¨å®æç´°</value> @@ -9298,6 +9338,7 @@ <value xml:lang="it">Preventivi</value> <value xml:lang="nl">Offertes</value> <value xml:lang="pt_BR">Cotações</value> + <value xml:lang="vi">Báo giá</value> <value xml:lang="zh">询价</value> <value xml:lang="zh_TW">å ±å¹</value> </property> @@ -9502,6 +9543,7 @@ <value xml:lang="ro">Cerere</value> <value xml:lang="ru">ÐапÑоÑÑ</value> <value xml:lang="th">à¸à¸²à¸£à¸£à¹à¸à¸à¸à¸</value> + <value xml:lang="vi">Yêu cầu của khách hà ng</value> <value xml:lang="zh">请æ±</value> <value xml:lang="zh_CN">请æ±</value> <value xml:lang="zh_TW">è¦æ±</value> @@ -9622,6 +9664,7 @@ <value xml:lang="ro">Necesar</value> <value xml:lang="ru">ТÑебованиÑ</value> <value xml:lang="th">สิà¹à¸à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£</value> + <value xml:lang="vi">Nhu cầu nguá»n lá»±c</value> <value xml:lang="zh">éæ±</value> <value xml:lang="zh_CN">éæ±</value> <value xml:lang="zh_TW">éæ±</value> @@ -11159,6 +11202,7 @@ <value xml:lang="ro">Cosul de Cumparari este gol</value> <value xml:lang="ru">ÐоÑзина покÑпок пÑÑÑаÑ</value> <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸¥à¸à¸à¸°à¸à¸£à¹à¸²</value> + <value xml:lang="vi">Giá» mua hà ng còn trá»ng</value> <value xml:lang="zh">è´ç©è½¦æ¯ç©ºç</value> <value xml:lang="zh_TW">è³¼ç©è»æ¯ç©ºç</value> </property> @@ -11278,6 +11322,7 @@ <value xml:lang="ro">Oferte Speciale</value> <value xml:lang="ru">СпеÑиалÑнÑе пÑедложениÑ</value> <value xml:lang="th">à¸à¹à¸à¹à¸ªà¸à¸à¸à¸´à¹à¸¨à¸©</value> + <value xml:lang="vi">Giảm giá Äặc biá»t</value> <value xml:lang="zh">ç¹å«æä¾</value> <value xml:lang="zh_TW">ç¹å¥æä¾</value> </property> @@ -12075,6 +12120,7 @@ <value xml:lang="ro">Verifica Configurarea </value> <value xml:lang="ru">СÑавниÑÑ ÐºÐ¾Ð½ÑигÑÑаÑиÑ</value> <value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸à¸à¹à¸à¸£à¸°à¸à¸à¸</value> + <value xml:lang="vi">Xác nháºn cấu hình</value> <value xml:lang="zh">éªè¯è®¾ç½®</value> <value xml:lang="zh_TW">檢é©è¨å®</value> </property> @@ -12093,6 +12139,7 @@ <value xml:lang="ro">Vizualiza Toate Promotiile </value> <value xml:lang="ru">ÐÑоÑмоÑÑеÑÑ Ð²Ñе акÑии</value> <value xml:lang="th">à¹à¸ªà¸à¸à¹à¸à¸£à¹à¸¡à¸à¸±à¹à¸à¸à¸±à¹à¸à¸«à¸¡à¸</value> + <value xml:lang="vi">Xem các khuyến mại Äang có</value> <value xml:lang="zh">æµè§å ¨é¨ä¿é</value> <value xml:lang="zh_TW">çè¦½å ¨é¨ä¿é·</value> </property> @@ -12112,6 +12159,7 @@ <value xml:lang="ro">Vizualizeaza Cos</value> <value xml:lang="ru">ÐÑоÑмоÑÑеÑÑ</value> <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¹à¸à¸à¸°à¸à¸£à¹à¸²</value> + <value xml:lang="vi">Xem giá» hà ng</value> <value xml:lang="zh">æµè§è´ç©è½¦</value> <value xml:lang="zh_TW">ç覽購ç©è»</value> </property> @@ -12152,6 +12200,7 @@ <value xml:lang="ro">Afiseaza Imagine</value> <value xml:lang="ru">ÐÑоÑмоÑÑеÑÑ Ð¸Ð·Ð¾Ð±Ñажение</value> <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸¹à¸à¸ าà¸</value> + <value xml:lang="vi">Xem ảnh</value> <value xml:lang="zh">æµè§å¾å</value> <value xml:lang="zh_CN">æ¥çå¾ç</value> <value xml:lang="zh_TW">ç覽åå</value> @@ -12167,6 +12216,7 @@ <value xml:lang="ro">Afiseaza Comanda</value> <value xml:lang="ru">ÐÑоÑмоÑÑеÑÑ Ð·Ð°ÐºÐ°Ð·</value> <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value> + <value xml:lang="vi">Xem Äặt hà ng</value> <value xml:lang="zh">æµè§è®¢å</value> <value xml:lang="zh_CN">æ¥ç订å</value> <value xml:lang="zh_TW">檢è¦è¨å®</value> @@ -12178,6 +12228,7 @@ <value xml:lang="it">Mostra storia ordine</value> <value xml:lang="nl">Bekijk eerdere bestellingen</value> <value xml:lang="pt_BR">Visualizar histórico de pedido</value> + <value xml:lang="vi">Xem lá»ch sá» Äặt hà ng</value> <value xml:lang="zh_TW">檢è¦è¨å®æ·å²</value> </property> <property key="OrderViewPermissionError"> @@ -12191,6 +12242,7 @@ <value xml:lang="ro">Nu esti autorizat sa vezi aceasta pagina. ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW", "ORDERMGR_ADMIN" un rol asociat la agent Furnizor sunt necesari)</value> <value xml:lang="ru">У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав Ð´Ð»Ñ Ð¿ÑоÑмоÑÑа ÑÑой ÑÑÑаниÑÑ.</value> <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¹à¸à¹à¸£à¸±à¸à¸à¸²à¸£à¸à¸¸à¸à¸²à¸à¹à¸«à¹à¸à¸¹à¸«à¸à¹à¸²à¸à¸µà¹</value> + <value xml:lang="vi">Bạn không có thẩm quyá»n Äá» xem trang nà y(cần có "ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" hoặc "ORDERMGR_ADMIN").</value> <value xml:lang="zh">ä½ æ ææµè§è¿ä¸ªé¡µé¢ã</value> <value xml:lang="zh_CN">ä½ æ²¡ææéæ¥çæ¤é¡µ</value> <value xml:lang="zh_TW">ä½ ç¡æ¬ç覽éåé é¢ã</value> @@ -12207,6 +12259,7 @@ <value xml:lang="ro">Afiseaza Oferta</value> <value xml:lang="ru">ÐÑоÑмоÑÑеÑÑ Ð¿Ñедложение</value> <value xml:lang="th">à¹à¸ªà¸à¸à¸à¸³à¸£à¹à¸à¸</value> + <value xml:lang="vi">Xem báo giá</value> <value xml:lang="zh">æµè§è¯¢ä»·</value> <value xml:lang="zh_CN">æ¥çæ¥ä»·</value> <value xml:lang="zh_TW">çè¦½å ±å¹</value> @@ -12222,6 +12275,7 @@ <value xml:lang="ro">Profit</value> <value xml:lang="ru">ÐÑибÑлÑ</value> <value xml:lang="th">à¸à¸¥à¸à¸£à¸°à¹à¸¢à¸à¸à¹</value> + <value xml:lang="vi">Lợi nhuáºn</value> <value xml:lang="zh">å©æ¶¦</value> <value xml:lang="zh_CN">å©æ¶¦</value> <value xml:lang="zh_TW">å©æ½¤</value> @@ -12237,6 +12291,7 @@ <value xml:lang="ro">Afiseaza Cererea</value> <value xml:lang="ru">ÐÑоÑмоÑÑеÑÑ Ð·Ð°Ð¿ÑоÑ</value> <value xml:lang="th">à¹à¸ªà¸à¸à¸à¸²à¸£à¸£à¹à¸à¸à¸à¸</value> + <value xml:lang="vi">Xem yêu cầu</value> <value xml:lang="zh">æµè§è¯·æ±</value> <value xml:lang="zh_CN">æ¥ç请æ±</value> <value xml:lang="zh_TW">ç覽è¦æ±</value> @@ -12247,6 +12302,7 @@ <value xml:lang="fr">Vu</value> <value xml:lang="it">Visionato</value> <value xml:lang="pt_BR">Visualizado</value> + <value xml:lang="vi">Äã xem</value> <value xml:lang="zh_TW">已檢è¦</value> </property> <property key="OrderWTD"> @@ -12275,6 +12331,7 @@ <value xml:lang="ro">In Asteptarea de Aprovare</value> <value xml:lang="ru">Ðжидание ÑÑвеÑждениÑ</value> <value xml:lang="th">à¸à¸³à¸¥à¸±à¸à¸£à¸à¸à¸²à¸£à¸à¸à¸¸à¸¡à¸±à¸à¸´</value> + <value xml:lang="vi">Chá» phê duyá»t</value> <value xml:lang="zh">çå¾ æ¹å</value> <value xml:lang="zh_CN">çå¾ æ¹å</value> <value xml:lang="zh_TW">çå¾ æ¹å</value> @@ -12290,6 +12347,7 @@ <value xml:lang="ro">In Asteptare de Completare</value> <value xml:lang="ru">Ðжидание завеÑÑениÑ</value> <value xml:lang="th">à¸à¸³à¸¥à¸±à¸à¸£à¸à¸à¸²à¸£à¸ªà¸£à¸¸à¸</value> + <value xml:lang="vi">Chá» hoà n thà nh</value> <value xml:lang="zh">çå¾ å®æ</value> <value xml:lang="zh_CN">çå¾ å®æ</value> <value xml:lang="zh_TW">çå¾ å®æ</value> @@ -12305,6 +12363,7 @@ <value xml:lang="ro">In Asteptare de Plata</value> <value xml:lang="ru">Ðжидание оплаÑÑ</value> <value xml:lang="th">à¸à¸³à¸¥à¸±à¸à¸£à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value> + <value xml:lang="vi">Chá» thanh toán</value> <value xml:lang="zh">çå¾ æ¯ä»</value> <value xml:lang="zh_CN">çå¾ æ¯ä»</value> <value xml:lang="zh_TW">çå¾ æ¯ä»</value> @@ -12371,6 +12430,7 @@ <value xml:lang="fr">Besoins</value> <value xml:lang="it">Fabbisogni</value> <value xml:lang="pt_BR">Requisitos</value> + <value xml:lang="vi">Nhu cầu nguá»n lá»±c</value> <value xml:lang="zh">éæ±</value> <value xml:lang="zh_TW">éæ±</value> </property> @@ -12592,6 +12652,7 @@ <value xml:lang="it">Ricerca Fabbisogni Approvati Per Prodotto</value> <value xml:lang="pt_BR">Encontrar requisitos aprovados de produtos</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£à¸à¸à¸¸à¸¡à¸±à¸à¸´</value> + <value xml:lang="vi">Tìm nhu cầu sản phẩm Äã phê duyá»t</value> <value xml:lang="zh">æ¥æ¾å·²æ¹åç产åéæ±</value> <value xml:lang="zh_TW">æ¥è©¢å·²æ¹åçç¢åéæ±</value> </property> @@ -12603,6 +12664,7 @@ <value xml:lang="it">Ricerca Fabbisogni Approvati Per Fornitore</value> <value xml:lang="pt_BR">Encontrar requisitos aprovados por fornecedor</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸´à¹à¸à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£à¸à¸à¸¸à¸¡à¸±à¸à¸´à¹à¸à¸¢à¸à¸¹à¹à¸à¸³à¸«à¸à¹à¸²à¸¢</value> + <value xml:lang="vi">Tìm kiếm các phê duyá»t nguá»n lá»±c bá»i nhà cung cấp</value> <value xml:lang="zh">æ¥æ¾ç±ä¾è´§åæ¹åç产åéæ±</value> <value xml:lang="zh_TW">以ä¾è²¨åæ¥è©¢æ¹åéæ±</value> </property> @@ -12614,6 +12676,7 @@ <value xml:lang="it">Ricerca fabbisogni non ancora approvati</value> <value xml:lang="pt_BR">Encontrar requisitos não aprovados</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸´à¹à¸à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£à¸à¸à¸¸à¸¡à¸±à¸à¸´</value> + <value xml:lang="vi">Tìm kiếm các nhu cầu nguá»n lá»±c không Äược phê duyá»t</value> <value xml:lang="zh">æ¾ä¸å°å·²æ¹åçéæ±</value> <value xml:lang="zh_TW">æ¾ä¸å°æ¹åéæ±</value> </property> @@ -12628,6 +12691,7 @@ <value xml:lang="ro">Returnare Rapida</value> <value xml:lang="ru">ÐÑÑÑÑÑй возвÑаÑ</value> <value xml:lang="th">à¸à¸¥à¸±à¸à¹à¸à¸à¸¢à¹à¸²à¸à¸£à¸§à¸à¹à¸£à¹à¸§</value> + <value xml:lang="vi">Hoà n lại nhanh</value> <value xml:lang="zh">å¿«ééè´§</value> <value xml:lang="zh_TW">å¿«éé貨</value> </property> @@ -12642,6 +12706,7 @@ <value xml:lang="ro">Cauta Returnare</value> <value xml:lang="ru">ÐайÑи возвÑаÑ</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸¥à¸à¸à¸à¹à¸à¸</value> + <value xml:lang="vi">Tìm kiếm hoà n lại</value> <value xml:lang="zh">æ¥æ¾éè´§</value> <value xml:lang="zh_TW">æ¥è©¢é貨</value> </property> Modified: ofbiz/branches/20111205EmailHandling/applications/order/config/order.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/order/config/order.properties?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/order/config/order.properties (original) +++ ofbiz/branches/20111205EmailHandling/applications/order/config/order.properties Mon Mar 26 20:56:02 2012 @@ -22,3 +22,7 @@ daysTillCancelReplacementOrder=30 # Maximum age of auto-save shopping list for anonymous users (in days) autosave.max.age=14 + +# Order Item Attribute +order.item.attr.prefix=order_item_attr_ +order.item.comment.enable=Y Modified: ofbiz/branches/20111205EmailHandling/applications/order/data/OrderPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/order/data/OrderPortletData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/order/data/OrderPortletData.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/order/data/OrderPortletData.xml Mon Mar 26 20:56:02 2012 @@ -187,4 +187,13 @@ <PortletPortletCategory portalPortletId="PDR_Report" portletCategoryId="REPORT"/> <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="12"/> + <PortletCategory portletCategoryId="CUST_ORDERS" description="Customer Orders"/> + <PortalPortlet portalPortletId="ListCustReturns" + portletName="Customer Returns" + screenName="ListCustReturns" + screenLocation="component://order/widget/ordermgr/CustRequestScreens.xml" + description="List of Returns by a customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" + editFormName="EditCustRetStatusId" + editFormLocation="component://order/widget/ordermgr/CustRequestForms.xml"/> + <PortletPortletCategory portalPortletId="ListCustReturns" portletCategoryId="CUST_ORDERS"/> </entity-engine-xml> Modified: ofbiz/branches/20111205EmailHandling/applications/order/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/order/entitydef/entitymodel.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/order/entitydef/entitymodel.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/order/entitydef/entitymodel.xml Mon Mar 26 20:56:02 2012 @@ -480,7 +480,7 @@ under the License. <field name="budgetId" type="id"></field> <field name="budgetItemSeqId" type="id"></field> <field name="productId" type="id"></field> - <field name="supplierProductId" type="id"></field> + <field name="supplierProductId" type="id-long"></field> <field name="productFeatureId" type="id"></field> <field name="prodCatalogId" type="id"></field> <field name="productCategoryId" type="id"></field> Modified: ofbiz/branches/20111205EmailHandling/applications/order/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/order/ofbiz-component.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/order/ofbiz-component.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/order/ofbiz-component.xml Mon Mar 26 20:56:02 2012 @@ -59,6 +59,7 @@ under the License. <webapp name="order" title="Order" + description="OrderComponentDescription" server="default-server" location="webapp/ordermgr" base-permission="OFBTOOLS,ORDERMGR" Propchange: ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ Merged /ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:r1210494-1305499 Modified: ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Mon Mar 26 20:56:02 2012 @@ -255,29 +255,30 @@ under the License. </simple-method> <simple-method method-name="createReturnItem" short-description="Create Return Item"> + <set field="lookupPKMap.returnId" from-field="parameters.returnId"/> <find-by-primary-key entity-name="ReturnHeader" map="lookupPKMap" value-field="returnHeader"/> <if> - <condition> - <and> - <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not> - <not><if-compare-field field="userLogin.partyId" to-field="returnHeader.fromPartyId" operator="equals"/></not> - </and> - </condition> - <then> - <add-error><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateReturnItem"/></add-error> - </then> + <condition> + <and> + <not> + <if-has-permission permission="ORDERMGR" action="_CREATE"/> + </not> + <not> + <if-compare-field field="userLogin.partyId" to-field="returnHeader.fromPartyId" operator="equals"/> + </not> + </and> + </condition> + <then> + <add-error> + <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateReturnItem"/> + </add-error> + </then> </if> <check-errors/> <if-empty field="parameters.returnItemTypeId"> - <if-not-empty field="parameters.returnItemMapKey"> - <!-- find the item mapping --> - </if-not-empty> - </if-empty> - - <if-empty field="parameters.returnItemTypeId"> <add-error> <fail-property resource="OrderErrorUiLabels" property="OrderReturnItemTypeIsNotDefined"/> </add-error> @@ -296,13 +297,17 @@ under the License. </and> </condition> <then> - <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnPaymentMethodNeededForThisTypeOfReturn"/></add-error> + <add-error> + <fail-property resource="OrderErrorUiLabels" property="OrderReturnPaymentMethodNeededForThisTypeOfReturn"/> + </add-error> </then> </if> <check-errors/> <if-compare field="parameters.returnQuantity" operator="equals" value="0" type="BigDecimal"> - <add-error><fail-property resource="OrderErrorUiLabels" property="OrderNoReturnQuantityAvailablePreviousReturnsMayExist"/></add-error> + <add-error> + <fail-property resource="OrderErrorUiLabels" property="OrderNoReturnQuantityAvailablePreviousReturnsMayExist"/> + </add-error> <check-errors/> </if-compare> @@ -310,7 +315,7 @@ under the License. <set field="returnableQuantity" value="0" type="BigDecimal"/> <set field="returnablePrice" value="0" type="BigDecimal"/> - <!-- if an orderItemSeqId is provided, then find the corresponding orderItem --> + <!-- if an orderItemSeqId is provided, then find the corresponding orderItem --> <if-not-empty field="parameters.orderItemSeqId"> <make-value value-field="itemLookup" entity-name="OrderItem"/> <set-pk-fields map="parameters" value-field="itemLookup"/> @@ -320,8 +325,9 @@ under the License. </if-not-empty> </if-not-empty> - <!-- get the returnableQuantity and returnablePrice: for orderItems, it's found by getReturnableQuantity; for adjustments, - either order adjustments or manual adjustments, it's always 1 and based on input parameter --> + <!-- get the returnableQuantity and returnablePrice: + for orderItems, it's found by getReturnableQuantity; + for adjustments, either order adjustments or manual adjustments, it's always 1 and based on input parameter --> <if-not-empty field="orderItem"> <set field="serviceContext.orderItem" from-field="orderItem"/> <call-service service-name="getReturnableQuantity" in-map-name="serviceContext"> @@ -330,30 +336,36 @@ under the License. </call-service> </if-not-empty> - <if-compare field="returnableQuantity" value="0" operator="greater" type="BigDecimal"> - <!-- the user is only allowed to set a returnPrice if he has ORDERMGR_CREATE privilege, otherwise only the returnablePrice - calculated by service is used --> + <!-- the user is only allowed to set a returnPrice if he has ORDERMGR_CREATE privilege, otherwise only the returnablePrice calculated by service is used --> <if> <condition> - <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not> + <not> + <if-has-permission permission="ORDERMGR" action="_CREATE"/> + </not> </condition> <then> - <set from-field="returnablePrice" field="parameters.returnPrice"/> + <set from-field="returnablePrice" field="parameters.returnPrice"/> </then> </if> <!-- make sure the returnQuantity is not greater than the returnableQuantity from service or the quantity on the original orderItem --> <if-compare-field field="parameters.returnQuantity" to-field="returnableQuantity" operator="greater" type="BigDecimal"> - <add-error><fail-property resource="OrderErrorUiLabels" property="OrderRequestedReturnQuantityNotAvailablePreviousReturnsMayExist"/></add-error> + <add-error> + <fail-property resource="OrderErrorUiLabels" property="OrderRequestedReturnQuantityNotAvailablePreviousReturnsMayExist"/> + </add-error> </if-compare-field> <if-not-empty field="orderItem"> <if-compare-field field="parameters.returnQuantity" to-field="orderItem.quantity" operator="greater" type="BigDecimal"> - <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnQuantityCannotExceedTheOrderedQuantity"/></add-error> + <add-error> + <fail-property resource="OrderErrorUiLabels" property="OrderReturnQuantityCannotExceedTheOrderedQuantity"/> + </add-error> </if-compare-field> </if-not-empty> <if-compare-field field="parameters.returnPrice" to-field="returnablePrice" operator="greater" type="BigDecimal"> - <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnPriceCannotExceedThePurchasePrice"/></add-error> + <add-error> + <fail-property resource="OrderErrorUiLabels" property="OrderReturnPriceCannotExceedThePurchasePrice"/> + </add-error> </if-compare-field> <check-errors/> @@ -361,7 +373,9 @@ under the License. <set from-field="parameters.orderId" field="orderId"/> <set from-field="parameters.orderItemSeqId" field="orderItemSeqId"/> <log level="error" message="Order ${orderId} item ${orderItemSeqId} has been returned in full"/> - <add-error><fail-property resource="OrderErrorUiLabels" property="OrderIllegalReturnItemTypePassed"/></add-error> + <add-error> + <fail-property resource="OrderErrorUiLabels" property="OrderIllegalReturnItemTypePassed"/> + </add-error> <check-errors/> </else> </if-compare> @@ -370,7 +384,7 @@ under the License. <set from-field="parameters.returnId" field="newEntity.returnId"/> <make-next-seq-id seq-field-name="returnItemSeqId" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <set field="newEntity.statusId" value="RETURN_REQUESTED"/> <!-- default status for new return items --> + <set field="newEntity.statusId" value="RETURN_REQUESTED"/> <!-- default status for new return items --> <field-to-result field="newEntity.returnItemSeqId" result-name="returnItemSeqId"/> <create-value value-field="newEntity"/> <refresh-value value-field="newEntity"/> @@ -397,7 +411,9 @@ under the License. </if-not-empty> </then> </if> + </simple-method> + <simple-method method-name="updateReturnItem" short-description="Update Return Item"> <check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateReturnHeader"/></check-permission> <check-errors/> Modified: ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Mon Mar 26 20:56:02 2012 @@ -21,40 +21,28 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> - <!-- Returns hasPermission=true if userLogin partyId equals partyId parameter - Only the order owner should be able to cancel an item from Ecommerce - --> - <simple-method method-name="orderAdjustmentPermissionCheck" short-description="Party contact mech permission logic"> - <if-empty field="parameters.partyId"> - <set field="parameters.partyId" from-field="userLogin.partyId"/> - </if-empty> - <if-compare-field to-field="userLogin.partyId" field="parameters.partyId" operator="equals"> - <set field="hasPermission" type="Boolean" value="true"/> - <field-to-result field="hasPermission"/> + <simple-method method-name="orderAdjustmentPermissionCheck" short-description="Permission service for the creation and editing of order adjustments"> + <set field="primaryPermission" value="ORDERMGR"/> + <set field="altPermission" value="ORDERMGR_ROLE"/> + <set field="mainAction" from-field="parameters.mainAction"/> + <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> + <if-compare field="hasPermission" operator="not-equals" value="true"> + <set field="resourceDescription" from-field="parameters.resourceDescription"/> + <if-empty field="resourceDescription"> + <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field="resourceDescription"/> + </if-empty> + <if-compare field="mainAction" value="CREATE" operator="equals"> + <property-to-field resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateOrderAdjustement" field="failMessage"/> + </if-compare> + <if-compare field="mainAction" value="UPDATE" operator="equals"> + <property-to-field resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunAutoCreateOrderAdjustments" field="failMessage"/> + </if-compare> + <set field="hasPermission" type="Boolean" value="false"/> + <field-to-result field="failMessage"/> <else> - <set field="primaryPermission" value="ORDERMGR"/> - <set field="altPermission" value="ORDERMGR_ROLE"/> - <set field="mainAction" from-field="parameters.mainAction"/> - <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/> - <if-compare field="hasPermission" operator="not-equals" value="true"> - <set field="resourceDescription" from-field="parameters.resourceDescription"/> - <if-empty field="resourceDescription"> - <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field="resourceDescription"/> - </if-empty> - <if-compare field="mainAction" value="CREATE" operator="equals"> - <property-to-field resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateOrderAdjustement" field="failMessage"/> - </if-compare> - <if-compare field="mainAction" value="UPDATE" operator="equals"> - <property-to-field resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunAutoCreateOrderAdjustments" field="failMessage"/> - </if-compare> - <set field="hasPermission" type="Boolean" value="false"/> - <field-to-result field="failMessage"/> - <else> - <field-to-result field="hasPermission"/> - </else> - </if-compare> + <field-to-result field="hasPermission"/> </else> - </if-compare-field> + </if-compare> </simple-method> <simple-method method-name="createOrderAdjustment" short-description="Create an OrderAdjustment"> |
Free forum by Nabble | Edit this page |