nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-09 08:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,038 Commits 494 Branches 1,768 Tags
mergify/bp/version-14-hotfix/pr-41020
Commit Graph

316 Commits

Author SHA1 Message Date
barredterra
fe986989a9 chore: remove duplicate german translations 2024-02-24 18:29:46 +01:00
barredterra
2899d2bac1 chore: resolve conflicts 2024-02-24 18:28:51 +01:00
Samuel Danieli
2450a73c6f chore: german translations (#31463) 
(cherry picked from commit 915102a400)

# Conflicts:
#	erpnext/translations/de.csv
 2024-02-24 16:57:52 +00:00
mergify[bot]
2c90ee23f9 fix: Add missing french translations (backport #38368) (#38513) 
* fix: Add missing french translations (#38368)

fix: Add missing french translation

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit a1e0197a8b)

# Conflicts:
#	erpnext/translations/fr.csv

* chore: resolve merge conflicts

---------

Co-authored-by: noec764 <58433943+noec764@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-01-02 13:51:43 +05:30
mergify[bot]
81b5e6c5f1 fix: german translations for Lost Quotations (#38435) 
* fix: german translations for Lost Quotations (#38435)

(cherry picked from commit 5952cfa673)

# Conflicts:
#	erpnext/translations/de.csv

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-12-24 16:24:31 +05:30
mergify[bot]
e490bd7785 refactor(Translations): prisoner exchange with HRMS (backport #37376) (#37403) 
* refactor: migrate translations to HRMS

* chore: resolve conflicts

* style: remove whitespace

To make the linter happy

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-11-28 17:50:28 +05:30
mergify[bot]
043dc1b14b fix: asset depreciation ledger (backport #37991) (#37992) 
* fix: asset depreciation ledger (#37991)

* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'

(cherry picked from commit 9a171db97f)

# Conflicts:
#	erpnext/accounts/report/balance_sheet/balance_sheet.js
#	erpnext/accounts/report/cash_flow/cash_flow.js
#	erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
#	erpnext/accounts/report/trial_balance/trial_balance.js
#	erpnext/translations/pl.csv
#	erpnext/translations/tr.csv

* chore: fix conflict in balance_sheet.js

* chore: fix conflict in cash_flow.js

* chore: fix conflict in consolidated_financial_statement.js

* chore: fix conflict in trial_balance.js

* chore: fix conflict in tr.csv

* chore: fix conflict in pl.csv

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-08 23:36:17 +05:30
Raffael Meyer
2c1fdecc91 chore: resolve merge conflicts 2023-11-01 11:54:29 +01:00
barredterra
4d2169e48e fix(translations): suggestions from review 
(cherry picked from commit 115f024260)
 2023-11-01 09:43:41 +00:00
barredterra
b75aae99ca fix: german translations of Accounts Settings 
(cherry picked from commit b3486b43c4)

# Conflicts:
#	erpnext/translations/de.csv
 2023-11-01 09:43:40 +00:00
Raffael Meyer
fa5780ca81 fix: wrong german translation (#37658) 2023-10-25 09:13:06 +05:30
barredterra
f9b2355066 fix: german tranlations of "Is Return" 
(cherry picked from commit 38ca164662)
 2023-10-12 02:21:05 +00:00
Deepesh Garg
43f3779f10 Merge pull request #37156 from frappe/mergify/bp/version-14-hotfix/pr-37122 
fix: german translation of Sales and Purchase Invoice (backport #37122)
 2023-09-20 22:15:43 +05:30
Raffael Meyer
03e52d3859 chore: resolve conflicts 2023-09-20 14:38:42 +02:00
mergify[bot]
c5df164e1c chore: translations dutch (#37042) 
chore: translations dutch (#37042)

update: translations dutch
(cherry picked from commit c35dea7177)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-09-19 20:41:53 +05:30
HENRY Florian
8c14dbd7ac chore: translation manual backport of #35697 (#37053) 
chore: translation manual backport of #35697
 2023-09-19 20:26:05 +05:30
Raffael Meyer
8236814270 fix: german translation of Sales and Purchase Invoice (#37122) 
* fix: german translation of Purchase Invoice

* fix: german translation of Sales Invoice

(cherry picked from commit 84a9000db2)

# Conflicts:
#	erpnext/translations/de.csv
 2023-09-19 14:29:56 +00:00
mergify[bot]
9b2a84f259 chore: update fr translation for Naming Series (#36785) 
* chore: update fr translation for Naming Series (#36785)

* chore: update fr translation for Naming Series

* chore: update fr translation

* chore: update fr translation

* chore: update fr translation

(cherry picked from commit e462edc628)

# Conflicts:
#	erpnext/translations/fr.csv

* chore: resolve conflicts

---------

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-26 19:29:57 +05:30
ruthra kumar
2dee97aa70 chore: remove merge conflict 
remove merge conflict in sr-SP.csv
 2023-08-01 14:18:14 +05:30
ruthra kumar
14dc40360d chore: remove merge conflict in translation file 
Remove merge conflict in v14-hotfix branch
 2023-08-01 13:48:03 +05:30
mergify[bot]
782a4d1fa8 fix: typo in loyalty program throw message (#36432) 
* fix: typo in loyalty program throw message (#36432)

(cherry picked from commit 4f473eb090)

# Conflicts:
#	erpnext/translations/sr-SP.csv
#	erpnext/translations/tr.csv
#	erpnext/translations/zh-TW.csv

* chore: Resolve conflicts

---------

Co-authored-by: abdosaeed95 <118386543+abdosaeed95@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-01 11:19:38 +05:30
barredterra
9c8e2a33e9 fix: german translations 
(cherry picked from commit 3558c3d24e)
 2023-07-30 09:11:08 +00:00
mergify[bot]
94caf7f5a8 feat: add local holidays (#36116) 
* feat: add local holidays

(cherry picked from commit aa18b25a71)

* test(Holiday List): weekly off and local holidays

(cherry picked from commit fd23bd0434)

* feat(Holiday List): display localized country name

(cherry picked from commit 4888d75e72)

* fix: German translations of Holiday List

(cherry picked from commit 509061f05b)

# Conflicts:
#	erpnext/translations/de.csv

* fix(Holiday List): use current user's language

For consistency with "weekly off" descriptions

(cherry picked from commit 8271a39cdb)

* fix(Holiday List): allow empty value

(cherry picked from commit 8aff5a1dab)

* refactor(Holiday List): use autocomplete fieldtype

(cherry picked from commit dab9688410)

* chore: resolve merge conflicts

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-07-14 20:37:48 +05:30
mergify[bot]
44f509f989 refactor(Payment Entry): translatable strings (#36017) 
* refactor(Payment Entry): translatable strings (#36017)

* refactor(Payment Entry): translatable strings

* fix: German translations

(cherry picked from commit af28f95c60)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/translations/de.csv

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-10 21:01:44 +05:30
mergify[bot]
04b1d459eb fix: labels and translations (#35963) 
fix: labels and translations (#35963)

fix: labels and translations
* fix: Vietnamese translation of customer
* fix: Vietnamese translation of bill

(cherry picked from commit 46fe9ac5cd)

Co-authored-by: aioaccount <92444849+aioaccount@users.noreply.github.com>
 2023-07-10 16:19:36 +05:30
mergify[bot]
e443e6c02a fix: Vietnamese translation of "Company" (#35887) 
fix: Vietnamese translation of "Company" (#35887)

fix: Vietnamese translation of "Company"
(cherry picked from commit ef7fd7548c)

Co-authored-by: aioaccount <92444849+aioaccount@users.noreply.github.com>
 2023-07-09 20:34:26 +05:30
mergify[bot]
b7b864e68c fix: German translations (#35990) 
fix: German translations (#35990)

* fix: add missing German translation

* fix: wrong German translation

(cherry picked from commit 353d765140)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-07-09 20:18:22 +05:30
mergify[bot]
a880bdec5e chore: update translations (#35905) 
chore: update translations

chore: update translations
(cherry picked from commit 1d1103f39c)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-06-29 13:30:29 +05:30
mergify[bot]
2077f6e89c fix: Update de.csv (#35278) 
fix: Update de.csv (#35278)

added many fixes on the base of 'No' which is often wrongly translated to 'Kein'.

Also removed translation of Naming Seris like ACC-INV-.YYYY.- to ACC-INV-.YYYY.-

(cherry picked from commit c236979508)

Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
 2023-06-07 22:04:14 +05:30
mergify[bot]
3023dbbe95 fix: add german translation of "Partly Paid" (#34776) 
fix: add german translation of "Partly Paid" (#34776)

(cherry picked from commit 934e1b4e6a)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-04-09 20:13:36 +05:30
mergify[bot]
881e92e7b3 fix: remove unused translation (#34519) 
* fix: remove unused translation (#34519)

(cherry picked from commit 0df3a1a3af)

# Conflicts:
#	erpnext/translations/tr.csv

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-23 00:06:14 +05:30
mergify[bot]
702d07ea7d fix: translations and UX in alternative item mapping (#34433) 
fix: translations and UX in alternative item mapping (#34433)

* fix: disable deletion in alternative item mapping

* feat: german translations

* fix: make string translatable

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 79911734e9)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-21 22:48:38 +05:30
mergify[bot]
dd0c8334cd fix: german translations (#34312) 
fix: german translations (#34312)

fix: some german translations
(cherry picked from commit 59c2e7ec3e)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-21 16:08:32 +05:30
HENRY Florian
6303d2d8e1 chore: fix french translation (#34381) 
chore: update french translation
(cherry picked from commit d267111e13)
 2023-03-14 13:20:05 +00:00
Deepesh Garg
b6d059ccb8 Revert "Update tr.csv (backport #34285)" (#34427) 
Revert "Update tr.csv (#34285)"

This reverts commit 5266a7e8a7.
 2023-03-13 19:43:26 +05:30
mergify[bot]
5266a7e8a7 Update tr.csv (#34285) 
chore: Improve Turkish language translation

chore: Improve Turkish language translation
(cherry picked from commit fa6d37542b)

Co-authored-by: Mehmet Demirel <unibravo@gmail.com>
 2023-03-13 14:03:38 +05:30
mergify[bot]
9b84e1e39c chore: add german translations (#34167) 
chore: add german translations (#34167)

* chore: add german translations

* Apply suggestions from code review

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit bbb6a62a7d)

Co-authored-by: Patrick Eissler <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-07 11:45:51 +05:30
mergify[bot]
88a781fa43 fix: german translations (#31732) 
fix: german translations (#31732)

(cherry picked from commit 6b510546ae)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-27 11:50:45 +05:30
anandbaburajan
fc0ba2b9c8 chore: remove broken translation 
(cherry picked from commit 21f425660d)
 2023-01-26 08:17:12 +00:00
Ankush Menat
440e16dc10 chore: remove broken translation 
[skip ci]
 2023-01-25 17:36:37 +05:30
anandbaburajan
52ba266302 chore: fix translations 
(cherry picked from commit 4e6066f929)
 2023-01-23 13:19:18 +00:00
anandbaburajan
c04f11b4f8 chore: update translations for naming series error 
(cherry picked from commit bbde1f611f)
 2023-01-23 13:19:08 +00:00
barredterra
ba51d50fef fix: translation for warning on Overbilling/-receipt/-delivery 
(cherry picked from commit 36997d9788)
 2022-12-14 17:55:04 +00:00
barredterra
ef933a8231 fix: add translation variable order 
(cherry picked from commit 748c74ba52)
 2022-12-08 09:47:56 +00:00
barredterra
f7988dea1b feat: add german translations for incoterm titles 
(cherry picked from commit ffd287d5a6)
 2022-11-27 15:24:19 +00:00
barredterra
8e00e62616 chore: resolve merge conflicts 2022-11-07 13:31:54 +01:00
Raffael Meyer
e276a5ba83 chore: add german translations (#32846) 
Mostly for balance sheet

(cherry picked from commit d2b6490bca)

# Conflicts:
#	erpnext/translations/de.csv
 2022-11-06 04:53:21 +00:00
mergify[bot]
154904e960 fix: Explicitly update modified (backport #32519) (#32575) 
fix: Explicitly update modified (#32519)

* fix: Explicitly update modified

required after https://github.com/frappe/frappe/pull/18301

* chore: fix broken translations

(cherry picked from commit 8376fbc982)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-10-12 12:59:06 +05:30
HENRY Florian
3caf905019 chore: update fr translation (#32385) 
(cherry picked from commit 0e4017cbe5)
 2022-10-05 17:20:04 +00:00
Florian HENRY
cb6cbf7818 chore: update fr translation 
(cherry picked from commit 299da5d596)
 2022-08-25 07:37:06 +00:00