You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/09/22 19:42:37 UTC
svn commit: r1000103 - in /ofbiz/branches/jquery: ./
applications/accounting/config/
applications/order/script/org/ofbiz/order/customer/
applications/party/config/
applications/party/script/org/ofbiz/party/communication/
applications/party/webapp/party...
Author: jleroux
Date: Wed Sep 22 17:42:36 2010
New Revision: 1000103
URL: http://svn.apache.org/viewvc?rev=1000103&view=rev
Log:
Merges the trunk at r999977
Removed:
ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupForms.xml
ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleLookupScreens.xml
Modified:
ofbiz/branches/jquery/ (props changed)
ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/jquery/applications/party/config/PartyErrorUiLabels.xml
ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/jquery/framework/common/widget/LookupForms.xml
ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml
ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml
ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml
ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/branches/jquery/framework/widget/templates/csvFormMacroLibrary.ftl
ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl
ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-999128
+/ofbiz/trunk:951708-1000101
Modified: ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml Wed Sep 22 17:42:36 2010
@@ -4501,7 +4501,7 @@
</property>
<property key="AccountingGlAccountAssignments">
<value xml:lang="ar">تعÙÙÙات اÙØساب اÙÙ
ØاسبÙ</value>
- <value xml:lang="de">Hauptbuchkonto-Zuordnungen</value>
+ <value xml:lang="de">HB Kontenzuordnungen</value>
<value xml:lang="en">GL Account Assignments</value>
<value xml:lang="es">Asignaciones a cuentas de LM</value>
<value xml:lang="fr">Allocations du compte comptable</value>
@@ -4515,7 +4515,7 @@
</property>
<property key="AccountingGlAccountClass">
<value xml:lang="ar">صÙ٠اÙØساب اÙÙ
ØاسبÙ</value>
- <value xml:lang="de">Hauptbuchkonto-Klasse</value>
+ <value xml:lang="de">HB Konto-Klasse</value>
<value xml:lang="en">GL Account Class</value>
<value xml:lang="es">Clase de cuenta de LM</value>
<value xml:lang="fr">Classe du compte comptable</value>
@@ -4533,7 +4533,7 @@
</property>
<property key="AccountingGlAccountDefault">
<value xml:lang="ar">اÙÙÙÙ
اÙØ¥ÙتراضÙØ© ÙÙØساب اÙÙ
ØاسبÙ</value>
- <value xml:lang="de">Hauptbuchkonto Voreinstellungun</value>
+ <value xml:lang="de">HB Standard Konto</value>
<value xml:lang="en">GL Account defaults</value>
<value xml:lang="es">Valores predeterminados de cuentas de LM</value>
<value xml:lang="fr">Comptes par défaut</value>
@@ -4547,7 +4547,7 @@
</property>
<property key="AccountingGlAccountId">
<value xml:lang="ar">دÙÙ٠اÙØساب اÙÙ
ØاسبÙ</value>
- <value xml:lang="de">Hauptbuchkonto-Nr.</value>
+ <value xml:lang="de">HB Konto ID</value>
<value xml:lang="en">GL Account ID</value>
<value xml:lang="es">Id Cuenta de LM</value>
<value xml:lang="fr">Réf. compte comptable</value>
@@ -4570,7 +4570,7 @@
<value xml:lang="hi_IN">à¤à¥à¤à¤²(GL) à¤à¤¾à¤¤à¤¾ तलपà¤(Trial Balance) बà¥à¤¯à¥à¤°à¥à¤µà¤¾à¤° विवरण</value>
</property>
<property key="AccountingGlAccountTypeDefaults">
- <value xml:lang="de">Kontenarten Voreinstellungen</value>
+ <value xml:lang="de">HB Kontotyp Voreinstellung</value>
<value xml:lang="en">GL Account Type Defaults</value>
<value xml:lang="fr">Types par défaut de compte du GL</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤²(GL) à¤à¤¾à¤¤à¤¾ पà¥à¤°à¤à¤¾à¤° डिफ़à¥à¤²à¥à¤à¥à¤¸</value>
@@ -4581,7 +4581,7 @@
</property>
<property key="AccountingGlAccounts">
<value xml:lang="ar">اÙØسابات اÙÙ
ØاسبÙØ©</value>
- <value xml:lang="de">Hauptbuchkonten</value>
+ <value xml:lang="de">HB Konten</value>
<value xml:lang="en">GL Accounts</value>
<value xml:lang="es">Cuentas de LM</value>
<value xml:lang="fr">Comptes</value>
@@ -4618,7 +4618,7 @@
<value xml:lang="zh">æ¥è®°è´¦</value>
</property>
<property key="AccountingGlobalGLSettings">
- <value xml:lang="de">Allgemeine Hauptbucheinstellungen</value>
+ <value xml:lang="de">Hauptbuch-Einstellungen, global</value>
<value xml:lang="en">Global GL Settings</value>
<value xml:lang="fr">Configurations globales du GL</value>
<value xml:lang="hi_IN">सारà¥à¤µà¤¿à¤ à¤à¥à¤à¤²(GL) सà¥à¤à¤¿à¤à¤à¥à¤¸</value>
@@ -4672,6 +4672,7 @@
<value xml:lang="zh">忽ç¥å票æç»</value>
</property>
<property key="AccountingIgnoringAdditionalShipCharges">
+ <value xml:lang="de">Prorata-Versandgebühren sind nicht 'N' für productStoreId ${productStoreId}: Zusätzliche Gebühren für Versand werden ignoriert</value>
<value xml:lang="en">prorateShipping is not N for productStoreId ${productStoreId}: Additional shipping charges for shipments are ignored</value>
<value xml:lang="fr">L'option "Coût des expéditions au prorata" ne vaut pas N pour le centre de profit ${productStoreId} : les frais d'expédition additionnels sont ignorés</value>
<value xml:lang="hi_IN">productStoreId ${productStoreId} à¤à¥ लिठprorateShipping N नहà¥à¤ हॠ: माल लदान à¤à¥ लिठà¤
तिरिà¤à¥à¤¤ शà¥à¤²à¥à¤ à¤à¥ à¤à¤ªà¥à¤à¥à¤·à¤¾ à¤à¤° रहॠहà¥à¤</value>
@@ -4787,6 +4788,7 @@
</property>
<property key="AccountingInvoiceCancelledCannotApplyTo">
<value xml:lang="ar">اÙÙاتÙرة [${invoiceId}] Ùد Ø£ÙغÙت, Ùا ÙÙ
Ù٠تطبÙÙÙا عÙÙ</value>
+ <value xml:lang="de">Rechnung [${invoiceId}] ist storniert und kann nicht zugewiesen werden...</value>
<value xml:lang="en">Invoice [${invoiceId}] is cancelled, cannot be applied to...</value>
<value xml:lang="es">Factura [${invoiceId}] esta cancelada, no puede ser aplicada...</value>
<value xml:lang="fr">Facture [${invoiceId}] annullée, il ne peut y être alloué de paiement...</value>
@@ -4956,7 +4958,7 @@
</property>
<property key="AccountingInvoiceDateAbbr">
<value xml:lang="ar">تارÙØ® اÙÙاتÙرة</value>
- <value xml:lang="de">Rg-Dat.</value>
+ <value xml:lang="de">Rg-Datum</value>
<value xml:lang="en">Inv. Date</value>
<value xml:lang="es">F. Fact</value>
<value xml:lang="fr">Date fact.</value>
@@ -4970,7 +4972,7 @@
</property>
<property key="AccountingInvoiceHeader">
<value xml:lang="ar">اÙرأسÙØ©</value>
- <value xml:lang="de">Kopf</value>
+ <value xml:lang="de">Kopfzeile</value>
<value xml:lang="en">Header</value>
<value xml:lang="es">Cabecera</value>
<value xml:lang="fr">En-tête</value>
@@ -4984,7 +4986,7 @@
</property>
<property key="AccountingInvoiceHeaderDetailedInformation">
<value xml:lang="ar">اÙرأسÙØ© باÙتÙصÙÙ</value>
- <value xml:lang="de">Detaillierte Kopfinformationen</value>
+ <value xml:lang="de">Kopfzeile Detailinformation</value>
<value xml:lang="en">Header Detailed Information</value>
<value xml:lang="es">Información detallada de cabecera</value>
<value xml:lang="fr">Détails de l'en-tête</value>
@@ -4998,7 +5000,7 @@
</property>
<property key="AccountingInvoiceID">
<value xml:lang="ar">تعرÙ٠اÙÙاتÙرة</value>
- <value xml:lang="de">Rechnungs-Nr.</value>
+ <value xml:lang="de">Rechnungsnummer</value>
<value xml:lang="en">InvoiceID</value>
<value xml:lang="es">IdFactura</value>
<value xml:lang="fr">Réf. facture</value>
@@ -5030,7 +5032,7 @@
</property>
<property key="AccountingInvoiceItemAdd">
<value xml:lang="ar">إضاÙØ© بÙد ÙاتÙرة جدÙد</value>
- <value xml:lang="de">Neue Rechnungsposition hinzufügen</value>
+ <value xml:lang="de">Weitere Rechnungsposition hinzufügen</value>
<value xml:lang="en">Add a new invoice Item</value>
<value xml:lang="es">Agregar un nuevo elemento de factura</value>
<value xml:lang="fr">Ajouter une ligne de facturation</value>
@@ -5092,7 +5094,7 @@
</property>
<property key="AccountingInvoiceItemSeqId">
<value xml:lang="ar">رÙÙ
اÙبÙد</value>
- <value xml:lang="de">Positionsnummer</value>
+ <value xml:lang="de">Pos.Nr.</value>
<value xml:lang="en">Item Nr</value>
<value xml:lang="es">Nr Elemento</value>
<value xml:lang="fr">Ligne de facturation réf.</value>
@@ -5105,7 +5107,7 @@
<value xml:lang="zh">æç»ç¼å·</value>
</property>
<property key="AccountingInvoiceItemType">
- <value xml:lang="de">Rechnungspostentyp</value>
+ <value xml:lang="de">Rechnungsposition Typ</value>
<value xml:lang="en">Invoice Item Type</value>
<value xml:lang="fr">Type de ligne de facture</value>
<value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ मद à¤à¥ पà¥à¤°à¤à¤¾à¤°</value>
@@ -5175,7 +5177,7 @@
</property>
<property key="AccountingInvoiceOverview">
<value xml:lang="ar">Ùبذة</value>
- <value xml:lang="de">Ãberblick</value>
+ <value xml:lang="de">Ãbersicht</value>
<value xml:lang="en">Overview</value>
<value xml:lang="es">Visión general</value>
<value xml:lang="fr">Aperçu</value>
@@ -6519,7 +6521,7 @@
</property>
<property key="AccountingNotModificationRecrationGlAccount">
<value xml:lang="ar">Ùا ÙÙ
Ù٠تعÙÙر Ùذا دÙ٠إعادة إستØداث Øساب اÙÙ
ØاسبÙ</value>
- <value xml:lang="de">Das kann nicht ohne Neuanlage des Kontos geändert werden.</value>
+ <value xml:lang="de">Diese Einstellung kann nicht ohne Neuerstellung des HB Kontos geändert werden</value>
<value xml:lang="en">This cannot be changed without re-creating the GL Account.</value>
<value xml:lang="es">Esto no puede ser cambiado sin recrear la cuenta de LM.</value>
<value xml:lang="fr">Ceci ne peut pas être modifié sans recréer un compte comptable</value>
@@ -6677,7 +6679,7 @@
<value xml:lang="zh">å®å</value>
</property>
<property key="AccountingOrgGlSettings">
- <value xml:lang="de">Hauptbuch-Einstellungen des Unternehmens</value>
+ <value xml:lang="de">Hauptbuch-Einstellungen, Org.</value>
<value xml:lang="en">Organization GL Settings</value>
<value xml:lang="fr">Configurations internes du GL</value>
<value xml:lang="hi_IN">सà¤à¤à¤ न à¤à¥à¤à¤²(Gl) सà¥à¤à¤¿à¤à¤à¥à¤¸</value>
@@ -6686,7 +6688,7 @@
</property>
<property key="AccountingOrganizationPartyId">
<value xml:lang="ar">تعرÙ٠طر٠اÙÙ
ؤسسة</value>
- <value xml:lang="de">Firmen-ID</value>
+ <value xml:lang="de">Akteur ID (Org.)</value>
<value xml:lang="en">Organization Party Id</value>
<value xml:lang="es">Id Grupo de Organización</value>
<value xml:lang="fr">Réf. acteur de type Organisation</value>
@@ -7250,7 +7252,7 @@
<value xml:lang="zh">æ¹å</value>
</property>
<property key="AccountingPaymentGatewayConfigId">
- <value xml:lang="de">Zahlungs-Gateway-Konfigurations-Id</value>
+ <value xml:lang="de">Zahlungs-Schnittstellen-Id</value>
<value xml:lang="en">Payment Gateway Config Id</value>
<value xml:lang="fr">Réf. config. passerelle de paiement</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -7258,7 +7260,7 @@
<value xml:lang="zh">æ¯ä»ç½å
³é
ç½®æ è¯</value>
</property>
<property key="AccountingPaymentGatewayConfigDescription">
- <value xml:lang="de">Zahlungs-Gateway-Konfigurations-Beschreibung</value>
+ <value xml:lang="de">Beschreibung</value>
<value xml:lang="en">Payment Gateway Config Description</value>
<value xml:lang="fr">Description de la configuration de passerelle de paiement</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ वरà¥à¤£à¤¨</value>
@@ -7266,6 +7268,7 @@
<value xml:lang="zh">æ¯ä»ç½å
³é
ç½®æè¿°</value>
</property>
<property key="AccountingPaymentGatewayConfigTypeDescription">
+ <value xml:lang="de">Schnittstellentyp, Beschr.</value>
<value xml:lang="de">Zahlungs-Gateway-Konfigurations-Art-Beschreibung</value>
<value xml:lang="en">Payment Gateway Config Type Description</value>
<value xml:lang="fr">Description des types de configuration de passerelle de paiement</value>
@@ -7274,7 +7277,7 @@
<value xml:lang="zh">æ¯ä»ç½å
³é
置类åæè¿°</value>
</property>
<property key="AccountingPaymentGatewayConfigTypeId">
- <value xml:lang="de">Zahlungs-Gateway-Konfigurations-Art-Nr.</value>
+ <value xml:lang="de">Schnittstellentyp</value>
<value xml:lang="en">Payment Gateway Config Type Id</value>
<value xml:lang="fr">Type de configuration de passerelle de paiment</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ पà¥à¤°à¤à¤¾à¤° à¤à¥à¤°à¤®à¤¾à¤à¤</value>
@@ -7290,7 +7293,7 @@
<value xml:lang="zh">æ¯ä»ç½å
³é
ç½®</value>
</property>
<property key="AccountingPaymentGatewayConfigTypes">
- <value xml:lang="de">Zahlungs-Gateway-Konfigurations-Arten</value>
+ <value xml:lang="de">Konfigurationstypen</value>
<value xml:lang="en">Payment Gateway Config Types</value>
<value xml:lang="fr">Types de configuration de passerelle de paiment</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ पà¥à¤°à¤à¤¾à¤°</value>
@@ -7298,7 +7301,7 @@
<value xml:lang="zh">æ¯ä»ç½å
³é
置类å</value>
</property>
<property key="AccountingPaymentGatewayDecline">
- <value xml:lang="de">Ablehnung</value>
+ <value xml:lang="de">Ablehnen</value>
<value xml:lang="en">Decline</value>
<value xml:lang="fr">Décliner</value>
<value xml:lang="hi_IN">à¤
सà¥à¤µà¥à¤à¥à¤¤</value>
@@ -7314,7 +7317,7 @@
<value xml:lang="zh">çæ</value>
</property>
<property key="AccountingPaymentGatewayRandom">
- <value xml:lang="de">Zufall</value>
+ <value xml:lang="de">Zufällig</value>
<value xml:lang="en">Random</value>
<value xml:lang="fr">Aléatoire</value>
<value xml:lang="hi_IN">à¤à¥à¤°à¤®à¤°à¤¹à¤¿à¤¤</value>
@@ -8190,6 +8193,9 @@
<value xml:lang="en">Problem getting ShipmentItemBilling records</value>
<value xml:lang="hi_IN">ShipmentItemBilling à¤
à¤à¤¿à¤²à¥à¤à¥à¤ à¤à¥ लिठसमसà¥à¤¯à¤¾ हॠरहà¥</value>
</property>
+ <property key="AccountingProblemGettingShipmentItemBilling">
+ <value xml:lang="en">Problem getting ShipmentItemBilling records</value>
+ </property>
<property key="AccountingProblemLookingUpOrderItemBilling">
<value xml:lang="en">Problem looking up OrderItemBilling records for ${billFields}</value>
<value xml:lang="es">Problema buscando Elemento de orden de facturación para ${billFields}</value>
@@ -8238,7 +8244,7 @@
<value xml:lang="zh">产ååç±»æ»è´¦è´¦æ·</value>
</property>
<property key="AccountingProductGlAccount">
- <value xml:lang="de">Produkt-Hauptkonto</value>
+ <value xml:lang="de">Buchkonten d. Produkte</value>
<value xml:lang="en">Product GL Accounts</value>
<value xml:lang="fr">Comptes de produit</value>
<value xml:lang="hi_IN">à¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¥à¤à¤²(Gl) à¤à¤¾à¤¤à¤¾</value>
@@ -8492,6 +8498,7 @@
<value xml:lang="hi_IN">विà¤à¥à¤°à¤¯ à¤à¤¾à¤²à¤¾à¤¨ </value>
</property>
<property key="AccountingSecurityCodeCard">
+ <value xml:lang="de">Sicherheitscode</value>
<value xml:lang="en">Card Security Code</value>
<value xml:lang="es">Código de seguridad de tarjeta</value>
<value xml:lang="fr">Code de sécurité carte</value>
@@ -8513,6 +8520,7 @@
</property>
<property key="AccountingSendChecks">
<value xml:lang="ar">تعÙÙÙ
اÙصÙÙÙ ÙÙ
رسÙØ©</value>
+ <value xml:lang="de">Schecks sind eingereicht</value>
<value xml:lang="en">Mark Checks Sent</value>
<value xml:lang="es">Marcar cheques como enviados</value>
<value xml:lang="fr">Marquer les chèques comme envoyés</value>
@@ -8867,6 +8875,7 @@
<value xml:lang="zh">ç¨å¡æºå
³å°çä¿¡æ¯</value>
</property>
<property key="AccountingTaxAuthorityGlAccounts">
+ <value xml:lang="de">Steuerbehörde HB-Konten</value>
<value xml:lang="en">TaxAuthority GL Accounts </value>
<value xml:lang="fr">Comptes de l'administration fiscale</value>
<value xml:lang="hi_IN">à¤à¥à¤à¥à¤¸ पà¥à¤°à¤¾à¤§à¤¿à¤à¤°à¤£ à¤à¥à¤à¤²(Gl) लà¥à¤à¤¾</value>
@@ -8877,6 +8886,7 @@
</property>
<property key="AccountingTaxAuthorityParty">
<value xml:lang="ar">طر٠اÙسÙطة اÙضرÙبÙØ©</value>
+ <value xml:lang="de">Steuerbehörde (Akteur)</value>
<value xml:lang="en">Tax Authority Party</value>
<value xml:lang="es">Grupo de autoridad fiscal</value>
<value xml:lang="fr">Réf. d'acteur de l'Administration fiscale</value>
@@ -8889,6 +8899,7 @@
<value xml:lang="zh">ç¨å¡æºå
³ä¼å</value>
</property>
<property key="AccountingTaxAuthorityRateProductUseCategoryTab">
+ <value xml:lang="de">Verwenden Sie den Kategorien-Tab um weitere Optionen hinzu zu fügen</value>
<value xml:lang="en">Use the Categories tab to add other category options</value>
<value xml:lang="fr">Utilisez l'onglet Catégories pour ajouter d'autres options de catégorie</value>
<value xml:lang="hi_IN">à¤
नà¥à¤¯ शà¥à¤°à¥à¤£à¥ विà¤à¤²à¥à¤ªà¥à¤ à¤à¥ à¤à¥à¤¡à¤¼à¤¨à¥ à¤à¥ लिठशà¥à¤°à¥à¤£à¤¿à¤¯à¤¾à¤ à¤à¥à¤¬ à¤à¤¾ à¤à¤ªà¤¯à¥à¤ à¤à¤°à¥à¤</value>
@@ -8904,6 +8915,7 @@
</property>
<property key="AccountingTaxSummary">
<value xml:lang="ar">تÙرÙر Ù
Ùخص اÙضرÙبة</value>
+ <value xml:lang="de">Zusammenfasssung Steuer-Bericht</value>
<value xml:lang="en">Tax Summary Report</value>
<value xml:lang="es">Informe resumido de impuestos</value>
<value xml:lang="fr">Rapport fiscal résumé</value>
@@ -9583,7 +9595,7 @@
</property>
<property key="AcctgAssignGlAccount">
<value xml:lang="ar">تعÙÙ٠اÙØساب اÙÙ
ØاسبÙ</value>
- <value xml:lang="de">zuweisen Hauptbuchkonto</value>
+ <value xml:lang="de">Hauptbuchkonto zuweisen</value>
<value xml:lang="en">Assign GL Account</value>
<value xml:lang="es">Asignar Cuenta de LM</value>
<value xml:lang="fr">Assigner un compte comptable</value>
@@ -9633,6 +9645,7 @@
</property>
<property key="AcctgGlAcctLabel">
<value xml:lang="ar">اÙØساب اÙÙ
Øاسب٠:</value>
+ <value xml:lang="de">Hauptbuchkonto : </value>
<value xml:lang="en">GL Account : </value>
<value xml:lang="es">Cuenta LM :</value>
<value xml:lang="fr">Compte: </value>
@@ -9658,6 +9671,7 @@
<value xml:lang="zh">è´¢å¡ç±»å : </value>
</property>
<property key="AcctgGlJournalEntry">
+ <value xml:lang="de">Hauptbuch-Journal</value>
<value xml:lang="en">GL Journal</value>
<value xml:lang="fr">Journal du Grand Livre</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤²(Gl) à¤à¤°à¥à¤¨à¤² :</value>
@@ -9668,6 +9682,7 @@
</property>
<property key="AcctgGlJrnlDescLabel">
<value xml:lang="ar">اÙÙص٠:</value>
+ <value xml:lang="de">Beschreibung : </value>
<value xml:lang="en">Description : </value>
<value xml:lang="es">Descripción :</value>
<value xml:lang="fr">Description:</value>
@@ -9680,6 +9695,7 @@
<value xml:lang="zh">æè¿° : </value>
</property>
<property key="AcctgGlJrnlIdLabel">
+ <value xml:lang="de">HB Journal ID : </value>
<value xml:lang="en">GL Journal ID : </value>
<value xml:lang="es">Id diario LM:</value>
<value xml:lang="fr">Journal:</value>
@@ -9705,6 +9721,7 @@
</property>
<property key="AcctgGlPartyLabel">
<value xml:lang="ar">اÙطر٠اÙÙ
Øاسب٠:</value>
+ <value xml:lang="de">HB Akteur : </value>
<value xml:lang="en">GL Party : </value>
<value xml:lang="es">Grupo LM :</value>
<value xml:lang="fr">Acteur Grand Livre: </value>
@@ -9718,6 +9735,7 @@
</property>
<property key="AcctgListGlAcctOrg">
<value xml:lang="ar">إدراج اÙÙ
ؤسسة اÙÙ
ØاسبÙØ©</value>
+ <value xml:lang="de">Liste der HB Organisationen</value>
<value xml:lang="en">List GL Organization</value>
<value xml:lang="es">Lista de organización de LM</value>
<value xml:lang="fr">Liste des comptes de l'organisation</value>
@@ -9744,6 +9762,7 @@
<value xml:lang="zh">æµè§è´¦æ·</value>
</property>
<property key="AcctgNewGlJournalEntry">
+ <value xml:lang="de">Neuer Journaleintrag</value>
<value xml:lang="en">New Journal Entry</value>
<value xml:lang="fr">Nouvelle écriture comptable</value>
<value xml:lang="hi_IN">नठà¤à¤°à¥à¤¨à¤² पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿</value>
@@ -10448,7 +10467,7 @@
<value xml:lang="zh">åæ¹æ»è´¦è´¦æ·æ è¯</value>
</property>
<property key="FormFieldTitle_defaultGlAccountId">
- <value xml:lang="de">Standard GL-Konto ID</value>
+ <value xml:lang="de">Standard HB-Konto ID</value>
<value xml:lang="en">Default Gl Account Id</value>
<value xml:lang="es">Id Cuenta de LM por omisión</value>
<value xml:lang="fr">Réf. de compte par défaut</value>
@@ -10465,6 +10484,7 @@
<value xml:lang="fr">Compte d'amortissment</value>
</property>
<property key="FormFieldTitle_depreciation">
+ <value xml:lang="de_DE">Abschreibung</value>
<value xml:lang="en">Depreciation</value>
<value xml:lang="fr">Dépréciation</value>
<value xml:lang="hi_IN">मà¥à¤²à¥à¤¯à¤¹à¥à¤°à¤¾à¤¸</value>
@@ -10758,6 +10778,7 @@
<value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ दिनाà¤à¤ सà¥</value>
</property>
<property key="FormFieldTitle_gatewayAvsResult">
+ <value xml:lang="de">Schnittstelle AVS Ergebnis</value>
<value xml:lang="en">Gateway Avs Result</value>
<value xml:lang="es">Resultado Puerta Avs</value>
<value xml:lang="fr">Réponse Avs du terminal de paiement</value>
@@ -10771,6 +10792,7 @@
</property>
<property key="FormFieldTitle_gatewayCode">
<value xml:lang="ar">رÙ
ز اÙعبÙر</value>
+ <value xml:lang="de">Schnittstellencode</value>
<value xml:lang="en">Gateway Code</value>
<value xml:lang="es">Código de puerta</value>
<value xml:lang="fr">Code du terminal de paiement</value>
@@ -10783,6 +10805,7 @@
<value xml:lang="zh">ç½å
³ä»£ç </value>
</property>
<property key="FormFieldTitle_gatewayCvResult">
+ <value xml:lang="de">Schnittstelle CV Ergebnis</value>
<value xml:lang="en">Gateway Cv Result</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤µà¥ Cv परिणाम</value>
<value xml:lang="it">Risultato Cv gateway</value>
@@ -10790,6 +10813,7 @@
</property>
<property key="FormFieldTitle_gatewayFlag">
<value xml:lang="ar">عÙاÙ
Ø© اÙعبÙر</value>
+ <value xml:lang="de">Schnittstellen-Flag</value>
<value xml:lang="en">Gateway Flag</value>
<value xml:lang="es">Bandera de puerta</value>
<value xml:lang="fr">Indicateur du terminal de paiement</value>
@@ -10803,6 +10827,7 @@
</property>
<property key="FormFieldTitle_gatewayMessage">
<value xml:lang="ar">رساÙØ© اÙعبÙر</value>
+ <value xml:lang="de">Schnittstellen-Mitteilung</value>
<value xml:lang="en">Gateway Message</value>
<value xml:lang="es">Mensaje de puerta</value>
<value xml:lang="fr">Message du terminal de paiement</value>
@@ -10816,6 +10841,7 @@
</property>
<property key="FormFieldTitle_gatewayScoreResult">
<value xml:lang="ar">ÙتÙجة اÙعبÙر</value>
+ <value xml:lang="de">Schnittstelle Score Ergebnis</value>
<value xml:lang="en">Gateway Score Result</value>
<value xml:lang="es">Gateway Score Result</value>
<value xml:lang="fr">Score du terminal de paiement</value>
@@ -13097,6 +13123,7 @@
<value xml:lang="zh">ç¼è¾åºå®èµäº§æ åè´¹ç¨</value>
</property>
<property key="PageTitleEditGlAccount">
+ <value xml:lang="de">HB-Konto bearbeiten</value>
<value xml:lang="en">Edit GL Account</value>
<value xml:lang="es">Editar Cuenta de LM</value>
<value xml:lang="fr">Modifier un compte comptable</value>
@@ -13111,6 +13138,7 @@
<value xml:lang="zh">ç¼è¾æ»è´¦è´¦æ·</value>
</property>
<property key="PageTitleEditGlobalGlAccount">
+ <value xml:lang="de">Globales HB-Konto bearbeiten</value>
<value xml:lang="en">Edit Global GL Account</value>
<value xml:lang="es">Editar Cuenta Global de LM</value>
<value xml:lang="fr">Modifier un compte comptable global</value>
@@ -13202,6 +13230,7 @@
<value xml:lang="zh">ç¼è¾ç¨å¡æºå
³äº§ååç±»</value>
</property>
<property key="PageTitleEditTaxAuthorityGlAccounts">
+ <value xml:lang="de">Steuerbehörde HB-Konten bearbeiten</value>
<value xml:lang="en">Edit Tax Authority GL Accounts</value>
<value xml:lang="es">Editar Cuentas de LM de Autoridad Fiscal</value>
<value xml:lang="fr">Modifier les comptes des administrations fiscales</value>
@@ -13214,6 +13243,7 @@
<value xml:lang="zh">ç¼è¾ç¨å¡æºå
³æ»è´¦è´¦æ·</value>
</property>
<property key="PageTitleEditTaxAuthorityPartyInfo">
+ <value xml:lang="de">Steuerbehörde Akteur-Info bearbeiten</value>
<value xml:lang="en">Edit Tax Authority Party Info</value>
<value xml:lang="es">Editar Info de Grupo de Autoridad Fiscal</value>
<value xml:lang="fr">Modifier les informations d'une administration fiscale</value>
@@ -13328,12 +13358,14 @@
<value xml:lang="en">Find Financial Account Reconciliations for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value>
</property>
<property key="PageTitleFindPaymentGatewayConfig">
+ <value xml:lang="de">Bezahl-Schnittstelle-Konfigurationen suchen</value>
<value xml:lang="en">Find Payment Gateway Config</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ à¤à¥à¤à¥à¤</value>
<value xml:lang="it">Ricerca configurazioni gateway pagamenti</value>
<value xml:lang="zh">æ¥æ¾æ¯ä»ç½å
³é
ç½®</value>
</property>
<property key="PageTitleFindPaymentGatewayConfigTypes">
+ <value xml:lang="de">Bezahl-Schnittstelle. Konfigurationstypen suchen</value>
<value xml:lang="en">Find Payment Gateway Config Types</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ पà¥à¤°à¤à¤¾à¤° à¤à¥à¤à¥à¤</value>
<value xml:lang="it">Ricerca tipi configurazioni gateway pagamenti</value>
@@ -13362,6 +13394,7 @@
<value xml:lang="zh">æ¥æ¾æ»è´¦è´¦æ·</value>
</property>
<property key="PageTitleFindGlobalGlAccount">
+ <value xml:lang="de">HB-Konto suchen</value>
<value xml:lang="en">Find Global GL Account</value>
<value xml:lang="es">Encontrar Cuenta Global de LM</value>
<value xml:lang="fr">Recherche de comptes globaux</value>
@@ -13374,7 +13407,7 @@
<value xml:lang="zh">æ¥æ¾å
¨å±æ»è´¦è´¦æ·</value>
</property>
<property key="PageTitleFindInvoice">
- <value xml:lang="de">Suche Rechnungen</value>
+ <value xml:lang="de">Rechnungen suchen</value>
<value xml:lang="en">Find Invoice</value>
<value xml:lang="es">Encontrar Factura</value>
<value xml:lang="fr">Recherche de factures</value>
@@ -13789,6 +13822,7 @@
<value xml:lang="zh">æ¥æ¾åºå®èµäº§</value>
</property>
<property key="PageTitleLookupGlAccount">
+ <value xml:lang="de">HB-Konto suchen</value>
<value xml:lang="en">Lookup GL Account</value>
<value xml:lang="es">Buscar Cuenta de LM</value>
<value xml:lang="fr">Consultation de compte</value>
@@ -13867,12 +13901,14 @@
<value xml:lang="zh">æªè¿æ·è´¢å¡äº¤æ</value>
</property>
<property key="PageTitleUpdatePaymentGatewayConfig">
+ <value xml:lang="de">Bezahl-Schnittstelle aktualisieren</value>
<value xml:lang="en">Update Payment Gateway Config</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ à¤à¤¨à¥à¤¨à¤¤ à¤à¤°à¥</value>
<value xml:lang="it">Aggiorna configurazione gateway pagamento</value>
<value xml:lang="zh">æ´æ°æ¯ä»ç½å
³é
ç½®</value>
</property>
<property key="PageTitleUpdatePaymentGatewayConfigType">
+ <value xml:lang="de">Bezahl-Schnittstellen-Typ aktualisieren</value>
<value xml:lang="en">Update Payment Gateway Config Type</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ पà¥à¤°à¤à¤¾à¤° à¤à¤¨à¥à¤¨à¤¤ à¤à¤°à¥</value>
<value xml:lang="it">Aggiorna tipo configurazione gateway pagamento</value>
@@ -13884,6 +13920,7 @@
<value xml:lang="it">Aggiorna configurazione gateway pagamento Authorize Dot Net</value>
</property>
<property key="PageTitleUpdatePaymentGatewayConfigClearCommerce">
+ <value xml:lang="de">Bezahl-Schnittstelle Clear Commerce aktualisieren</value>
<value xml:lang="en">Update Payment Gateway Config Clear Commerce</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ सà¥à¤ªà¤·à¥à¤ वाणिà¤à¥à¤¯ à¤à¤¨à¥à¤¨à¤¤ à¤à¤°à¥</value>
<value xml:lang="it">Aggiorna configurazione gateway pagamento Clear Commerce</value>
@@ -13895,12 +13932,14 @@
<value xml:lang="it">Aggiorna configurazione gateway pagamento CyberSource</value>
</property>
<property key="PageTitleUpdatePaymentGatewayConfigPayflowPro">
+ <value xml:lang="de">Bezahl-Schnittstelle Payflow Pro aktualisieren</value>
<value xml:lang="en">Update Payment Gateway Config Payflow Pro</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ Payflow Pro à¤à¤¨à¥à¤¨à¤¤ à¤à¤°à¥</value>
<value xml:lang="it">Aggiorna configurazione gateway pagamento Payflow Pro</value>
<value xml:lang="zh">æ´æ°Payflow Proçæ¯ä»ç½å
³é
ç½®</value>
</property>
<property key="PageTitleUpdatePaymentGatewayConfigPayPal">
+ <value xml:lang="de">Bezahl-Schnittstelle PayPal aktualisieren</value>
<value xml:lang="en">Update Payment Gateway Config PayPal</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ PayPal à¤à¤¨à¥à¤¨à¤¤ à¤à¤°à¥</value>
<value xml:lang="it">Aggiorna configurazione gateway pagamento PayPal</value>
@@ -13924,6 +13963,7 @@
<value xml:lang="zh">æµè§è´¢å¡äº¤æ</value>
</property>
<property key="PageTitleViewGatewayResponse">
+ <value xml:lang="de">Bezahl-Schnittstellen-Antwort ansehen</value>
<value xml:lang="en">View Gateway Response</value>
<value xml:lang="fr">Voir la réponse du terminal de paiement</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤µà¥ पà¥à¤°à¤¤à¤¿à¤à¥à¤°à¤¿à¤¯à¤¾à¤à¤ दà¥à¤à¥à¤</value>
Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-999128
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1000101
Modified: ofbiz/branches/jquery/applications/party/config/PartyErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyErrorUiLabels.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/config/PartyErrorUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/party/config/PartyErrorUiLabels.xml Wed Sep 22 17:42:36 2010
@@ -61,6 +61,10 @@
<value xml:lang="th">ERROR: à¸à¸´à¸à¸à¸¥à¸²à¸ ! à¹à¸¡à¹à¸à¸à¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value>
<value xml:lang="zh">é误ï¼æ²¡ææ¾å°æ²éäºä»¶ï¼æ²éå®è·µæ è¯</value>
</property>
+ <property key="commeventservices.communication_event_status">
+ <value xml:lang="en">ERROR: Status is not a valid change; old Status: ${communicationEvent.statusId}, new status: ${parameters.statusId}</value>
+ <value xml:lang="fr">ERREUR : Le changement de ${communicationEvent.statusId} Ã ${parameters.statusId} n'est pas valide</value>
+ </property>
<property key="commeventservices.communication_event_to_contact_mech_must_be_email">
<value xml:lang="de">FEHLER: Kommunikationsereignis muss ein "Kontaktmechanismus an" besitzen das ein E-Mail als Kommunikationereignis ID ist</value>
<value xml:lang="en">ERROR: Communication event must have a to contact mech that is an email for comm event Id</value>
Modified: ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Wed Sep 22 17:42:36 2010
@@ -539,7 +539,7 @@ under the License.
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
<if-empty field="statusChange">
- <add-error><fail-message message="Status is not a valid change; old Status: ${communicationEvent.statusId}, new status: ${parameters.statusId}"/></add-error>
+ <add-error><fail-property resource="PartyErrorUiLabels" property="commeventservices.communication_event_status"/></add-error>
<log level="error" message="Cannot change from ${communicationEvent.statusId} to ${parameters.statusId}"/>
<check-errors/>
<else>
Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-999128
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1000101
Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Wed Sep 22 17:42:36 2010
@@ -8963,6 +8963,10 @@
<value xml:lang="th">à¹à¸à¸·à¹à¸à¸à¹à¸</value>
<value xml:lang="zh">æ¡ä»¶</value>
</property>
+ <property key="ProductConditionsActionsRemoveBefore">
+ <value xml:lang="en">To remove a price rule, you must before remove all conditions and actions (if it's possible, since if one of those is alreay used elsewhere you can't)</value>
+ <value xml:lang="fr">Pour supprimer une règle de prix, vous devez d'abord supprimer toutes les conditions et actions (si possible car si l'une d'entre elles est déjà utilisé ailleurs vous ne pourrez pas)</value>
+ </property>
<property key="ProductConditionsThenActions">
<value xml:lang="en">If all conditions are true, then actions will be executed (logical conjunction, ie conditions are 'ANDED' between them, so are actions))</value>
<value xml:lang="fr">Si toutes les conditions sont vérifiées, alors les actions seront exécutées (conjonction, autrement dit ET logique entre conditions, de même pour les actions)</value>
Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-999128
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1000101
Modified: ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml Wed Sep 22 17:42:36 2010
@@ -216,6 +216,7 @@ under the License.
</request-map>
<request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
+ <request-map uri="LookupGeoName"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeoName"/></request-map>
<!--========================== AJAX events =====================-->
<!-- View Mappings -->
@@ -240,4 +241,5 @@ under the License.
<view-map name="viewBlocked" type="screen" page="component://common/widget/CommonScreens.xml#viewBlocked"/>
<view-map name="LookupGeo" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeo"/>
+ <view-map name="LookupGeoName" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeoName"/>
</site-conf>
Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-999128
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1000101
Modified: ofbiz/branches/jquery/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/LookupForms.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/branches/jquery/framework/common/widget/LookupForms.xml Wed Sep 22 17:42:36 2010
@@ -59,4 +59,12 @@ under the License.
<field name="abbreviation" title="${uiLabelMap.CommonGeoAbbr}"><display/></field>
<field name="wellKnownText" title="${uiLabelMap.CommonGeoWellKnownText}"><display/></field>
</form>
+
+ <form name="LookupGeoName" extends="LookupGeo" target="LookupGeoName"/>
+ <form name="listLookupGeoName" extends="listLookupGeo" paginate-target="LookupGeoName">
+ <field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
+ <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_values('${geoName}', '${geoId}')"/>
+ </field>
+ </form>
+
</forms>
Modified: ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/branches/jquery/framework/common/widget/LookupScreens.xml Wed Sep 22 17:42:36 2010
@@ -44,7 +44,30 @@ under the License.
</widgets>
</section>
</screen>
-
+
+ <screen name="LookupGeoName">
+ <section>
+ <actions>
+ <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ <set field="entityName" value="Geo"/>
+ <set field="searchFields" value="[geoName, geoId, geoCode]"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="LookupGeoName" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupGeoName" location="component://common/widget/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<!-- Locales Lookup Screen -->
<screen name="ListLocales">
<section>
Modified: ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml Wed Sep 22 17:42:36 2010
@@ -40,6 +40,14 @@
<value xml:lang="ru">ÐÑиложение ÐÑимеÑ</value>
<value xml:lang="th">à¸à¸±à¸§à¸à¸¢à¹à¸²à¸à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸à¸¡à¸à¸´à¸§à¹à¸à¸à¸£à¹</value>
<value xml:lang="zh">æ ·ä¾åºç¨</value>
+ </property>
+ <property key="ExampleAutocompleteDropdown">
+ <value xml:lang="en">Autocomplete Dropdown</value>
+ <value xml:lang="fr">Liste déroulante à auto complétion</value>
+ </property>
+ <property key="ExampleAutocompleteTooltip">
+ <value xml:lang="en">GROUP type based example, use Geo.Geoid and Geo.GeoName Entity.fields for completion</value>
+ <value xml:lang="fr">Exemple sur le type GROUP et utilisant Geo.Geoid et Geo.GeoName comme Entité.champs pour la complétion</value>
</property>
<property key="ExampleBirtChartReport">
<value xml:lang="en">HTML chart report</value>
Modified: ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/branches/jquery/framework/example/widget/example/ExampleForms.xml Wed Sep 22 17:42:36 2010
@@ -239,18 +239,6 @@ under the License.
<field name="exampleFeatureId" title="${uiLabelMap.ExampleFeature}">
<lookup target-form-name="LookupExampleFeature"/>
</field>
- <!-- most feature rich for autocomplete, ie partial text entry searches the full string,
- doesn't require custom request to function, etc; Note that for usability this is still a bit lame since you can't see the full list,
- you HAVE to know part of the ID or description in order to see options -->
- <!--field name="exampleFeatureId">
- <drop-down>
- <auto-complete/>
- <entity-options entity-name="ExampleFeature" description="${exampleFeatureId}: ${description}">
- <entity-order-by field-name="exampleFeatureId"/>
- </entity-options>
- </drop-down>
- </field-->
-
<field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="false">
<entity-options entity-name="ExampleFeatureApplType" description="${description}">
Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml Wed Sep 22 17:42:36 2010
@@ -229,9 +229,27 @@ under the License.
</drop-down>
</field>
<!-- ****************************** -->
+ <!-- *** Autocomplete dropdown *** -->
+ <!-- ****************************** -->
+ <!-- most feature rich for autocomplete, ie partial text entry searches the full string,
+ doesn't require custom request to function, etc; Note that for usability this is still a bit lame since you can't see the full list,
+ you HAVE to know part of the ID or description in order to see options -->
+ <!-- TODO : return only the Id, else you need to edit the field to remove the description -->
+ <field name="emptyField1" title="${uiLabelMap.CommonEmptyHeader}"><display/></field>
+ <field name="geoId" title="${uiLabelMap.ExampleAutocompleteDropdown}"
+ tooltip="${uiLabelMap.ExampleAutocompleteTooltip}">
+ <drop-down>
+ <auto-complete/>
+ <entity-options entity-name="Geo" description="${geoId}: ${geoName}">
+ <entity-constraint name="geoTypeId" value="GROUP"/>
+ <entity-order-by field-name="geoName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <!-- ****************************** -->
<!-- *** Dependent dropdowns *** -->
<!-- ****************************** -->
- <field name="emptyField" title="${uiLabelMap.CommonEmptyHeader}"><display/></field>
+ <field name="emptyField2" title="${uiLabelMap.CommonEmptyHeader}"><display/></field>
<field name="dependendDropDownFields" title="${uiLabelMap.ExampleDependentDropDowns}">
<display description="${uiLabelMap.ExampleDependentDropDownTooltip}"/>
</field>
@@ -317,18 +335,18 @@ under the License.
<!-- Lookup Examples -->
<form name="ExampleLookupFields" type="single" title="">
- <!-- Old style lookup (in a popup window) -->
- <field name="partyId" title="${uiLabelMap.CommonPartyId}">
- <lookup target-form-name="LookupPartyName" presentation="window"/>
+ <!-- Old style lookup (in a popup window), geoIdAlone because we have another geoId below -->
+ <field name="geoIdAlone" title="${uiLabelMap.CommonGeoId}">
+ <lookup target-form-name="LookupGeo" presentation="window"/>
</field>
<!-- Standard lookup (in a layer)-->
<!-- passes the name in one field and the id in another, this does not work yet with autcompletion, WIP... -->
- <field name="partyName" title="${uiLabelMap.CommonPartyGroupName}">
- <lookup target-form-name="LookupPartyGroupByName" description-field-name="partyGroupId"/>
+ <field name="geoName" title="${uiLabelMap.CommonGeoName}">
+ <lookup target-form-name="LookupGeoName" description-field-name="geoId"/>
</field>
<!-- This field may be hidden and the name rendered in partyName using default-value if partyGroupId is known when loading the form-->
- <field name="partyGroupId" title="${uiLabelMap.CommonPartyId}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden field commented below to pass the data to the request -->
- <!--field name="partyGroupId"><hidden/></field-->
+ <field name="geoId" title="${uiLabelMap.CommonGeoId}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden field commented below to pass the data to the request -->
+ <!--field name="geoId"><hidden/></field-->
<sort-order>
<field-group>
<sort-field name="partyId"/>
Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Wed Sep 22 17:42:36 2010
@@ -893,6 +893,7 @@ public class MacroFormRenderer implement
ModelForm modelForm = modelFormField.getModelForm();
String currentValue = modelFormField.getEntry(context);
Boolean allChecked = checkField.isAllChecked(context);
+ String id = modelFormField.getCurrentContainerId(context);
String className = "";
String alert = "false";
String name = modelFormField.getParameterName(context);
@@ -927,6 +928,8 @@ public class MacroFormRenderer implement
sr.append(className);
sr.append("\" alert=\"");
sr.append(alert);
+ sr.append("\" id=\"");
+ sr.append(id);
sr.append("\" allChecked=");
sr.append((allChecked != null? Boolean.toString(allChecked): "\"\""));
sr.append(" currentValue=\"");
Modified: ofbiz/branches/jquery/framework/widget/templates/csvFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/csvFormMacroLibrary.ftl?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jquery/framework/widget/templates/csvFormMacroLibrary.ftl Wed Sep 22 17:42:36 2010
@@ -41,7 +41,7 @@ under the License.
</#macro>
<#macro renderTooltip tooltip tooltipStyle></#macro>
-<#macro renderCheckField items className alert allChecked currentValue name event action></#macro>
+<#macro renderCheckField items className alert id allChecked currentValue name event action></#macro>
<#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event ation></#macro>
<#macro renderSubmitField buttonType className alert formName title name event action imgSrc confirmation containerId ajaxUrl></#macro>
Modified: ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl Wed Sep 22 17:42:36 2010
@@ -64,7 +64,7 @@ under the License.
</#if>
</#macro>
-<#macro renderCheckField items className alert allChecked currentValue name event action><@makeBlock "" "" /></#macro>
+<#macro renderCheckField items className alert id allChecked currentValue name event action><@makeBlock "" "" /></#macro>
<#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event ation><@makeBlock "" "" /></#macro>
<#macro renderSubmitField buttonType className alert formName title name event action imgSrc confirmation containerId ajaxUrl><@makeBlock "" "" /></#macro>
Modified: ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Sep 22 17:42:36 2010
@@ -178,9 +178,9 @@ if(disa && document.styleSheets)
</#if>
</#macro>
-<#macro renderCheckField items className alert allChecked currentValue name event action>
+<#macro renderCheckField items className alert id allChecked currentValue name event action>
<#list items as item>
-<input type="checkbox" <@renderClass className alert /><#rt/>
+<input type="checkbox"<#if (item_index == 0)> id="${id}"</#if> <@renderClass className alert /><#rt/>
<#if allChecked?has_content && allChecked> checked="checked" <#elseif allChecked?has_content && !allChecked><#elseif currentValue?has_content && currentValue==item.value> checked="checked"</#if> name="${name?default("")?html}" value="${item.value?default("")?html}"<#if event?has_content> ${event}="${action}"</#if>/><#rt/>
${item.description?default("")}
</#list>
Modified: ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jquery/framework/widget/templates/textFormMacroLibrary.ftl Wed Sep 22 17:42:36 2010
@@ -41,7 +41,7 @@ under the License.
</#macro>
<#macro renderTooltip tooltip tooltipStyle></#macro>
-<#macro renderCheckField items className alert allChecked currentValue name event action></#macro>
+<#macro renderCheckField items className alert id allChecked currentValue name event action></#macro>
<#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event ation></#macro>
<#macro renderSubmitField buttonType className alert formName title name event action imgSrc confirmation containerId ajaxUrl></#macro>
Modified: ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=1000103&r1=1000102&r2=1000103&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jquery/framework/widget/templates/xmlFormMacroLibrary.ftl Wed Sep 22 17:42:36 2010
@@ -49,7 +49,7 @@ under the License.
<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch>
</#macro>
-<#macro renderCheckField items className alert allChecked currentValue name event action></#macro>
+<#macro renderCheckField items className alert id allChecked currentValue name event action></#macro>
<#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event action></#macro>
<#macro renderSubmitField buttonType className alert formName title name event action imgSrc confirmation containerId ajaxUrl></#macro>
Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-999128
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1000101
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-999128
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1000101
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-999128
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1000101
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 17:42:36 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-999128
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1000101