nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 19:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,647 Commits 465 Branches 1,752 Tags
47e500c2ebf7dd7185e7b4dfc607971d9622e2da
Commit Graph

151 Commits

Author SHA1 Message Date
Raffael Meyer
10ac8d6e67 chore: resolve merge conflicts 2022-12-15 00:11:35 +01:00
barredterra
b13ee4fc8c fix: translation for warning on Overbilling/-receipt/-delivery 
(cherry picked from commit 36997d9788)

# Conflicts:
#	erpnext/controllers/status_updater.py
#	erpnext/translations/de.csv
 2022-12-14 17:55:29 +00:00
barredterra
550f5f280c chore: resolve merge conflicts 2022-11-07 13:15:38 +01:00
Raffael Meyer
a8bf17e560 chore: add german translations (#32846) 
Mostly for balance sheet

(cherry picked from commit d2b6490bca)

# Conflicts:
#	erpnext/translations/de.csv
 2022-11-06 04:53:43 +00:00
mergify[bot]
7d50f8798a Update de.csv (backport #31596) (#31667) 
Update de.csv (#31596)

IN,IM to IN,EIN

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 8629d01dd5)

Co-authored-by: billy995 <48571007+billy995@users.noreply.github.com>
 2022-07-21 18:10:46 +05:30
mergify[bot]
12d3d6ab49 fix: added Section translation in German for Salary Slip (backport #31608) (#31616) 
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-07-18 13:41:42 +05:30
Deepesh Garg
309bdf257d Merge pull request #31139 from frappe/mergify/bp/version-13-hotfix/pr-31102 
feat: Add german translations (backport #31102)
 2022-06-10 12:42:10 +05:30
Deepesh Garg
95f8784ea9 chore: Resolve conflicts 2022-06-10 10:59:46 +05:30
mergify[bot]
d891394dc8 fix: Improve button labels in Warehouse (backport #31101) (#31150) 
* style: format warehouse js

(cherry picked from commit c704ad889d)

* fix: improve labels, simplify logic

(cherry picked from commit a6ddd86d31)

* fix: german translations

(cherry picked from commit 9356eb11de)

* fix: remove unsupported arguments

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit e77c379cbb)

* refactor: set queries during setup

(cherry picked from commit 1b16eb7667)

* style: format

(cherry picked from commit 1e9f9c452f)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2022-05-27 12:11:12 +05:30
barredterra
a3f2cf3917 feat: Add german translations 
(cherry picked from commit 2388d86623)

# Conflicts:
#	erpnext/translations/de.csv
 2022-05-26 06:20:15 +00:00
mergify[bot]
ddee0893e6 fix translation German "Designation" (backport #31082) (#31093) 
fix translation German "Designation" (#31082)

changed "Bezeichnung" to "Position" as the is more precice in the field of employment which erpnext refers to here

(cherry picked from commit 348a674df9)

Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
 2022-05-23 12:02:30 +05:30
barredterra
b9bda04a83 fix: german translations for Employee 
(cherry picked from commit 02b38a439f)
 2022-05-13 06:54:02 +00:00
mergify[bot]
8335ca6331 fix: translation (#30781) (#30783) 
fixed the short word for March in german language

(cherry picked from commit 43c1d63ab2)

Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
 2022-04-22 17:39:15 +05:30
Samuel Danieli
29fa902b33 feat: add German translations 
(cherry picked from commit bbe5739547)
 2022-03-16 05:24:45 +00:00
Suraj Shetty
cebe8888af fix: Email translations 
(cherry picked from commit aaa84a21ba)
 2022-02-23 05:31:15 +00:00
mergify[bot]
43bc612f07 fix: wrong german translation of abbreviation PAN (#28804) 
Wrong german translation of abbreviation: PAN

(cherry picked from commit f043f59324)

Co-authored-by: Michael Köller <michael.koeller@greenbytes.de>
 2021-12-09 11:39:05 +05:30
Frappe PR Bot
7915a3acae chore: Update translations (#23856) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-11-09 18:37:28 +05:30
Frappe PR Bot
f4e410af5f chore: Update translations (#23787) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-11-04 12:17:40 +05:30
Frappe PR Bot
33881fd7e2 chore: Update translations (#23717) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-10-25 12:36:35 +05:30
Frappe PR Bot
083f3fd981 chore: Update translations (#23677) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:19:27 +05:30
Frappe PR Bot
d8ddc321f8 chore: Update translations (#23577) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:28:21 +05:30
Suraj Shetty
70c06512d2 chore: Update translations 2020-10-02 03:57:15 +00:00
Suraj Shetty
7c5f43d794 chore: Update Translations 2020-04-29 18:11:03 +00:00
Suraj Shetty
4632379636 chore: Update Translations 2020-04-28 18:04:41 +00:00
Suraj Shetty
edc31d51da chore: Add CSV imported translations 2020-03-10 20:51:01 +05:30
Suraj Shetty
b868c379a7 chore: Update translations 2020-03-10 18:21:33 +05:30
Frappe PR Bot
eb2f79b16e feat: Updated translation (#20784) 2020-03-02 16:52:42 +05:30
Frappe PR Bot
ba0712a429 feat: Updated translation (#20490) 2020-02-03 14:58:03 +05:30
Frappe PR Bot
1478282920 feat: Updated translation (#20499) 2020-02-03 14:57:43 +05:30
Frappe PR Bot
84afdfdb4c feat: Updated translation (#20404) 2020-01-24 14:21:53 +05:30
Wolfram Schmidt
a346469e0c Update de.csv (#20292) 
Missing translation
 2020-01-15 19:04:39 +05:30
Wolfram Schmidt
aab96b7fbf Update de.csv (#20205) 
changed translation of "leave/-s" to "Urlaub/Urlaubstage" instead of "Blätter" (Blätter is leaves as in tree or sheet as in paper)
 2020-01-07 11:37:08 +05:30
Wolfram Schmidt
5249a6348f Update de.csv (#19755) 
Changed all translations from "Aufgabe" to "Vorgang" in singular and plural where the word "Task" is project related. Left all agricultural and others how they are (as Aufgabe).
 2019-12-01 10:47:21 +05:30
Shivam Mishra
d8abac3278 fix: typo in production plan 2019-10-30 14:06:56 +05:30
Frappe PR Bot
75c5c89909 feat: Updated translation (#19329) 2019-10-21 13:34:14 +05:30
Frappe PR Bot
045ca33692 feat: Updated translation (#19227) 2019-10-03 11:15:41 +05:30
Frappe PR Bot
abd434f656 feat: Updated translation (#19077) 2019-09-16 19:57:27 +05:30
Frappe PR Bot
037caf096b feat: Updated translation (#18597) 2019-08-12 15:32:37 +05:30
Frappe PR Bot
833afea3e3 feat: Updated translation (#18542) 2019-08-05 10:38:37 +05:30
Frappe PR Bot
98a9a4865e feat: Updated translation (#18364) 2019-07-18 12:42:31 +05:30
Frappe PR Bot
f773c8e8a3 feat: Updated translation (#18125) 2019-07-02 10:14:53 +05:30
Frappe PR Bot
a15d100cbd feat: Updated translation (#17954) 2019-06-28 13:05:19 +05:30
frappe
5aeb62f288 feat: Updated translation 2019-05-30 08:17:59 +00:00
frappe-pr-bot
67121f6c91 [Translation] Updated Translations 2018-12-24 11:57:19 +02:00
Frappe PR Bot
25fc5b879b [Translation] Updated Translations (#16227) 2018-12-24 14:22:35 +05:30
frappe-pr-bot
2ed4d84cd3 [Translation] Updated Translations 2018-11-19 11:57:50 +02:00
Frappe PR Bot
3922a184af [Translation] Updated Translations (#15959) 2018-11-12 15:51:37 +05:30
Frappe PR Bot
3c3b3d830d [Translation] Updated Translations (#15909) 2018-11-05 16:01:47 +05:30
Frappe PR Bot
467ff4f0f2 [Translation] Updated Translations (#15852) 2018-10-30 11:26:11 +05:30
Frappe PR Bot
be923a8995 [Translation] Updated Translations (#15685) 2018-10-15 14:55:04 +05:30