Skip to content
This repository has been archived by the owner on May 9, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Updating the branch from r1369356 to r1401851
  • Loading branch information
Erwan de Ferrieres committed Oct 25, 2012
2 parents dcceaa2 + e37a750 commit 9ef8545
Show file tree
Hide file tree
Showing 1,550 changed files with 184,807 additions and 41,455 deletions.
45 changes: 22 additions & 23 deletions .classpath
Expand Up @@ -4,7 +4,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="applications/content/lib/fontbox-1.4.0.jar"/>
<classpathentry kind="lib" path="applications/content/lib/jempbox-1.4.0.jar"/>
<classpathentry kind="lib" path="applications/content/lib/lucene-core-3.5.0.jar"/>
<classpathentry kind="lib" path="applications/content/lib/lucene-core-3.6.1.jar"/>
<classpathentry kind="lib" path="applications/content/lib/pdfbox-1.4.0.jar"/>
<classpathentry kind="lib" path="applications/content/lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="applications/content/lib/poi-3.8-20120326.jar"/>
Expand All @@ -29,10 +29,10 @@
<classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/fop-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.19-null-wildcards.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpclient-4.1.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.1.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpcore-4.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpmime-4.1.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpclient-4.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpcore-4.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpmime-4.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/icu4j-49_1.jar"/>
Expand All @@ -48,7 +48,7 @@
<classpathentry kind="lib" path="framework/base/lib/mail-1.4.jar"/>
<classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/nekohtml-1.9.7.jar"/>
<classpathentry kind="lib" path="framework/base/lib/nekohtml-1.9.16.jar"/>
<classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4.jar"/>
<classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/>
Expand All @@ -64,23 +64,23 @@
<classpathentry kind="lib" path="framework/base/lib/xmlrpc-server-3.1.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xstream-1.3.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-1.8.3.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.6.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-compress-1.4.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.8.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-digester3-3.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-io-1.4.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.4.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler-2.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-io-2.4.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler-2.0.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-net-3.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-pool-1.3.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-primitives-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.3.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.4.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/>
Expand Down Expand Up @@ -108,11 +108,11 @@
<classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
<classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.2.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-core.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.30-catalina-ha.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.30-catalina-tribes.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.30-tomcat-embed-core.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.30-tomcat-embed-jasper.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.30-tomcat-embed-logging-log4j.jar"/>
<classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
Expand Down Expand Up @@ -207,7 +207,6 @@
<classpathentry kind="src" path="specialpurpose/pos/src"/>
<classpathentry kind="src" path="specialpurpose/projectmgr/src"/>
<classpathentry kind="src" path="specialpurpose/webpos/src"/>
<classpathentry kind="src" path="specialpurpose/workflow/src"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="output" path="bin"/>
</classpath>
46 changes: 24 additions & 22 deletions LICENSE
Expand Up @@ -21,40 +21,40 @@ ofbiz/trunk/framework/base/lib/avalon-util-exception-1.0.0.jar
ofbiz/trunk/framework/base/lib/batik-all-1.7.jar
ofbiz/trunk/framework/base/lib/barcode4j-fop-ext-complete-2.0.jar
ofbiz/trunk/framework/base/lib/clhm-release-1.0-lru.jar
ofbiz/trunk/framework/base/lib/httpclient-4.1.1.jar
ofbiz/trunk/framework/base/lib/httpclient-cache-4.1.1.jar
ofbiz/trunk/framework/base/lib/httpcore-4.1.jar
ofbiz/trunk/framework/base/lib/httpmime-4.1.1.jar
ofbiz/trunk/framework/base/lib/httpclient-4.2.1.jar
ofbiz/trunk/framework/base/lib/httpclient-cache-4.2.1.jar
ofbiz/trunk/framework/base/lib/httpcore-4.2.1.jar
ofbiz/trunk/framework/base/lib/httpmime-4.2.1.jar
ofbiz/trunk/framework/base/lib/ivy-2.2.0.jar
ofbiz/trunk/framework/base/lib/jakarta-regexp-1.5.jar
ofbiz/trunk/framework/base/lib/jpim-0.1.jar
ofbiz/trunk/framework/base/lib/juel-2.2.1.jar
ofbiz/trunk/framework/base/lib/mx4j-3.0.1.jar
ofbiz/trunk/framework/base/lib/mx4j-remote-3.0.1.jar
ofbiz/trunk/framework/base/lib/nekohtml.jar
ofbiz/trunk/framework/base/lib/nekohtml-1.9.16.jar
ofbiz/trunk/framework/base/lib/resolver-2.9.1.jar
ofbiz/trunk/framework/base/lib/serializer-2.9.1.jar
ofbiz/trunk/framework/base/lib/ws-commons-java5-1.0.1.jar
ofbiz/trunk/framework/base/lib/ws-commons-util-1.0.2.jar
ofbiz/trunk/framework/base/lib/xercesImpl-2.9.1.jar
ofbiz/trunk/framework/base/lib/xml-apis-2.9.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-beanutils-1.7.0.jar
ofbiz/trunk/framework/base/lib/commons/commons-cli-1.0.jar
ofbiz/trunk/framework/base/lib/commons/commons-codec-1.4.jar
ofbiz/trunk/framework/base/lib/commons/commons-collections-3.2.jar
ofbiz/trunk/framework/base/lib/commons/commons-beanutils-1.8.3.jar
ofbiz/trunk/framework/base/lib/commons/commons-cli-1.2.jar
ofbiz/trunk/framework/base/lib/commons/commons-codec-1.6.jar
ofbiz/trunk/framework/base/lib/commons/commons-collections-3.2.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-compress-1.4.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-digester-1.8.jar
ofbiz/trunk/framework/base/lib/commons/commons-digester3-3.2.jar
ofbiz/trunk/framework/base/lib/commons/commons-discovery-0.4.jar
ofbiz/trunk/framework/base/lib/commons/commons-el-1.0.jar
ofbiz/trunk/framework/base/lib/commons/commons-fileupload-1.2.2.jar
ofbiz/trunk/framework/base/lib/commons/commons-io-1.3.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-lang-2.4.jar
ofbiz/trunk/framework/base/lib/commons/commons-logging-1.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-modeler-2.0.jar
ofbiz/trunk/framework/base/lib/commons/commons-net-1.4.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-io-2.4.jar
ofbiz/trunk/framework/base/lib/commons/commons-lang-2.6.jar
ofbiz/trunk/framework/base/lib/commons/commons-logging-1.1.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-modeler-2.0.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-net-3.1.jar
ofbiz/trunk/framework/base/lib/commons/commons-pool-1.3.jar
ofbiz/trunk/framework/base/lib/commons/commons-primitives-1.0.jar
ofbiz/trunk/framework/base/lib/commons/commons-validator-1.3.1
ofbiz/trunk/framework/base/lib/commons/commons-validator-1.4.0.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar
Expand All @@ -74,11 +74,11 @@ ofbiz/trunk/framework/base/lib/scripting/jansi-1.2.1.jar
ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar
ofbiz/framework/catalina/lib/tomcat-7.0.29-catalina-ha.jar
ofbiz/framework/catalina/lib/tomcat-7.0.29-catalina-tribes.jar
ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-core.jar
ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-jasper.jar
ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-logging-log4j.jar
ofbiz/framework/catalina/lib/tomcat-7.0.30-catalina-ha.jar
ofbiz/framework/catalina/lib/tomcat-7.0.30-catalina-tribes.jar
ofbiz/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-core.jar
ofbiz/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-jasper.jar
ofbiz/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-logging-log4j.jar
ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
ofbiz/trunk/framework/entity/lib/jdbc/derby-10.8.2.2.jar
ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
Expand All @@ -104,7 +104,7 @@ ofbiz/trunk/framework/geronimo/lib/geronimo-connector-2.1.1.jar
ofbiz/trunk/framework/geronimo/lib/geronimo-transaction-2.1.1.jar
ofbiz/trunk/applications/content/lib/fontbox-1.4.0.jar
ofbiz/trunk/applications/content/lib/jempbox-1.4.0.jar
ofbiz/trunk/applications/content/lib/lucene-core-3.5.0.jar
ofbiz/trunk/applications/content/lib/lucene-core-3.6.1.jar
ofbiz/trunk/applications/content/lib/pdfbox-1.4.0.jar
ofbiz/trunk/applications/content/lib/poi-3.8-20120326.jar
ofbiz/trunk/applications/content/lib/poi-ooxml-3.8-20120326.jar
Expand Down Expand Up @@ -1221,6 +1221,8 @@ ofbiz/trunk/framework/base/lib/jcl-over-slf4j-1.6.4.jar
ofbiz/trunk/framework/base/lib/slf4j-api-1.6.4.jar
ofbiz/trunk/framework/base/lib/slf4j-simple-1.6.4.jar
ofbiz/trunk/framework/images/webapp/images/jquery/*
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/WebPosHotkeys.js
=========================================================================
The MIT License

Expand Down
6 changes: 6 additions & 0 deletions applications/accounting/config/AccountingEntityLabels.xml
Expand Up @@ -3113,6 +3113,7 @@
<property key="InvoiceItemType.description.PAYROL_SALARY_SICK">
<value xml:lang="de">Krankengeld</value>
<value xml:lang="en">Sick Salary</value>
<value xml:lang="fr">Salaire en cas de maladie</value>
<value xml:lang="hi_IN">बीमारी वेतन</value>
<value xml:lang="it">Salario per la malattia</value>
<value xml:lang="pt">Salário por doença</value>
Expand All @@ -3123,6 +3124,7 @@
<property key="InvoiceItemType.description.PAYROL_SALARY_VAC">
<value xml:lang="de">Urlaubsgeld</value>
<value xml:lang="en">Vacation Salary</value>
<value xml:lang="fr">Salaire vacataire</value>
<value xml:lang="hi_IN">अवकाश वेतन</value>
<value xml:lang="it">Salario per le ferie</value>
<value xml:lang="pt">Salário de férias</value>
Expand All @@ -3132,6 +3134,7 @@
</property>
<property key="InvoiceItemType.description.PAYROL_SOC_SEC_EMPL">
<value xml:lang="en">Social Security Employee</value>
<value xml:lang="fr">Sécurité Social salarié</value>
<value xml:lang="it">Previdenza sociale impiegato</value>
<value xml:lang="pt">Funcionário da Previdência Social</value>
<value xml:lang="vi">Bảo hiểm xã hội</value>
Expand All @@ -3141,6 +3144,7 @@
<property key="InvoiceItemType.description.PAYROL_TAXES">
<value xml:lang="de">Steuern</value>
<value xml:lang="en">Taxes</value>
<value xml:lang="fr">Taxes</value>
<value xml:lang="hi_IN">करों</value>
<value xml:lang="it">Tasse sulle paghe</value>
<value xml:lang="pt">Impostos</value>
Expand All @@ -3150,6 +3154,7 @@
</property>
<property key="InvoiceItemType.description.PAYROL_TAX_FEDERAL">
<value xml:lang="en">Federal Withholding</value>
<value xml:lang="fr">Taxe SS sur salaire</value>
<value xml:lang="hi_IN">संघीय टैक्स withholding</value>
<value xml:lang="it">Tasse federali trattenute</value>
<value xml:lang="pt">Retido na Fonte</value>
Expand Down Expand Up @@ -4144,6 +4149,7 @@
<property key="PaymentMethodType.description.FIN_ACCOUNT">
<value xml:lang="de">Finanzkonto</value>
<value xml:lang="en">Financial Account</value>
<value xml:lang="fr">Compte financier</value>
<value xml:lang="hi_IN">वित्तीय खाता</value>
<value xml:lang="it">Conto finanziario</value>
<value xml:lang="nl">Financiële rekening</value>
Expand Down
5 changes: 5 additions & 0 deletions applications/accounting/config/AccountingErrorUiLabels.xml
Expand Up @@ -22,34 +22,39 @@
<property key="AccountingDeleteRateAmount">
<value xml:lang="de">Kann die zu löschende Raten-Summe nicht finden</value>
<value xml:lang="en">Could not find RateAmount record to be deleted</value>
<value xml:lang="fr">Impossible de supprimer le taux</value>
<value xml:lang="it">Non è possibile trovare un record di RateAmount che deve essere cancellato</value>
<value xml:lang="pt">Não foi possível localizar o registro a ser excluído RateAmount</value>
<value xml:lang="zh">找不到要删除的费率金额(RateAmount)记录</value>
</property>
<property key="AccountingEftAccountCannotBeCreated">
<value xml:lang="de">FEHLER: Kann die Bezahlmethoden-ID nicht anlegen (ID Generierungsfehler)</value>
<value xml:lang="en">ERROR: Could not create payment method Id (id generation failure)</value>
<value xml:lang="fr">Erreur : impossible de créer la méthode de paiement (échec de la génération de sa séquence)</value>
<value xml:lang="it">ERRORE: Non è possibile creare il metodo pagamento (fallimento generazione id)</value>
<value xml:lang="pt">ERRO: Não foi possível criar Id de étodo de pagamento (falha ao gerar ID)</value>
<value xml:lang="zh">错误:无法创建支付方法标识(生成标识时失败)</value>
</property>
<property key="AccountingEftAccountCannotBeCreatedWriteFailure">
<value xml:lang="de">FEHLER: Kann den Elektr. Zahlungsverkehr-Zugang nicht anlegen (Schreib-Fehler): ${errorString}</value>
<value xml:lang="en">ERROR: Could not create EFT account (write failure): ${errorString}</value>
<value xml:lang="fr">Erreur : Impossible de créer le RIB : ${errorString}</value>
<value xml:lang="it">ERRORE: Non è possibile creare il conto EFT (fallita scrittura): ${errorString}</value>
<value xml:lang="pt">ERRO: Não foi possível criar conta de EFT (falha de escrita): ${errorString}</value>
<value xml:lang="zh">错误:无法创建电子资金转账账户(写操作失败):${errorString}</value>
</property>
<property key="AccountingEftAccountCannotBeUpdated">
<value xml:lang="de">FEHLER: Kann den Elektr. Zahlungsverkehr-Zugang nicht ändern (Schreib-Fehler): ${errorString}</value>
<value xml:lang="en">ERROR: Could not update EFT Account (write failure): ${errorString}</value>
<value xml:lang="fr">Erreur : Impossible de mettre à jour le RIB : ${errorString}</value>
<value xml:lang="it">ERRORE: Non è possibile aggiornare il conto EFT (scrittura fallita): ${errorString}</value>
<value xml:lang="pt">ERRO: Não foi possível atualizar Conta EFT (falha de escrita): ${errorString}</value>
<value xml:lang="zh">错误:无法更新电子资金转账账户(写操作失败):${errorString}</value>
</property>
<property key="AccountingEftAccountCannotBeUpdatedReadFailure">
<value xml:lang="de">FEHLER: Kann den Elektr. Zahlungsverkehr-Zugang nicht ändern (Lese-Fehler): ${errorString}</value>
<value xml:lang="en">ERROR: Could not update EFT Account (read error): ${errorString}</value>
<value xml:lang="fr">Erreur : Impossible de mettre à jour le RIB : ${errorString}</value>
<value xml:lang="it">ERRORE: Non è possibile aggiornare il conto EFT (fallita lettura): ${errorString}</value>
<value xml:lang="pt">ERRO: Não foi possível atualizar Conta EFT (erro de leitura): ${errorString}</value>
<value xml:lang="zh">错误:无法更新电子资金转账账户(读取时出错):${errorString}</value>
Expand Down

0 comments on commit 9ef8545

Please sign in to comment.