svn commit: r1231507 [1/3] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1231507 [1/3] - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Sat Jan 14 14:40:09 2012 New Revision: 1231507 URL: http://svn.apache.org/viewvc?rev=1231507&view=rev Log: Update the Jackrabbit branch with the current trunk version to keep the branch up to date Removed: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl Modified: ofbiz/branches/jackrabbit20100709/ (props changed) ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ar/invoice/ListInvoices.ftl ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetForms.xml ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetScreens.xml ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlSetupForms.xml ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/data/DemoBlogEntryData.xml ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearch.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java ofbiz/branches/jackrabbit20100709/applications/product/testdef/data/IssuanceTestData.xml ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java ofbiz/branches/jackrabbit20100709/build.xml ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ComponentContainer.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/UrlServletHelper.java ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/listVisualThemes.ftl ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/common/widget/PortalPageScreens.xml ofbiz/branches/jackrabbit20100709/framework/documents/DataFiles.xml ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java ofbiz/branches/jackrabbit20100709/ivy.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/build.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/commit.py ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/post-commit ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/pre-commit ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumDemoData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumSecurityData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/permissionServices.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/services.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/ClosedSprintNotification.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/testdef/scrumTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/error/error.jsp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/index.jsp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/error/error.jsp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/index.jsp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/CommunicationEventForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/EmailTemplates.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/OpenTestForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/OpenTestScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/TimeSheetForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/demotest/DemotestScreen.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumMenus.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumScreens.xml Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 14 14:40:09 2012 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1229275 +/ofbiz/trunk:962442-1231506 Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml Sat Jan 14 14:40:09 2012 @@ -296,6 +296,7 @@ <value xml:lang="fr">Ajouter une période de temps</value> <value xml:lang="hi_IN">सà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ समय ठवधि à¤à¥à¤¡à¤¼à¥à¤</value> <value xml:lang="it">Aggiungi Periodi di Tempo Personalizzati</value> + <value xml:lang="nl">Aangepaste periode toevoegen</value> <value xml:lang="pt">Adicionar perÃodo personalizado</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸à¸³à¸«à¸à¸à¸£à¸°à¸¢à¸°à¹à¸§à¸¥à¸²</value> <value xml:lang="zh">æ·»å å®å¶æ¶é´æ®µ</value> @@ -303,6 +304,7 @@ </property> <property key="AccountingAddFinAccountReconciliations"> <value xml:lang="en">Add Financial Account Reconciliations for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value> + <value xml:lang="nl">Toevoegen afstemmingen voor Financiele rekening : ${finAccount.finAccountName} [${finAccountId}]</value> <value xml:lang="pt">Adicionar Reconciliação de Conta Financeira para Conta Financeira: ${finAccount.finAccountName} [${finAccountId}]</value> <value xml:lang="zh">为财å¡è´¦ç® ${finAccount.finAccountName} [${finAccountId}] æ·»å è´¢å¡è´¦ç®å¯¹è´¦</value> </property> @@ -325,7 +327,7 @@ <value xml:lang="fr">Ajouter une identification d'immobilisation</value> <value xml:lang="hi_IN">ठà¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ पहà¤à¤¾à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value> <value xml:lang="it">Nuova identificazione cespite</value> - <value xml:lang="nl">Voeg vaste activa-identificatie toe</value> + <value xml:lang="nl">Vaste activa-id toevoegen</value> <value xml:lang="pt">Adicionar Identificação de Ativos Fixos</value> <value xml:lang="ro">Actualizeaza Identitate Mijloc Fix</value> <value xml:lang="ru">РедакÑиÑование иденÑиÑикаÑоÑов ÐС</value> @@ -339,6 +341,7 @@ <value xml:lang="fr">Ajouter une commande de maintenance d'immobilisation</value> <value xml:lang="hi_IN">ठà¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ रà¤à¤°à¤à¤¾à¤µ à¤à¥ à¤à¤¦à¥à¤¶ à¤à¥à¤¡à¤¼à¥à¤</value> <value xml:lang="it">Nuovo ordine di manutenzione cespite</value> + <value xml:lang="nl">Opdracht voor onderhoud op vaste activa toevoegen</value> <value xml:lang="pt">Adicionar Pedido de Manutenção de Ativos Fixos</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> <value xml:lang="zh">æ·»å åºå®èµäº§ç»´ä¿®ä¿å »è®¢å</value> @@ -365,7 +368,7 @@ <value xml:lang="fr">Ajouter une mesure de la maintenance d'immobilisation</value> <value xml:lang="hi_IN">ठà¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ मापठरà¥à¤¡à¤¿à¤à¤ à¤à¥à¤¡à¤¼à¥à¤</value> <value xml:lang="it">Nuova misura contatori cespite</value> - <value xml:lang="nl">Voeg meterwaarde vaste activa toe</value> + <value xml:lang="nl">Meterwaarde vaste activa toevoegen</value> <value xml:lang="pt">Adicionar leitura de medidor de Ativos Fixos</value> <value xml:lang="th">Add Fixed Asset Maintenance Meter</value> <value xml:lang="zh">æ·»å åºå®èµäº§ä»ªè¡¨è¯»æ°</value> @@ -377,6 +380,7 @@ <value xml:lang="fr">Ajouter une tâche d'un acteur à une immobilisation</value> <value xml:lang="hi_IN">ठà¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ मà¥à¤ नियत à¤à¤¾à¤°à¥à¤¯ à¤à¤°à¤¨à¥ à¤à¥ लिठपारà¥à¤à¥ à¤à¥à¤¡à¤¼à¥à¤</value> <value xml:lang="it">Nuova assegnazione cespite a soggetto</value> + <value xml:lang="nl">Taaktoewijzing Vaste Activa toevoegen</value> <value xml:lang="pt">Adicionar Atribuição de Ativos Fixos ao participante</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> <value xml:lang="zh">æ·»å ä¼ååºå®èµäº§åé </value> @@ -389,6 +393,7 @@ <value xml:lang="fr">Ajouter l'enregistrement d'immobilisation</value> <value xml:lang="hi_IN">ठà¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ लिठपà¤à¤à¥à¤¯à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value> <value xml:lang="it">Nuova registrazione cespite</value> + <value xml:lang="nl">Registratie ID voor Vaste Activa toevoegen</value> <value xml:lang="pt">Adicionar Registro de de Ativo Fixo</value> <value xml:lang="ro">Actualizeaza Inregistrare Mijloc Fix</value> <value xml:lang="ru">ÐзмениÑÑ ÑегиÑÑÑаÑий ÐС</value> @@ -440,7 +445,7 @@ <value xml:lang="hi_IN">नया EFT à¤à¤¼à¤¾à¤¤à¤¾</value> <value xml:lang="it">Aggiungi nuovo conto EFT</value> <value xml:lang="ja">Add New EFT Account</value> - <value xml:lang="nl">Voeg een nieuwe bankrekening toe</value> + <value xml:lang="nl">Nieuwe bankrekening toevoegen</value> <value xml:lang="pt">Adicionar Nova Conta EFT</value> <value xml:lang="pt_PT">Adicionar Nova Conta EFT</value> <value xml:lang="ro">Adauga Nou Cont EFT</value> @@ -458,7 +463,7 @@ <value xml:lang="hi_IN">नया à¤à¤ªà¤¹à¤¾à¤° à¤à¤¼à¤¾à¤¤à¤¾</value> <value xml:lang="it">Aggiungi nuova carta omaggio</value> <value xml:lang="ja">ã®ããã«ã¼ãã®è¿½å </value> - <value xml:lang="nl">Voeg een nieuwe tegoedbon toe</value> + <value xml:lang="nl">Tegoedbon toevoegen</value> <value xml:lang="pt">Adicionar Novo Cartão de presente</value> <value xml:lang="ro">Adauga Noua Carte Omagiu</value> <value xml:lang="ru">ÐобавиÑÑ Ð½Ð¾Ð²ÑÑ Ð´Ð¸ÑконÑнÑÑ ÐºÐ°ÑÑÑ</value> @@ -481,6 +486,7 @@ <property key="AccountingAddPaymentGroupMember"> <value xml:lang="en">Add Payment Group Member</value> <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹ सदसà¥à¤¯ à¤à¥à¤¡à¤¼à¥à¤</value> + <value xml:lang="nl">Payment Group Member toevoegen</value> <value xml:lang="pt">Adicionar Membro do Grupo de Pagamento</value> <value xml:lang="zh">æ·»å æ¯ä»ç»æå</value> <value xml:lang="zh_TW">å¢å æ¯ä»ç¾¤çµæå¡</value> @@ -488,6 +494,7 @@ <property key="AccountingAddTax"> <value xml:lang="en">Add Tax</value> <value xml:lang="fr">Ajouter les taxes</value> + <value xml:lang="nl">Belastingen toevoegen</value> <value xml:lang="zh">æ·»å ç¨é¡¹</value> </property> <property key="AccountingAddTaxAuthorityGlAccount"> @@ -638,6 +645,7 @@ <value xml:lang="fr">Point de l'accord commercial (articles) pour rapport</value> <value xml:lang="hi_IN">ठनà¥à¤¬à¤à¤§ वसà¥à¤¤à¥ à¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¥ लिठबà¥à¤¯à¥à¤°à¥à¤µà¤¾à¤° विवरण</value> <value xml:lang="it">Prodotti riga contratto per i report</value> + <value xml:lang="nl">Overeenkomst items producten voor rapport</value> <value xml:lang="pt">Itens do acordo para o Relatório</value> <value xml:lang="zh">ç¨äºæ¥è¡¨çååæ¡æ¬¾äº§å</value> <value xml:lang="zh_TW">ç¨äºå ±è¡¨çååæ¢æ¬¾ç¢å</value> @@ -663,6 +671,7 @@ <value xml:lang="fr">Point de l'accord commercial (articles/fournisseur) pour rapport</value> <value xml:lang="hi_IN">ठनà¥à¤¬à¤à¤§ वसà¥à¤¤à¥ पà¥à¤°à¤¦à¤¾à¤¯à¤ à¤à¥ लिठबà¥à¤¯à¥à¤°à¥à¤µà¤¾à¤° विवरण</value> <value xml:lang="it">Prodotti fornitore riga contratto per i report</value> + <value xml:lang="nl">Overeenkomst item leverancier producten voor rapport</value> <value xml:lang="pt">Fornecedores dos itens do acordo para relatório</value> <value xml:lang="zh">ç¨äºæ¥è¡¨çååæ¡æ¬¾ä¾è´§å产å</value> <value xml:lang="zh_TW">ç¨äºå ±è¡¨çååæ¢æ¬¾ä¾è²¨åç¢å</value> @@ -707,7 +716,7 @@ <value xml:lang="fr">Points d'accord commercial</value> <value xml:lang="hi_IN">ठनà¥à¤¬à¤à¤§ मदà¥à¤</value> <value xml:lang="it">Righe Contratto</value> - <value xml:lang="nl">Overeenkomst Items</value> + <value xml:lang="nl">Overeenkomst items</value> <value xml:lang="pt">Itens do acordo</value> <value xml:lang="ro">Linii Contract</value> <value xml:lang="ru">ÐлеменÑÑ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñа</value> @@ -991,6 +1000,7 @@ <value xml:lang="fr">Modifier le vendeur</value> <value xml:lang="hi_IN">विà¤à¥à¤°à¥à¤¤à¤¾ à¤à¥ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤</value> <value xml:lang="it">Aggiorna fornitore</value> + <value xml:lang="nl">Leverancier wijzigen</value> <value xml:lang="pt">Editar fornecedor</value> <value xml:lang="zh">ç¼è¾ä¾åºå</value> <value xml:lang="zh_TW">編輯ä¾æå</value> @@ -1031,6 +1041,7 @@ <property key="AccountingApPaymentGroupMenu"> <value xml:lang="en">AP Payment Groups</value> <value xml:lang="fr">Groupes de paiement AP</value> + <value xml:lang="nl">AP Betalingsgroepen</value> <value xml:lang="pt">Grupos de pagamento de contas a pagar</value> <value xml:lang="zh">åºä»æ¯ä»ç»</value> <value xml:lang="zh_TW">æä»æ¯ä»ç¾¤çµ</value> @@ -1218,6 +1229,7 @@ <value xml:lang="fr">Page d'accueil de la comptabilité client</value> <value xml:lang="hi_IN">मà¥à¤à¥à¤¯ पà¥à¤·à¥à¤ पà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¤¾à¤¤à¤¾</value> <value xml:lang="it">Pagina principale conto creditori</value> + <value xml:lang="nl">Hoofdpagina Debiteuren</value> <value xml:lang="pt">Página principal do contas a receber</value> <value xml:lang="zh">åºæ¶è´¦æ·é¦é¡µ</value> <value xml:lang="zh_TW">ææ¶è³¬æ¶é¦é </value> @@ -1269,6 +1281,7 @@ <property key="AccountingArPaymentGroupMenu"> <value xml:lang="en">AR Payment Groups</value> <value xml:lang="fr">Groupes de paiement</value> + <value xml:lang="nl">AP Betalingsgroepen</value> <value xml:lang="pt">Grupos de Pagamento do Contas a receber</value> <value xml:lang="zh">åºæ¶æ¯ä»ç»</value> <value xml:lang="zh_TW">ææ¶æ¯ä»ç¾¤çµ</value> @@ -4332,6 +4345,7 @@ <property key="AccountingFindArInvoices"> <value xml:lang="en">Find AR Invoices</value> <value xml:lang="hi_IN">लà¥à¤à¤¾ पà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value> + <value xml:lang="nl">Crediteuren facturen vinden</value> <value xml:lang="pt">Encontrar Faturas do contas a receber</value> <value xml:lang="zh">æ¥æ¾åºæ¶å票</value> <value xml:lang="zh_TW">æ¾å°ææ¶ç¼ç¥¨</value> @@ -4339,6 +4353,7 @@ <property key="AccountingFindArPaymentGroups"> <value xml:lang="en">Find AR Payment Groups</value> <value xml:lang="fr">Recherche de groupes de paiement</value> + <value xml:lang="nl">AR Betalingsgroepen vinden</value> <value xml:lang="pt">Buscar os grupos de pagamento do contas a receber</value> <value xml:lang="zh">æ¥æ¾åºæ¶æ¯ä»ç»</value> <value xml:lang="zh_TW">æ¾å°ææ¶æ¯ä»ç¾¤çµ</value> @@ -4346,6 +4361,7 @@ <property key="AccountingFindArPayments"> <value xml:lang="en">Find AR Payments</value> <value xml:lang="hi_IN">लà¥à¤à¤¾ पà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¥à¤</value> + <value xml:lang="nl">Crediteuren betalingen vinden</value> <value xml:lang="pt">Encontrar Pagamentos do contas a receber</value> <value xml:lang="zh">æ¥æ¾åºæ¶æ¯ä»</value> <value xml:lang="zh_TW">æ¾å°ææ¶æ¯ä»</value> @@ -4358,6 +4374,7 @@ </property> <property key="AccountingFindFinAccountReconciliations"> <value xml:lang="en">Find Financial Account Reconciliations</value> + <value xml:lang="nl">Afstemmingen financiele rekeningen vinden</value> <value xml:lang="pt">Encontrar reconciliações de Conta Financeira</value> <value xml:lang="zh">æ¥æ¾è´¢å¡è´¦ç®å¯¹è´¦</value> </property> @@ -4397,6 +4414,7 @@ <value xml:lang="en">Find Payment Group</value> <value xml:lang="fr">Recherche de groupes de paiement</value> <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹ à¤à¥à¤à¥à¤</value> + <value xml:lang="nl">Betalingsgroep vinden</value> <value xml:lang="pt">Encontrar Grupo de pagamento</value> <value xml:lang="zh">æ¥æ¾æ¯ä»ç»</value> <value xml:lang="zh_TW">æ¾å°æ¯ä»ç¾¤çµ</value> @@ -4405,6 +4423,7 @@ <value xml:lang="en">Find Purchase Invoices</value> <value xml:lang="fr">Recherche de factures d'achat</value> <value xml:lang="hi_IN">à¤à¤°à¥à¤¦ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value> + <value xml:lang="nl">Inkoopfactuur vinden</value> <value xml:lang="pt">Encontrar faturas de compra</value> <value xml:lang="zh">æ¥æ¾éè´å票</value> <value xml:lang="zh_TW">æ¾å°æ¡è³¼ç¼ç¥¨</value> @@ -4437,6 +4456,7 @@ <value xml:lang="en">Find Sales Invoices For Commission Run</value> <value xml:lang="hi_IN">दलालॠà¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥ लिठबिà¤à¥à¤°à¥ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value> <value xml:lang="it">Ricerca fatture di vendita per commissione</value> + <value xml:lang="nl">Verkoopfactuur voor commissierun vinden</value> <value xml:lang="pt">Encontrar faturas de venda por Comissão</value> <value xml:lang="zh">为佣é计ç®æ¥æ¾éå®å票</value> </property> @@ -4459,6 +4479,7 @@ <property key="AccountingFirstNameOnCardMissing"> <value xml:lang="de">Vorname des Karteninhabers fehlt</value> <value xml:lang="en">First Name on Card is missing</value> + <value xml:lang="nl">Voornaam van de kaarthouder ontbreekt</value> <value xml:lang="pt">Primeiro nome no cartão está faltando</value> <value xml:lang="zh">缺å°å¡ä¸å§åç第ä¸ç»åæ¯</value> <value xml:lang="zh_TW">æ²æå¡çä¸çåå</value> @@ -5750,6 +5771,9 @@ <value xml:lang="pt">Reconciliação de contabilidade para: ${finAccount.finAccountName} [${finAccountId}]</value> <value xml:lang="zh">æ»è´¦å¯¹è´¦ï¼${finAccount.finAccountName} [${finAccountId}]</value> </property> + <property key="AccountingGlMappings"> + <value xml:lang="en">GL Mappings</value> + </property> <property key="AccountingGlobalGLSettings"> <value xml:lang="de">Hauptbuch-Einstellungen, global</value> <value xml:lang="en">Global GL Settings</value> @@ -5764,6 +5788,7 @@ </property> <property key="AccountingGrossMargin"> <value xml:lang="en">Gross Margin</value> + <value xml:lang="nl">Bruto marge</value> <value xml:lang="pt">Margem Bruta</value> <value xml:lang="zh">æ¯å©</value> </property> @@ -5851,6 +5876,7 @@ </property> <property key="AccountingIncomeFromOperations"> <value xml:lang="en">Income From Operations</value> + <value xml:lang="nl">Operationele inkomsten</value> <value xml:lang="pt">Resultado Operacional</value> <value xml:lang="zh">è¥è¿æ¶å ¥</value> </property> @@ -8239,6 +8265,7 @@ </property> <property key="AccountingOperatingExpenses"> <value xml:lang="en">Operating Expenses</value> + <value xml:lang="nl">Operationele kosten</value> <value xml:lang="pt">Despesas Operacionais</value> <value xml:lang="zh">è¥ä¸è´¹ç¨</value> </property> @@ -8335,6 +8362,7 @@ <value xml:lang="fr">Réf. d'org.</value> <value xml:lang="hi_IN">सà¤à¤à¤ न पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤</value> <value xml:lang="it">Organizzazione</value> + <value xml:lang="nl">Organisatie ID</value> <value xml:lang="pt">ID de organização participante</value> <value xml:lang="th">รหัสà¸à¸à¸à¹à¸à¸£à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">ç»ç»ä¼åæ è¯</value> @@ -8642,6 +8670,7 @@ <property key="AccountingPastDueInvoices"> <value xml:lang="en">Past Due Invoices</value> <value xml:lang="fr">Factures en attente de règlement</value> + <value xml:lang="nl">Vervallen facturen</value> <value xml:lang="pt">Faturas passdas em débito</value> <value xml:lang="zh">è¿æå票</value> </property> @@ -10481,6 +10510,7 @@ <value xml:lang="en">Purchase Invoices</value> <value xml:lang="fr">Factures d'achat</value> <value xml:lang="hi_IN">à¤à¤°à¥à¤¦ à¤à¤¾à¤²à¤¾à¤¨</value> + <value xml:lang="nl">Inkoopfacturen</value> <value xml:lang="pt">Faturas de Compra</value> <value xml:lang="zh">éè´å票</value> </property> @@ -10520,6 +10550,7 @@ <value xml:lang="fr">Taux</value> <value xml:lang="hi_IN">मà¥à¤²à¥à¤¯</value> <value xml:lang="it">Tassi</value> + <value xml:lang="nl">Tarieven</value> <value xml:lang="pt">Tarifas</value> <value xml:lang="zh">ç¨ç</value> <value xml:lang="zh_TW">ç¨ ç</value> @@ -10557,6 +10588,7 @@ <value xml:lang="de">Kontenabstimmung</value> <value xml:lang="en">Reconciliation</value> <value xml:lang="hi_IN">मिलाप</value> + <value xml:lang="nl">Afstemming</value> <value xml:lang="pt">Reconciliação</value> <value xml:lang="zh">对账</value> <value xml:lang="zh_TW">調ç¯</value> @@ -10772,6 +10804,7 @@ <property key="AccountingSagePayPaymentError"> <value xml:lang="en">Problem at SagePay</value> <value xml:lang="it">Problemi di SagePay</value> + <value xml:lang="nl">Probleem bij SagePay</value> <value xml:lang="zh">SagePayåºé</value> </property> <property key="AccountingSagePayPaymentInvalidInformationPassed"> @@ -10792,6 +10825,7 @@ <property key="AccountingSagePayPaymentRefunded"> <value xml:lang="en">Payment Refunded</value> <value xml:lang="it">Pagamento rimborsato</value> + <value xml:lang="nl">Betaling teruggewezen</value> <value xml:lang="zh">æ¯ä»å·²é</value> </property> <property key="AccountingSagePayPaymentReleaseRequestMalformed"> @@ -10903,6 +10937,7 @@ <value xml:lang="de">Vertreter</value> <value xml:lang="en">Sales Agents</value> <value xml:lang="hi_IN">विà¤à¥à¤°à¤¯ दलाल</value> + <value xml:lang="nl">Vertegenwoordiger</value> <value xml:lang="pt">Agentes de Vendas</value> <value xml:lang="zh">éå®ä»£ç</value> <value xml:lang="zh_TW">é·å®ä»£ç</value> @@ -10926,6 +10961,7 @@ <value xml:lang="de">Verkaufsrechnungen</value> <value xml:lang="en">Sales Invoices</value> <value xml:lang="hi_IN">विà¤à¥à¤°à¤¯ à¤à¤¾à¤²à¤¾à¤¨ </value> + <value xml:lang="nl">Verkoopfacturen</value> <value xml:lang="pt">Faturas</value> <value xml:lang="zh">éå®å票</value> <value xml:lang="zh_TW">é·å®ç¼ç¥¨</value> @@ -10948,23 +10984,27 @@ <property key="AccountingSecurityPayNotProperlyConfigurated"> <value xml:lang="en">ERROR: Getting SecurePay property configuration</value> <value xml:lang="it">ERRORE: Ricavando la configurazione di SecurePay</value> + <value xml:lang="nl">ERROR: ophalen SecurePay configuratie</value> <value xml:lang="zh">é误ï¼è·åSecurePayå±æ§è®¾ç½®æ¶</value> </property> <property key="AccountingSecurityPayPaymentWasNotSent"> <value xml:lang="en">Payment was not sent to server.</value> <value xml:lang="it">Pagamento non è stato inviato al server.</value> + <value xml:lang="nl">Betaling is niet naar de server verzonden</value> <value xml:lang="zh">æ¯ä»æ²¡æåéå°æå¡å¨ã</value> </property> <property key="AccountingSelectAction"> <value xml:lang="en">Select Action</value> <value xml:lang="fr">Choisir une action</value> <value xml:lang="hi_IN">à¤à¤¾à¤°à¥à¤¯ à¤à¥à¤¨à¥à¤</value> + <value xml:lang="nl">Actie selecteren</value> <value xml:lang="pt">Selecionar Ação</value> <value xml:lang="zh">éæ©æä½</value> </property> <property key="AccountingSelectPartiesForCommissionInvoice"> <value xml:lang="en">Select The Parties For Commission Invoice</value> <value xml:lang="hi_IN">दलालॠà¤à¤¾à¤²à¤¾à¤¨ à¤à¥ लिठपारà¥à¤à¤¿à¤¯à¥à¤ à¤à¥à¤¨à¥à¤</value> + <value xml:lang="nl">Partijen voor commisiefactuur selecteren</value> <value xml:lang="pt">Selecionar participantes para fatura de Comissão</value> <value xml:lang="zh">为佣éå票éæ©ä¼å</value> </property> @@ -11438,6 +11478,7 @@ <property key="AccountingTaxCannotCalculate"> <value xml:lang="en">Cannot calculate tax, no shipping or.......</value> <value xml:lang="it">Non è possibile calcolare le tasse, nessuna spedizione o.......</value> + <value xml:lang="nl">Belasting kan niet berekend worden, geen transport of .....</value> <value xml:lang="pt">Não é possÃvel calcular o imposto, não envio ou .......</value> <value xml:lang="zh">æ æ³ç®ç¨ï¼æ²¡æè¿è¾æ......</value> </property> @@ -11477,6 +11518,7 @@ <property key="AccountingTermAmount"> <value xml:lang="en">Term Amount</value> <value xml:lang="hi_IN">शरà¥à¤¤ राशà¥</value> + <value xml:lang="nl">Conditie bedrag</value> <value xml:lang="pt">Quantia do prazo</value> <value xml:lang="zh">æéé¢</value> </property> @@ -11512,6 +11554,7 @@ <property key="AccountingTheBalanceOfLastYear"> <value xml:lang="en">The balance of last year</value> <value xml:lang="hi_IN">पिà¤à¤²à¥ वरà¥à¤· à¤à¤¾ शà¥à¤·</value> + <value xml:lang="nl">Saldo vorig jaar</value> <value xml:lang="pt">O saldo do ano passado</value> <value xml:lang="zh">ä¸å¹´ä½é¢</value> </property> @@ -11626,47 +11669,55 @@ <property key="AccountingTotalCashBalance"> <value xml:lang="en">Total Cash Balance</value> <value xml:lang="hi_IN">à¤à¥à¤² नà¤à¤¦à¥ शà¥à¤·</value> + <value xml:lang="nl">Totaal saldo cash</value> <value xml:lang="pt">Saldo Total em caixa</value> <value xml:lang="zh">ç°éä½é¢å计</value> </property> <property key="AccountingTotalClosingCashBalance"> <value xml:lang="en">Total Closing Cash Balance</value> <value xml:lang="hi_IN">à¤à¥à¤² बà¤à¤¦ नà¤à¤¦à¥ शà¥à¤·</value> + <value xml:lang="nl">Totaal eindbalans cash</value> <value xml:lang="pt">Saldo Total de Caixa de Encerramento</value> <value xml:lang="zh">ææ«ç°éä½é¢</value> </property> <property key="AccountingTotalCommissionAmount"> <value xml:lang="en">Total Commission Amount</value> <value xml:lang="hi_IN">à¤à¥à¤² दलालॠराशà¥</value> + <value xml:lang="nl">Totaal bedrag commissies</value> <value xml:lang="pt">Quantia Total da Comissão</value> <value xml:lang="zh">ä½£éå计</value> </property> <property key="AccountingTotalCostCenterAmount"> <value xml:lang="en">Cost center amount percentage saved successfully</value> + <value xml:lang="nl">Percentage kostenplaats succesvol opgeslagen</value> <value xml:lang="pt">Porcentagem da Quantia central de custo salva com sucesso</value> <value xml:lang="zh">æåä¿åäºè´¹ç¨ä¸å¿éé¢ç¾åæ¯</value> </property> <property key="AccountingTotalCredit_Disbursement"> <value xml:lang="en">Total Credit(Disbursement)</value> <value xml:lang="hi_IN">à¤à¥à¤² à¤à¤®à¤¾</value> + <value xml:lang="nl">Totaal Credit (betalingen)</value> <value xml:lang="pt">Crédito Total (Desembolso)</value> <value xml:lang="zh">è´·æ¹å计ï¼æ¯åºï¼</value> </property> <property key="AccountingTotalCurrentAssetBalance"> <value xml:lang="en">Total Current Asset Balance</value> <value xml:lang="hi_IN">à ¤â¢Ã Â¥Ã ¤² à ¤šà ¤¾à ¤²à ¥â à ¤¸à ¤®à ¥Ã ¤ªà ¤¤à ¥Ã ¤¤à ¤¿ à ¤°à ¤¾à ¤¶à ¥â¬</value> + <value xml:lang="nl">Totaal vlottende activa</value> <value xml:lang="pt">Total do Balanço Patrimonial atual</value> <value xml:lang="zh">æµå¨èµäº§ä½é¢å计</value> </property> <property key="AccountingTotalDebit_Receipts"> <value xml:lang="en">Total Debit(Receipts)</value> <value xml:lang="hi_IN">à¤à¥à¤² नामà¥</value> + <value xml:lang="nl">Totaal Debet (ontvangsten)</value> <value xml:lang="pt">Débito Total (Recibos)</value> <value xml:lang="zh">åæ¹å计ï¼æ¶å ¥ï¼</value> </property> <property key="AccountingTotalEndingCashBalance"> <value xml:lang="en">Total Ending Cash Balance</value> <value xml:lang="hi_IN">à¤à¥à¤² ठà¤à¤¤à¤¿à¤® नà¤à¤¦à¥ शà¥à¤·</value> + <value xml:lang="nl">Totaal eindbalans cash</value> <value xml:lang="pt">Saldo Total Final de Caixa</value> <value xml:lang="zh">ææ«ç°éä½é¢å计</value> </property> @@ -11699,48 +11750,56 @@ <property key="AccountingTotalNetSales"> <value xml:lang="en">Total Net Sales</value> <value xml:lang="hi_IN">à¤à¥à¤² शà¥à¤¦à¥à¤§ विà¤à¥à¤°à¤¯</value> + <value xml:lang="nl">Totaal netto verkopen</value> <value xml:lang="pt">Total das vendas lÃquidas</value> <value xml:lang="zh">åéå®å计</value> </property> <property key="AccountingTotalNumberOfOrders"> <value xml:lang="en">Total Number of Orders</value> <value xml:lang="hi_IN">à¤à¥à¤² à¤à¤¦à¥à¤¶à¥à¤ à¤à¥ सà¤à¤à¥à¤¯à¤¾</value> + <value xml:lang="nl">Totaal aantal orders</value> <value xml:lang="pt">Número total de pedidos</value> <value xml:lang="zh">订åæ°éå计</value> </property> <property key="AccountingTotalOfTheCurrentMonth"> <value xml:lang="en">Total of the current month</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¥ माह à¤à¥ à¤à¥à¤²</value> + <value xml:lang="nl">Totaal van huidige maand</value> <value xml:lang="pt">Total do mês atual</value> <value xml:lang="zh">å½æå计</value> </property> <property key="AccountingTotalOfYearToDate"> <value xml:lang="en">Total of Year To Date</value> <value xml:lang="hi_IN">वरà¥à¤· सॠदिनाà¤à¤ à¤à¤¾ à¤à¥à¤²</value> + <value xml:lang="nl">Totaal van jaar tot nu</value> <value xml:lang="pt">Total do Ano até o momento</value> <value xml:lang="zh">å½å¹´å计</value> </property> <property key="AccountingTotalOpeningCashBalance"> <value xml:lang="en">Total Opening Cash Balance</value> <value xml:lang="hi_IN">à¤à¥à¤² ठथ नà¤à¤¦à¥ शà¥à¤·</value> + <value xml:lang="nl">Totaal openingsbalans cash</value> <value xml:lang="pt">Saldo de Abertura de Caixa Total</value> <value xml:lang="zh">æåç°éä½é¢å计</value> </property> <property key="AccountingTotalOperationalCashBalance"> <value xml:lang="en">Total Operational Cash Balance</value> <value xml:lang="hi_IN">à ¤â¢Ã Â¥Ã ¤² à ¤â¢Ã Â¥Ã ¤°à ¤¿à ¤¯à ¤¾à ¤¶à ¥â¬Ã ¤² à ¤¨à ¤â¢Ã ¤¦à ¥â¬</value> + <value xml:lang="nl">Totaal operationele balans cash</value> <value xml:lang="pt">Saldo de Caixa Operacional Total</value> <value xml:lang="zh">ç°éä½é¢å计</value> </property> <property key="AccountingTotalPeriodCashBalance"> <value xml:lang="en">Total Period Cash Balance</value> <value xml:lang="hi_IN">à¤à¥à¤² ठवधि नà¤à¤¦à¥ शà¥à¤·</value> + <value xml:lang="nl">Totaal periode balans cash</value> <value xml:lang="pt">Saldo Total do perÃodo em caixa</value> <value xml:lang="zh">æ¶é´æ®µç°éä½é¢å计</value> </property> <property key="AccountingTotalQuantityOnHand"> <value xml:lang="en">Total Quantity On Hand</value> <value xml:lang="hi_IN">à¤à¥à¤² मातà¥à¤°à¤¾ हाथ पर</value> + <value xml:lang="nl">Totaal hoeveelheden onder handen</value> <value xml:lang="pt">Total das quantidades disponÃveis</value> <value xml:lang="zh">ç°åæ°éå计</value> </property> @@ -11757,6 +11816,7 @@ <property key="AccountingTransactionIsAlreadyReconciled"> <value xml:lang="en">Transaction Is already Reconciled</value> <value xml:lang="hi_IN">à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ पहलॠसॠहॠसमà¤à¥à¤¤à¤¾ हà¥</value> + <value xml:lang="nl">Transactie is al afgestemd</value> <value xml:lang="pt">Transação já foi reconciliada</value> <value xml:lang="zh">交æå·²ç»å¯¹è¿è´¦äº</value> </property> @@ -11774,6 +11834,7 @@ <property key="AccountingTransactionTotalsReport"> <value xml:lang="en">Transaction Totals Report</value> <value xml:lang="hi_IN">à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ यà¥à¤ बà¥à¤¯à¥à¤°à¥à¤µà¤¾à¤° विवरण</value> + <value xml:lang="nl">Rapport transatie-totalen</value> <value xml:lang="pt">Relatório de Transações totais</value> <value xml:lang="zh">交ææ»é¢æ¥å</value> </property> @@ -14706,6 +14767,9 @@ <value xml:lang="pt">Nova categoria de Conta Razão</value> <value xml:lang="zh">æ°å»ºæ»è´¦è´¦æ·åç±»</value> </property> + <property key="FormFieldTitle_NextDepreciationAmount"> + <value xml:lang="en">Next depreciation amount</value> + </property> <property key="FormFieldTitle_notApplied"> <value xml:lang="en">Not Applied</value> <value xml:lang="fr">Non alloué</value> @@ -15828,6 +15892,7 @@ <value xml:lang="en">Source Id</value> <value xml:lang="hi_IN">सà¥à¤°à¥à¤¤ à¤à¥à¤°à¤®à¤¾à¤à¤(SourceId)</value> <value xml:lang="it">Id sorgente</value> + <value xml:lang="nl">Bron ID</value> <value xml:lang="pt">Id da fonte</value> <value xml:lang="zh">æ¥æºæ è¯</value> <value xml:lang="zh_TW">ä¾æºç·¨è</value> @@ -16023,7 +16088,7 @@ <value xml:lang="fr">Valeur du texte</value> <value xml:lang="hi_IN">पाठà¥à¤¯ मान</value> <value xml:lang="it">Testo Valore</value> - <value xml:lang="nl">Text Value</value> + <value xml:lang="nl">Textwaarde</value> <value xml:lang="pt">Valor do Texto</value> <value xml:lang="ru">ТекÑÑовое знаÑение</value> <value xml:lang="th">à¸à¹à¸²à¸à¸±à¸§à¸à¸±à¸à¸©à¸£</value> @@ -16043,6 +16108,7 @@ <value xml:lang="en">Thru Due Date</value> <value xml:lang="fr">Jusqu'à la date d'échéance</value> <value xml:lang="hi_IN">ठनà¥à¤¤à¤¿à¤® दिनाà¤à¤ तà¤</value> + <value xml:lang="nl">Tot vervaldatum</value> <value xml:lang="pt">Data de Vencimento do débito</value> <value xml:lang="zh">æªæ¢æ¥æç»äº</value> </property> @@ -16050,6 +16116,7 @@ <value xml:lang="en">Thru Invoice Date</value> <value xml:lang="fr">Jusqu'à la date de facture</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ दिनाà¤à¤ तà¤</value> + <value xml:lang="nl">Tot factuurdatum</value> <value xml:lang="pt">Data de vencimento da fatura</value> <value xml:lang="zh">å票æªæ¢æ¥æ</value> </property> @@ -16077,6 +16144,7 @@ <value xml:lang="fr">Réf de feuille d'activité d'un acteur</value> <value xml:lang="hi_IN">Timesheet पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤</value> <value xml:lang="it">Soggetto Timbratura</value> + <value xml:lang="nl">Party ID Urenstaat</value> <value xml:lang="pt">ID do participante da folha de horas trabalhadas</value> <value xml:lang="zh">å·¥æ¶è¡¨ä¼åæ è¯</value> <value xml:lang="zh_TW">å·¥æ表æå¡ID</value> @@ -16129,6 +16197,7 @@ <value xml:lang="fr">Total alloué</value> <value xml:lang="hi_IN">à¤à¥à¤² à¤à¤ªà¥à¤²à¤¾à¤à¤¡ à¤à¤¾à¤²à¤¾à¤¨</value> <value xml:lang="it">Totale fattura applicato</value> + <value xml:lang="nl">Totaal rekening toegepast</value> <value xml:lang="pt">Total da fatura Aplicada</value> <value xml:lang="zh">å ¨é¨å·²å¼å票</value> <value xml:lang="zh_TW">å ¨é¨å·²éç¼ç¥¨</value> @@ -16138,6 +16207,7 @@ <value xml:lang="fr">Montant total</value> <value xml:lang="hi_IN">à¤à¥à¤² राशि</value> <value xml:lang="it">Importo Totale</value> + <value xml:lang="nl">Totaal bedrag</value> <value xml:lang="pt">Quantia Total</value> <value xml:lang="zh">éé¢å计</value> <value xml:lang="zh_TW">éé¡åè¨</value> @@ -16145,6 +16215,7 @@ <property key="FormFieldTitle_totalOfCurrentFiscalPeriod"> <value xml:lang="en">Total of Current Fiscal Period</value> <value xml:lang="hi_IN">à¤à¤¾à¤²à¥ वितà¥à¤¤ वरà¥à¤· ठवधि à¤à¤¾ à¤à¥à¤²</value> + <value xml:lang="nl">Totaal van huidige fiscale period</value> <value xml:lang="pt">Total do perÃodo fiscal atual</value> <value xml:lang="zh">æ¬è´¢å¹´å计</value> </property> @@ -16423,6 +16494,9 @@ <value xml:lang="pt">Pagamentos de Depósito e Criar lote</value> <value xml:lang="zh">å款æ¯ä»å¹¶å建æ¹éå¤ç</value> </property> + <property key="PageTitleFixedAssetDepreciationHistory"> + <value xml:lang="en">Deprecation history</value> + </property> <property key="PageTitleEditAgreement"> <value xml:lang="de">Vereinbarung ändern</value> <value xml:lang="en">Edit Agreement</value> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign Sat Jan 14 14:40:09 2012 @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property> <list-property name="userProperties"> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ar/invoice/ListInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ar/invoice/ListInvoices.ftl?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ar/invoice/ListInvoices.ftl Sat Jan 14 14:40:09 2012 @@ -181,7 +181,6 @@ under the License. <td><@ofbizCurrency amount=invoicePaymentInfo.amount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td><@ofbizCurrency amount=invoicePaymentInfo.paidAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td> <td><@ofbizCurrency amount=invoicePaymentInfo.outstandingAmount isoCode=defaultOrganizationPartyCurrencyUomId/></td> - mlml <td align="right"><input type="checkbox" id="invoiceId_${invoice_index}" name="invoiceIds" value="${invoice.invoiceId}" onclick="javascript:getInvoiceRunningTotal();"/></td> </tr> <#-- toggle the row color --> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetForms.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetForms.xml Sat Jan 14 14:40:09 2012 @@ -731,7 +731,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="GlobalFixedAssetTypeGlAccounts" type="list" + <form name="GlobalFixedAssetTypeGlAccounts" type="list" list-name="globalFixedAssetTypeGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetTypeGlAccount" list="globalFixedAssetTypeGlAccounts"> @@ -751,7 +751,7 @@ under the License. <field name="profitGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field> <field name="lossGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field> </form> - <form name="FixedAssetTypeGlAccounts" type="list" + <form name="FixedAssetTypeGlAccounts" type="list" list-name="fixedAssetTypeGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetTypeGlAccount" list="fixedAssetTypeGlAccounts"> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetScreens.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/FixedAssetScreens.xml Sat Jan 14 14:40:09 2012 @@ -529,12 +529,12 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleFixedAssetDepreciationHistory}"> - <label style="h3">${uiLabelMap.FixedAssetPurchaseCost}: ${fixedAsset.purchaseCost}</label> - <label style="h3">${uiLabelMap.FixedAssetDepreciation}: ${depreciation}</label> - <label style="h3">${uiLabelMap.FixedAssetSalvageValue}: ${fixedAsset.salvageValue}</label> - <label style="h3">${uiLabelMap.FixedAssetDateAcquired}: ${fixedAsset.dateAcquired}</label> - <label style="h3">${uiLabelMap.FixedAssetExpectedEndOfLife}: ${fixedAsset.expectedEndOfLife}</label> - <label style="h3">${uiLabelMap.FixedAssetNextDepreciationAmount}: ${assetDepreciationResultMap.nextDepreciationAmount}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_purchaseCost}: ${fixedAsset.purchaseCost}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_depreciation}: ${depreciation}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_salvageValue}: ${fixedAsset.salvageValue}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_dateAcquired}: ${fixedAsset.dateAcquired}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_expectedEndOfLife}: ${fixedAsset.expectedEndOfLife}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_NextDepreciationAmount}: ${assetDepreciationResultMap.nextDepreciationAmount}</label> <section> <condition> <and> @@ -577,7 +577,7 @@ under the License. <include-form name="AddFixedAssetDepMethod" location="component://accounting/widget/FixedAssetForms.xml"/> <include-form name="ListFixedAssetDepMethods" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <screenlet title="GL Mappings"> + <screenlet title="${uiLabelMap.AccountingGlMappings}"> <include-form name="AddFixedAssetTypeGlAccount" location="component://accounting/widget/FixedAssetForms.xml"/> <label style="h3">${uiLabelMap.PageTitleFixedAssetMappings}</label> <include-form name="FixedAssetTypeGlAccounts" location="component://accounting/widget/FixedAssetForms.xml"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlSetupForms.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlSetupForms.xml Sat Jan 14 14:40:09 2012 @@ -1192,7 +1192,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="FixedAssetTypeGlAccounts" type="list" + <form name="FixedAssetTypeGlAccounts" type="list" list-name="fixedAssetTypeGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetTypeGlAccount" list="fixedAssetTypeGlAccounts"> Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml Sat Jan 14 14:40:09 2012 @@ -38,7 +38,7 @@ <response name="success" type="view" value="showMessage"/> </request-map> - <!-- party requests --> + <!-- party requests --> <request-map uri="updatePartyGroup"> <security https="true" auth="true"/> <event type="service" path="" invoke="updatePartyGroup"/> Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/CommonScreens.xml Sat Jan 14 14:40:09 2012 @@ -52,11 +52,11 @@ </screen> <screen name="CommonPartyDecorator"> - <section> - <widgets> + <section> + <widgets> <include-screen name="CommonSetupDecorator"/> - </widgets> - </section> + </widgets> + </section> </screen> <screen name="CommonSetupDecorator"> Modified: ofbiz/branches/jackrabbit20100709/applications/content/data/DemoBlogEntryData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/data/DemoBlogEntryData.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/data/DemoBlogEntryData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/data/DemoBlogEntryData.xml Sat Jan 14 14:40:09 2012 @@ -18,7 +18,7 @@ under the License. --> <entity-engine-xml> - <DataResource dataResourceId="BLG10000" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" isPublic="Y" createdByUserLogin="admin" createdDate="2004-01-16 01:24:06.522" createdStamp="2007-01-23 16:46:22.421" createdTxStamp="2007-01-23 16:46:21.406" lastModifiedByUserLogin="admin" lastModifiedDate="2010-09-26 13:13:32.482" lastUpdatedStamp="2010-09-26 13:13:32.483" lastUpdatedTxStamp="2010-09-26 13:13:32.429" mimeTypeId="application/octet-stream" statusId="CTNT_PUBLISHED"/> + <DataResource dataResourceId="BLG10000" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" isPublic="Y" createdByUserLogin="admin" createdDate="2004-01-16 01:24:06.522" createdStamp="2007-01-23 16:46:22.421" createdTxStamp="2007-01-23 16:46:21.406" lastModifiedByUserLogin="admin" lastModifiedDate="2010-09-26 13:13:32.482" lastUpdatedStamp="2010-09-26 13:13:32.483" lastUpdatedTxStamp="2010-09-26 13:13:32.429" mimeTypeId="application/octet-stream" statusId="CTNT_PUBLISHED"/> <DataResource dataResourceId="BLG10001" dataResourceTypeId="OFBIZ_FILE_BIN" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" mimeTypeId="image/jpeg" objectInfo="specialpurpose/ecommerce/data/cutekid.jpg" isPublic="Y" createdDate="2007-01-23 16:46:22.843" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.843" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:22.843" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:22.843" createdTxStamp="2007-01-23 16:46:21.406"/> <DataResource dataResourceId="BLG10002" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:46:22.984" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:38.671" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:38.671" lastUpdatedTxStamp="2007-01-23 16:46:37.359" createdStamp="2007-01-23 16:46:22.984" createdTxStamp="2007-01-23 16:46:21.406"/> <DataResource dataResourceId="BLG10003" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:47:49.343" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:47:49.343" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:47:49.343" lastUpdatedTxStamp="2007-01-23 16:47:49.328" createdStamp="2007-01-23 16:47:49.343" createdTxStamp="2007-01-23 16:47:49.328"/> Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearch.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearch.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearch.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearch.java Sat Jan 14 14:40:09 2012 @@ -460,7 +460,7 @@ public class ContentSearch { // ====================================================================== @SuppressWarnings("serial") - public static abstract class ContentSearchConstraint implements java.io.Serializable { + public static abstract class ContentSearchConstraint implements java.io.Serializable { public ContentSearchConstraint() { } public abstract void addConstraint(ContentSearchContext contentSearchContext); @@ -470,7 +470,7 @@ public class ContentSearch { @SuppressWarnings("serial") - public static class ContentAssocConstraint extends ContentSearchConstraint { + public static class ContentAssocConstraint extends ContentSearchConstraint { public static final String constraintName = "ContentAssoc"; protected String contentId; protected String contentAssocTypeId; Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java Sat Jan 14 14:40:09 2012 @@ -43,7 +43,7 @@ public class ContentSearchSession { public static final String module = ContentSearchSession.class.getName(); @SuppressWarnings("serial") - public static class ContentSearchOptions implements java.io.Serializable { + public static class ContentSearchOptions implements java.io.Serializable { protected List<ContentSearchConstraint> constraintList = null; protected ResultSortOrder resultSortOrder = null; protected Integer viewIndex = null; Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml Sat Jan 14 14:40:09 2012 @@ -745,7 +745,7 @@ under the License. <response name="success" type="view" value="EditDataResourceRole"/> <response name="error" type="view" value="EditDataResourceRole"/> </request-map> - + <!-- ================ DataResourceProductFeature Requests ================= --> <request-map uri="EditDataResourceProductFeatures"> <security auth="true" https="true"/> Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml Sat Jan 14 14:40:09 2012 @@ -463,7 +463,7 @@ <value xml:lang="es">Pedido de Venta</value> <value xml:lang="fr">Ventes</value> <value xml:lang="it">Ordine di vendita</value> - <value xml:lang="nl">Verkoopbestelling</value> + <value xml:lang="nl">Verkoopbestelling</value> <value xml:lang="pt_BR">Pedido de vendas</value> <value xml:lang="ro">Vanzare</value> <value xml:lang="ru">ÐÑодажи</value> Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml Sat Jan 14 14:40:09 2012 @@ -1273,7 +1273,7 @@ <value xml:lang="fr">Contact</value> <value xml:lang="hi_IN">सà¤à¤ªà¤°à¥à¤</value> <value xml:lang="it">Contatto</value> - <value xml:lang="nl">Contact</value> + <value xml:lang="nl">Contact</value> <value xml:lang="pt_BR">Contato</value> <value xml:lang="ro">Contact</value> <value xml:lang="ru">ÐонÑакÑ</value> @@ -2114,7 +2114,7 @@ <value xml:lang="fr">Contact</value> <value xml:lang="hi_IN">सà¤à¤ªà¤°à¥à¤</value> <value xml:lang="it">Contatto</value> - <value xml:lang="nl">Contact</value> + <value xml:lang="nl">Contact</value> <value xml:lang="pt_BR">Contato</value> <value xml:lang="ro">Contat</value> <value xml:lang="ru">ÐонÑакÑ</value> Modified: ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml Sat Jan 14 14:40:09 2012 @@ -48,9 +48,9 @@ <!-- new registration notification --> <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <!-- make admin an employee of Company --> + <!-- make admin an employee of Company --> <PartyRole partyId="admin" roleTypeId="CONTACT"/> <PartyRole partyId="Company" roleTypeId="ACCOUNT"/> <PartyRelationship partyIdFrom="Company" roleTypeIdFrom="ACCOUNT" partyIdTo="admin" roleTypeIdTo="CONTACT" fromDate="2000-01-01 00:00:00.000" partyRelationshipTypeId="EMPLOYMENT"/> - + </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Sat Jan 14 14:40:09 2012 @@ -318,29 +318,23 @@ under the License. <simple-method method-name="findPartyFromEmailAddress" short-description="Find partyId from email address"> <set field="input.filterByDate" value="Y"/> <set field="input.inputFields.infoString" from-field="parameters.address"/> - <if-empty field="parameters.caseInsensitive"> - <call-bsh><![CDATA[ - String caseInsensitiveEmail = org.ofbiz.base.util.UtilProperties.getPropertyValue("general.properties", "mail.address.caseInsensitive", "N"); - parameters.put("caseInsensitive", caseInsensitiveEmail); - ]]></call-bsh> + <set field="caseInsensitive" from-field="parameters.caseInsensitive"/> + <if-empty field="caseInsensitive"> + <property-to-field resource="general.properties" property="mail.address.caseInsensitive" field="caseInsensitive" default="N"/> </if-empty> - <set field="input.inputFields.infoString_ic" from-field="parameters.caseInsensitive"/> - <log level="info" message="findPartyFromEmailAddress with case insensitive search: ${parameters.caseInsensitive}"/> - + <set field="input.inputFields.infoString_ic" from-field="caseInsensitive"/> <if-empty field="parameters.fromDate"> <set field="input.filterByDate" value="Y"/> <else> <set field="input.filterByDateValue" from-field="parameters.fromDate"/> </else> </if-empty> - <!-- try primary email address --> <set field="input.inputFields.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> <set field="input.entityName" value="PartyContactDetailByPurpose"/> <call-service service-name="performFindItem" in-map-name="input"> <results-to-map map-name="results"/> </call-service> - <!-- any other email address --> <if-empty field="results.item"> <set field="input.entityName" value="PartyAndContactMech"/> @@ -349,12 +343,10 @@ under the License. <results-to-map map-name="results"/> </call-service> </if-empty> - <if-not-empty field="results.item"> <field-to-result field="results.item.partyId" result-name="partyId"/> <field-to-result field="results.item.contactMechId" result-name="contactMechId"/> </if-not-empty> - </simple-method> <simple-method method-name="findPartyFromTelephone" short-description="Find partyId from the telephone number"> Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy Sat Jan 14 14:40:09 2012 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import org.ofbiz.entity.*; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.base.util.*; Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml Sat Jan 14 14:40:09 2012 @@ -47,7 +47,7 @@ under the License. <dimension name="height" value="112"/> <dimension name="width" value="150"/> </size> - <size name="320x240"> + <size name="320x240"> <dimension name="height" value="240"/> <dimension name="width" value="320"/> </size> Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml Sat Jan 14 14:40:09 2012 @@ -1045,11 +1045,16 @@ under the License. <view-entity entity-name="FacilityAndContactMech" package-name="org.ofbiz.product.facility" title="Facility and Contact Mech View Entity"> <member-entity entity-alias="FA" entity-name="Facility"/> <member-entity entity-alias="CM" entity-name="FacilityContactMech"/> + <member-entity entity-alias="MC" entity-name="ContactMech"/> <alias-all entity-alias="FA"/> <alias-all entity-alias="CM"/> + <alias-all entity-alias="MC"/> <view-link entity-alias="FA" rel-entity-alias="CM"> <key-map field-name="facilityId"/> </view-link> + <view-link entity-alias="CM" rel-entity-alias="MC"> + <key-map field-name="contactMechId"/> + </view-link> </view-entity> <entity entity-name="FacilityAttribute" package-name="org.ofbiz.product.facility" title="Facility Attribute Entity"> <field name="facilityId" type="id-ne"></field> Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java Sat Jan 14 14:40:09 2012 @@ -189,7 +189,7 @@ public class CatalogUrlServlet extends H urlBuilder.append(CATALOG_URL_MOUNT_POINT); if (UtilValidate.isNotEmpty(currentCategoryId)) { - crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId, previousCategoryId); + crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId, previousCategoryId); for (String trailCategoryId: crumb) { if ("TOP".equals(trailCategoryId)) continue; urlBuilder.append("/"); Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java Sat Jan 14 14:40:09 2012 @@ -307,6 +307,21 @@ public class VerifyPickSession implement this.issueItemsToShipment(shipmentId, locale); this.updateProduct(); + // Set PicklistItem to Complete + List<GenericValue> picklistItems = this.getDelegator().findByAnd("PicklistItem", UtilMisc.toMap("orderId", orderId)); + for (GenericValue item : picklistItems) { + Map<String, Object> setPicklistItemToCompleteCtx = FastMap.newInstance(); + setPicklistItemToCompleteCtx.put("picklistBinId", item.get("picklistBinId")); + setPicklistItemToCompleteCtx.put("orderId", orderId); + setPicklistItemToCompleteCtx.put("orderItemSeqId", item.get("orderItemSeqId")); + setPicklistItemToCompleteCtx.put("shipGroupSeqId", item.get("shipGroupSeqId")); + setPicklistItemToCompleteCtx.put("inventoryItemId", item.get("inventoryItemId")); + setPicklistItemToCompleteCtx.put("quantity", item.get("quantity")); + setPicklistItemToCompleteCtx.put("itemStatusId", "PICKITEM_COMPLETED"); + setPicklistItemToCompleteCtx.put("userLogin", this.getUserLogin()); + this.getDispatcher().runSync("setPicklistItemToComplete", setPicklistItemToCompleteCtx); + } + // Update the shipment status to Picked, this will trigger createInvoicesFromShipment and finally a invoice will be created Map<String, Object> updateShipmentCtx = FastMap.newInstance(); updateShipmentCtx.put("shipmentId", shipmentId); Modified: ofbiz/branches/jackrabbit20100709/applications/product/testdef/data/IssuanceTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/testdef/data/IssuanceTestData.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/testdef/data/IssuanceTestData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/testdef/data/IssuanceTestData.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy Sat Jan 14 14:40:09 2012 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + productCategoryId = parameters.productCategoryId; if (productCategoryId) { productCategoryContents = delegator.findByAnd("ProductCategoryContent", ["productCategoryId" : productCategoryId]); Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy Sat Jan 14 14:40:09 2012 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + productId = parameters.productId; if (productId) { productContents = delegator.findByAnd("ProductContent", ["productId" : productId]); Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml Sat Jan 14 14:40:09 2012 @@ -3173,7 +3173,7 @@ under the License. <view-map name="EditProductStoreFinAccountSettings" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFinAccountSettings"/> <view-map name="EditProductStoreVendorPayments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorPayments"/> <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/> - <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/StoreScreens.xml#ProductStoreFacilities" type="screen"/> + <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities" type="screen"/> <view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/> <view-map name="ListProductStoreFacilityFormOnly" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly" type="screen"/> <view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |