nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,021 Commits 473 Branches 1,756 Tags
7601861f217e71aeecc53a1b1d4bcb1f4bd66c20
Commit Graph

109 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Frappe PR Bot
3f320676f6 [Translation] Updated Translations (#15620) 2018-10-10 14:44:12 +05:30
Frappe PR Bot
04e4af8d59 [Translation] Updated Translations (#15550) 2018-10-02 11:24:12 +05:30
Frappe PR Bot
c1bc8d6066 [Translation] Updated Translations (#15518) 2018-09-27 15:47:52 +05:30
Frappe PR Bot
db8c1f254e [Translation] Updated Translations (#15414) 2018-09-17 16:54:30 +05:30
Frappe PR Bot
157bdb71ca [Translation] Updated Translations (#15375) 2018-09-11 17:21:39 +05:30
Frappe PR Bot
5c0a831ff2 [Translation] Updated Translations (#15299) 2018-09-03 15:58:04 +05:30
Frappe PR Bot
3921660747 [Translation] Updated Translations (#15285) 2018-09-03 11:14:57 +05:30
Frappe PR Bot
b48c769588 [Translation] Updated Translations (#14849) 2018-07-09 16:56:49 +05:30
Frappe PR Bot
1baa811a40 [Translation] Updated Translations (#14776) 2018-07-03 09:59:57 +05:30
Frappe PR Bot
5c13cb3221 [Translation] Updated Translations (#14669) 2018-06-25 15:08:15 +05:30
Frappe PR Bot
748c0240db [Translation] Updated Translations (#14615) 2018-06-21 10:34:28 +05:30
Alchez
eb0ac37587 Fix ISO standard references in Agriculture (#14361) 2018-06-06 10:10:56 +05:30
Frappe PR Bot
b2a64d6344 [Translation] Updated Translations (#14021) 2018-05-16 10:46:11 +05:30
Frappe PR Bot
59a2a653d0 [Translation] Updated Translations (#13570) 2018-04-12 13:36:55 +05:30
frappe-pr-bot
6623cdc244 [Translation] Updated Translations 2018-04-03 15:49:16 +02:00