nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,537 Commits 461 Branches 1,748 Tags
12f383f252c6f3bf6d8d22f752c226f786b3d4f0
Commit Graph

849 Commits

Author SHA1 Message Date
Khushi Rawat
12f383f252 test: made minor change in existing test 
(cherry picked from commit d40b55468c)
 2024-05-15 03:11:37 +00:00
Khushi Rawat
01b25b5821 fix: incorrect total days calculation 
(cherry picked from commit fccd37d32d)
 2024-05-15 03:11:36 +00:00
Khushi Rawat
c335c2c85a fix: daily prorata based depreciation bug in wdv method 
(cherry picked from commit b8a98a273b)
 2024-05-15 03:11:36 +00:00
Khushi Rawat
1016ec2a14 fix(wip): daily depreciation bug 
(cherry picked from commit f337392f3e)
 2024-05-15 03:11:36 +00:00
Nabin Hait
230cff583f Merge pull request #41461 from frappe/mergify/bp/version-15-hotfix/pr-41089 
Refactor: Rename purchase receipt amount field to purchase amount (backport #41089)
 2024-05-14 19:58:15 +05:30
Nabin Hait
3a72f4bd30 fix: resolved conflict 2024-05-14 19:34:29 +05:30
Nabin Hait
8cca74d5ef fix: resolved conflict 2024-05-14 19:29:23 +05:30
Khushi Rawat
ce2c6c3165 fix(minor): removed extra parameter 
(cherry picked from commit 98e7dfe97f)
 2024-05-14 13:56:25 +00:00
Khushi Rawat
0b21026eef refactor: removed code duplicacies 
(cherry picked from commit 6b24143f72)
 2024-05-14 13:56:25 +00:00
Khushi Rawat
3eff9c9779 fix(wip): depreciation calculation after asset value adjustment 
(cherry picked from commit d3200fb67f)
 2024-05-14 13:56:24 +00:00
Khushi Rawat
0aca1e8e05 fix: removed unrelated code modification 
(cherry picked from commit 360c3b36ed)
 2024-05-14 12:47:53 +00:00
“Khushi
9b3f309598 refactor: renamed purchase receipt amount field to purchase amount 
(cherry picked from commit 31841b4ab2)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/assets/doctype/asset/asset.py
#	erpnext/patches.txt
 2024-05-14 12:47:53 +00:00
Nabin Hait
a755540708 fix: Patch to remove cancelled asset capitalization from asset 
(cherry picked from commit 1951f71eeb)
 2024-05-08 12:42:57 +00:00
Rohit Waghchaure
85796b3534 fix: validation for zero qty in SABB 
(cherry picked from commit 497f560b4b)
 2024-04-19 09:41:27 +00:00
Nabin Hait
5ba9fbcbdb Merge pull request #40953 from frappe/mergify/bp/version-15-hotfix/pr-40916 
fix: check if there is any existing depreciation schedule (backport #40916)
 2024-04-11 11:32:44 +05:30
Nabin Hait
dcb7e27a5e fix: check if there is any existing depreciation schedule 
(cherry picked from commit 433c8c450c)
 2024-04-11 05:24:08 +00:00
mergify[bot]
0ec1f01b00 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40584 2024-04-10 15:57:49 +00:00
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Nabin Hait
16a5475c0c fix: pro-rata amount for straight line method 2024-04-07 15:21:46 +05:30
Nabin Hait
8247fd1727 fix:linter issue 2024-04-07 15:18:29 +05:30
Nabin Hait
350d53dbe1 fix: depr amount pro rata and related tests 2024-04-07 14:14:13 +05:30
Nabin Hait
1276855f40 fix: Get pro-rata amount based on correct days 2024-04-07 14:14:06 +05:30
Nabin Hait
79043894b2 fix: show currency symbol in base currency in fixed asset register report 
(cherry picked from commit 8b6220efd8)
 2024-04-02 10:27:55 +00:00
Deepesh Garg
634054c07b Merge pull request #40430 from frappe/mergify/bp/version-15-hotfix/pr-40385 
fix: Book depreciation until the asset disposal date and remove unwanted commits (#40385)
 2024-03-26 09:05:20 +05:30
barredterra
f0e00daa1c refactor: usage of in_list 
(cherry picked from commit d238751e6b)
 2024-03-19 11:13:02 +00:00
Nabin Hait
2d7ff5d4cf fix: Book depreciation until the asset disposal date and removed unwanted commits 
(cherry picked from commit dedae4fecf)
 2024-03-13 07:48:27 +00:00
mergify[bot]
7d3d2eb928 ci: add prettier to pre-commit (backport #40206) (#40362) 
* ci: add prettier to pre-commit

(cherry picked from commit 2c16036ef3)

* style: format js files

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-03-11 10:47:18 +05:30
mergify[bot]
ee119f30fb chore: fixed fetch from (backport #40270) (#40275) 
chore: fixed fetch from (#40270)

(cherry picked from commit 34051bc04f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-05 14:32:36 +05:30
mergify[bot]
9d19ec43c8 fix: Data too long for column 'serial_no' at row 1 (backport #40098) (#40139) 
* fix: Data too long for column 'serial_no' at row 1 (#40098)

(cherry picked from commit 08caa7cfa1)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-26 23:00:01 +05:30
Nabin Hait
692867427c fix: resolved conflict 2024-02-21 11:38:21 +05:30
Nabin Hait
a0c0ab7709 fix: resolved conflict 2024-02-21 11:37:47 +05:30
Nabin Hait
8eb2f67910 fix: Issues regarding asset cancellation and deletion 
(cherry picked from commit 17f85de6fb)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
 2024-02-21 05:45:27 +00:00
Rohit Waghchaure
a08b97e886 test: fixed test cases 
(cherry picked from commit c1e869f040)
 2024-02-06 10:18:05 +00:00
Rohit Waghchaure
282c19e7e1 fix: use old serial / batch fields to make serial batch bundle 
(cherry picked from commit 9fafc83632)
 2024-02-06 10:18:05 +00:00
Nabin Hait
3bdd1e9514 fix: fetch correct quantity and amount for grouped asset 
(cherry picked from commit 06f48c678b)
 2024-01-25 10:51:53 +00:00
mergify[bot]
00a3ee313b refactor(UX): Accounts workspace cleanup (backport #39232) (#39456) 
* refactor(UX): Accounts workspace cleanup (#39232)

* refactor(UX): Accounts workspace cleanup

* chore: move asset workspace outside accounting

* fix: remove redundant links from parent workspace

* chore: change icons for payable & receivable workspaces

* chore: remove redundant links from subworkspaces

(cherry picked from commit 35067282cf)

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-01-19 12:40:25 +05:30
mergify[bot]
c8b3478fe1 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-39429 2024-01-17 16:26:04 +00:00
Nabin Hait
ff1647a1d2 fix: test for asset depreciation 2024-01-17 21:53:00 +05:30
Nabin Hait
8bc8bc1822 fix: composite asset capitalization using asset components 
(cherry picked from commit 5df40661d2)
 2024-01-17 15:36:04 +00:00
Nabin Hait
9f86b92eb7 Merge pull request #39431 from frappe/mergify/bp/version-15-hotfix/pr-39427 
fix: Asset module tests (backport #39427)
 2024-01-17 17:38:46 +05:30
Nabin Hait
04c8e9b355 Merge pull request #39422 from frappe/mergify/bp/version-15-hotfix/pr-39386 
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa (backport #39386)
 2024-01-17 17:33:21 +05:30
Nabin Hait
9e33216c24 fix: Asset module tests 
(cherry picked from commit 97f69986ff)
 2024-01-17 11:56:41 +00:00
Nabin Hait
011c5a69f0 fix: Cancel asset capitalisation record on cancellation of asset and vice-versa 
(cherry picked from commit efe9f6656f)
 2024-01-17 06:45:39 +00:00
Nabin Hait
e3cd35b959 fix: WDV as per IT Act: calculate yearly amount first and then split it based on months 
(cherry picked from commit 22bd6a54b2)
 2024-01-17 06:44:26 +00:00
anandbaburajan
2448ba6bc4 fix: asset WDV depreciation calc according to IT act 
(cherry picked from commit 026824880d)
 2024-01-10 06:48:06 +00:00
Nabin Hait
f82125144a Merge pull request #39190 from frappe/mergify/bp/version-15-hotfix/pr-39163 
fix: Purchase information is not required for creating a composite asset (backport #39163)
 2024-01-10 12:15:02 +05:30
Nabin Hait
afefae08af fix: Resolved conflict 2024-01-10 11:59:54 +05:30
Nabin Hait
f0070b4046 fix: Set asset purchase amount based on qty and valuation_rate 
(cherry picked from commit 135e19d0aa)
 2024-01-10 06:03:01 +00:00
Nabin Hait
1d2e831846 fix: Introduced company field to show amounts in company currency 
(cherry picked from commit eab22eb282)
 2024-01-08 16:09:42 +00:00
Nabin Hait
d6d54ed220 fix: Purchase date and amount is not mandatory for composite asset creation 
(cherry picked from commit c34f09c503)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2024-01-08 06:53:11 +00:00