Commit Graph
62 Commits
Author SHA1 Message Date
Michael Brohl db92854bce Improved: Translate invoice type dropdown
(OFBIZ-10191)

Thanks Ingo Wolfmayr for reporting and providing the patch.
2020-02-01 19:07:58 +01:00
Jacques Le Roux 7ada24fd04 This removes the pos component. OFBIZ-7804 "Check if we should fix or remove the POS (hence WebPos?)"
Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else.

I have voluntarily left 2 or 3 moot points
I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read.
I have to check if we should keep or not this code snippet
                <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
                <entity-count entity-name="InventoryItem" count-field="iiCount">
                    <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
                </entity-count>
I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change
//                if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
//                    continue;
//                }

While at it, since I modified OPTIONAL_LIBRARIES, I also changed these svn:properties: svn:eol-style = native & svn:mime-type = text/plain


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754402 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 12:27:20 +00:00
Jacques Le Roux 08e258af68 Non functional change, only a French label
A disbursment is not a débours but a décaissement

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738056 13f79535-47bb-0310-9956-ffa450edef68
2016-04-06 21:22:59 +00:00
Jacques Le Roux 327fb83021 A patch from Tomas Pytelka for "Czech translation" https://issues.apache.org/jira/browse/OFBIZ-6885
jleroux: this was git patch, I'm now used to change them to apply, but I will explain how to generate svn patch from it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729078 13f79535-47bb-0310-9956-ffa450edef68
2016-02-08 07:56:23 +00:00
Jacques Le Roux cdd350b7aa Fixes a typo: xml != xlm
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729005 13f79535-47bb-0310-9956-ffa450edef68
2016-02-07 18:38:19 +00:00
Hans Bakker 047ee1e342 update of accounting NL labels: https://issues.apache.org/jira/browse/OFBIZ-6875
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728398 13f79535-47bb-0310-9956-ffa450edef68
2016-02-04 01:28:39 +00:00
Michael Brohl 7853deb863 Added about 1800 missing or wrong German labels for the accounting component (OFBIZ-6521).
Corrected a few other labels, mainly typos or unnecessary spaces.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1687775 13f79535-47bb-0310-9956-ffa450edef68
2015-06-26 14:17:30 +00:00
Shi Jinghai 85bed69778 Refs #6518.
Translated new labels in trunk version into zh locale (Simplified Chinese).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686778 13f79535-47bb-0310-9956-ffa450edef68
2015-06-22 07:10:41 +00:00
Taher A. Alkhateeb d685409f67 Translate the accounting component to Arabic
This is one part of the translation to Arabic project found
in JIRA OFBIZ-6432 to fully translate OFBiz to Arabic.

The commit translates the following files fully:
- AccountingUiLabels.xml
- AccountingEntityLabels.xml
- AccountingErrorUiLabels.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682592 13f79535-47bb-0310-9956-ffa450edef68
2015-05-30 09:14:17 +00:00
Jacques Le Roux 11211efb6e A patch from Bob Morley for "Data seeding to support ability to return products of type RAW_MATERIAL" https://issues.apache.org/jira/browse/OFBIZ-3669
This patch contains data seeding that supports the ability to have return items that contain products of type RAW_MATERIAL.  This allows an enterprise to return raw materials back to suppliers as well as customers returning them (if the enterprise sells raw materials to customers).  There is no code in this patch, just the data model wiring to map the raw material product types to the proper return types / accounting types.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650949 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 18:41:53 +00:00
Jacques Le Roux b8ca5543c9 Changes in all labels files: <value xml:lang="(.*)_(.*)"> to <value xml:lang="$1-$2">
Changes also listLocales.ftl to show dashes rather than underscores

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650880 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 09:59:32 +00:00
Adrian Crum 91feff5f51 Updated the UI label files so they reference a schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:24:18 +00:00
Jacques Le Roux 5ebc58cc6a An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
jleroux: some changes I spotted in Nick Ho's patch which sounded sound to me. Some groups of label internal ending white spaces would have been caught by HTML rendering, but anyway better like that.
I also fixed a number of wrong line returns. And found duplicates zh labels entries that I will report to Nick Ho to fix. And finally fixed some errors introduced by Nick Ho I spotted, I hope there are not too much left :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625893 13f79535-47bb-0310-9956-ffa450edef68
2014-09-18 05:54:04 +00:00
Jacques Le Roux 3b118d4842 An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
added/revised zh-TW translations in the framework, applications and specialpurpose folders to have consistent, commonly-used meaningful terms in Traditional Chinese.

jleroux: from Nick Ho's patch I have extracted only the Chinese changes, w/o the proposed  dash to underscore changes
This contains notably this 14 "zh" (not "sh-TW") changes:
<value xml:lang="zh">人将由电子邮件接受一个临时密码。</value><!-- was 客户将通过电子邮件收到一个临时密码。 -->
<value xml:lang="zh">合计属于公司: </value>
<value xml:lang="zh"> 完整文本:${fullText}</value>
<value xml:lang="zh">供货商佣金百分比</value>
<value xml:lang="zh">文本大小</value>
<value xml:lang="zh">值</value>
<value xml:lang="zh">算子</value>
<value xml:lang="zh">不能转移已序列化的库存。</value>
<value xml:lang="zh">货运收据</value>
<value xml:lang="zh">获取标识为 ${productStoreShipMethId} 的产品店铺送货方法(ProductStoreShipmentMeth)时出错:${errorString}</value>
<value xml:lang="zh">中国人民币元</value>
<value xml:lang="zh">如果选择"specify other",下拉框旁边会出现文本框。参考form的drop-down元素的other-field-size属性说明</value>
<value xml:lang="zh">文本消息</value>
<value xml:lang="zh">能够收到和解析XML消息,但是BSR->NOUN(买卖关系->名词) ${bsrNoun} 和/或 BSR->VERB(买卖关系->动词) ${bsrVerb} 是空的</value>
I have no competency to judge these changes, but from previous Shi Jinghai's feedback I believe there are OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625816 13f79535-47bb-0310-9956-ffa450edef68
2014-09-17 20:44:07 +00:00
Jacques Le Roux eb01bb126d Misc. cleaning in labels
Removes all empty ones
Removes some redundant/duplicates ones (please committers don't commit those again, I know it's not easy to catch, hopefully now we should have less of them)
Automatically replaces some tabs
Few French labels improvements
Removes 2 orphan entries ("ja" & "cs")
Fixes the schema header of WebtoolsUiLabels.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551594 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 16:00:50 +00:00
Jacques Le Roux 20c0205762 I checked with Pierre this was a wrong C/P from above
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550380 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 09:23:48 +00:00
Jacques Le Roux fadc86742b A patch from Pierre Smits for "Improving Dutch references in AccountingEntityLabels.xml" https://issues.apache.org/jira/browse/OFBIZ-5407
jleroux: there are also few English labels changes and a new TaxAuthorityRateType.description.EXCISE_TAX labels with much languages

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1550378 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 09:12:55 +00:00
Jacques Le Roux 27632c6acb OFBIZ-5241-ACCTG-Labels.patch from Pierre Smits for "Have PIN payment transactions" https://issues.apache.org/jira/browse/OFBIZ-5241
In the Dutch market space it is customary to pay with pin. This should be incorporated

jleroux:same in France where we use smart card since it was invented 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1529693 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 21:25:00 +00:00
Jacques Le Roux 26285fdb52 Fixes an issue with InvoiceItemTypes reported by Christian on dev ML following proposed Nicolas's solution.
I did not get further enough to add missing labels, like InvoiceItemType.description.SINVOICE_HEAD_ADJ, etc.
So when missing the default English description set in data seed is used

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527171 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 09:24:33 +00:00
Jacques Le Roux 7de84afaaa A patch from Ankit for "The Invoice Item type dropdown have same description for different invoiceItemTypeId." https://issues.apache.org/jira/browse/OFBIZ-5225
The Invoice Item type dropdown have same description for different invoiceItemTypeId on Agreement Terms page in accounting.

https://demo-trunk.ofbiz.apache.org/accounting/control/EditAgreementTerms?agreementId=10000

The description should be different that the invoiceItemType is for sales or purchase.
Eg: Invoice Fee(Sales)
Invoice Fee(Purchase)

Something to differentiate between the same description.

jleroux: while at it I also changed the French labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494682 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 16:32:04 +00:00
Jacques Le Roux e18c34f93d A patch from Shi Jinghai for "Chinese localizations (zh) for trunk" https://issues.apache.org/jira/browse/OFBIZ-5134
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446482 13f79535-47bb-0310-9956-ffa450edef68
2013-02-15 09:11:54 +00:00
Jacques Le Roux 9825681613 Fixes a duplicated label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1440292 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 07:00:49 +00:00
Christian Geisert 04a1f724b2 German Label optimization Accounting
Submitted by Paul Piper
See OFBIZ-5108 - https://issues.apache.org/jira/browse/OFBIZ-5108


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1430332 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 15:43:47 +00:00
Jacques Le Roux b46c7a2c06 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Got an issue merging GeoData_JP.xml with Subclipse, using Toirtoise solved it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1403746 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:48:42 +00:00
Erwan de Ferrieres 8d67bc6815 OFBIZ-5011 - Complete French traduction for accounting component - A patch from Nicolas Malin
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1377654 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 12:38:30 +00:00
Jacques Le Roux e8ded2674d A patch from Tri Duc Vo for "Next Vietnamese Ofbiz translation https://issues.apache.org/jira/browse/OFBIZ-4759
fixed few issues, 3 remains, Tri will have to choice

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345379 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 22:32:57 +00:00
Christian Geisert 15b09dae60 German translation for AccountingEntityLabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1333439 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 12:54:27 +00:00
Erwan de Ferrieres edea4e0e19 OFBIZ-4640 French translation for RateType description and for WorkEffortTimesheetAlreadyExists label - A patch from Olivier Heintz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226964 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 21:57:24 +00:00
Jacques Le Roux 4f9f568dc5 A patch from Shi Jingha https://issues.apache.org/jira/browse/OFBIZ-4352
Chinese localizations (zh) for trunk (and 11.04). There are about 2700 labels translated.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1203362 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 20:54:54 +00:00
Jacques Le Roux 9694cfae14 A patch from Pierre Smits "Dutch additions to UIlabels in Accounting" https://issues.apache.org/jira/browse/OFBIZ-4544
Some improvements to UIlabels in Accounting module/component

To apply, I add to change encoding to UF8-BOM and at commit also got some EOLs conflicts 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201124 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 00:38:39 +00:00
Erwan de Ferrieres 0df2322108 A patch from Olivier Heintz - OFBIZ-4507 - French spelling correction in uiLabel
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1188389 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 21:21:22 +00:00
Jacques Le Roux 1daa37ff37 * Removes tabs in AccountingEntityLabels.xml
* Moves FormFieldTitle_isPublic from Order to Common, was also used in Content
* Improves French FormFieldTitle_isPublic label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1178167 13f79535-47bb-0310-9956-ffa450edef68
2011-10-02 09:58:29 +00:00
Jacques Le Roux 790a3f6ee8 A patch from Willem Janssen "Balancesheet dynamic labels & dutch translation accounting labels" https://issues.apache.org/jira/browse/OFBIZ-4248
Currently the labels that indicate the totals on the balancesheet are hardcoded in the balancesheet.groovy file. This patch makes them dynamic, re-using existing labels in accountinguilabels.xml and adding 2 new ones. A side effect is that these labels are not capitalized anymore in the balancesheet screen...

Also other dutch translations are included in this patch in the accounting ui and entity labels files.

JLR: as requested by Willem  I have replaced
+import org.ofbiz.base.util.*
by
+import org.ofbiz.base.util.UtilProperties;

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1100140 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 09:09:10 +00:00
Adrian Crum 357b11d1f4 Portuguese translation for Accounting. Patch provided by Luís Alfredo Harriss Maranesi - https://issues.apache.org/jira/browse/OFBIZ-4131.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1062104 13f79535-47bb-0310-9956-ffa450edef68
2011-01-22 06:33:15 +00:00
Jacques Le Roux 66c5dd10a0 A patch from Dukian "Add Traditional Chinese translation for applications, ecommerce, and ofbizsetup" (https://issues.apache.org/jira/browse/OFBIZ-4031) - OFBIZ-4031
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039574 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 21:56:14 +00:00
Jacques Le Roux cfa3c2075d A patch from Nicolas Malin "Accounting better French translation" https://issues.apache.org/jira/browse/OFBIZ-3649 - OFBIZ-3649
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931326 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 20:57:54 +00:00
Erwan de Ferrieres cc417fefb1 Accounting French traduction on invoiceType (OFBiz-3649) - https://issues.apache.org/jira/browse/OFBIZ-3649
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931143 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 13:17:41 +00:00
Hans Bakker e394c6a99c new and updated dutch lables
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@886090 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 09:50:04 +00:00
Jacques Le Roux 189e7ad383 A patch from Erwan de FERRIERES "Misc. French translations" (https://issues.apache.org/jira/browse/OFBIZ-3222) - OFBIZ-3222
Some translations for the accounting component, and for the CommonUiLabels file 

I have also changed some other labels in ProductEntityLabels.xml and ProductUiLabels.xml while I was at it 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881987 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:03:48 +00:00
Bruno Busco 884b8a685a A patch from Raul Sieberath "Brazilian Portuguese Translations for Accounting - Part 1" (https://issues.apache.org/jira/browse/OFBIZ-3038) - OFBIZ-3038
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826183 13f79535-47bb-0310-9956-ffa450edef68
2009-10-17 07:11:18 +00:00
Bruno Busco f5c36ab0c0 A patch from Raul Sieberath "Brazilian Portuguese Translations for Accounting - Part 1" (https://issues.apache.org/jira/browse/OFBIZ-3038) - OFBIZ-3038
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825664 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 21:18:31 +00:00
Anil Patel 51930c1684 More Hindi translation of accounting component. Thanks Arpit for working on it. Patch from OFBIZ-2815.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803361 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 04:03:43 +00:00
Adrian Crum c87e4f5d4a Chinese translation for the applications folder, provided by Shi Yusen - https://issues.apache.org/jira/browse/OFBIZ-2767.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798955 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 15:39:59 +00:00
Marco Risaliti 1353949a92 Integration of new RBS WorldPay Select Junior and support of new Payment Gateway Config entity (OFBIZ-2498)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777203 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 17:57:48 +00:00
Scott Gray 094c1a2bed Corrected casing Paypal -> PayPal
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776316 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 13:51:40 +00:00
Jacques Le Roux 8e1308aaf6 Better French translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761819 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 22:10:39 +00:00
Jacques Le Roux ad33f3e58a Better French translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758032 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 21:18:48 +00:00
Marco Risaliti 9e727bec97 A lot of hardcoded labels cleaning/changes some wrong references or missing entity labels entries
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748715 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 21:52:03 +00:00
Hans Bakker bb57df5c2b xml format error as reported in the mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732652 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 09:09:30 +00:00
Christian Geisert 1fc6ac1d2c Added missing lables from OFBIZ-2067
Submitted by Erik Wegner


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732300 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 11:05:30 +00:00