erpnext

mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 03:17:55 +00:00

Author	SHA1	Message	Date
Nabin Hait	c1428a5655	Merge pull request #40246 from nabinhait/depreciation-asset-sale fix: Book depreciation until the asset disposal date and removed unwanted commits	2024-03-13 13:17:18 +05:30
Nabin Hait	43a6a00912	Merge pull request #40125 from nabinhait/document-modified-error fix: Reload document on cancel to avoid document modified error	2024-03-13 13:17:05 +05:30
Nabin Hait	b5f0576a1b	Merge pull request #40122 from nabinhait/remove-capitalized-in fix: Patch to remove cancelled asset capitalization from asset	2024-03-13 13:16:29 +05:30
Nabin Hait	34c3e75d5c	fix: convert str to date	2024-03-12 12:16:41 +05:30
Nabin Hait	ac0dd5083f	fix: linter issues	2024-03-12 12:10:55 +05:30
Nabin Hait	668a93128b	fix: linter issues	2024-03-12 12:02:23 +05:30
Nabin Hait	5fcf8c588a	fix: Book depreciation until the asset disposal date and removed unwanted commits	2024-03-12 11:56:47 +05:30
Ankush Menat	4c629d31c6	style: format js files	2024-03-11 11:03:58 +05:30
Nabin Hait	c7ed854850	fix: Reload document on cancel to avoid document modified error	2024-02-26 14:49:32 +05:30
Nabin Hait	23e256aedf	fix: Patch to remove cancelled asset capitalization from asset	2024-02-26 12:53:06 +05:30
Nabin Hait	46762ead05	Merge pull request #39982 from nabinhait/asset-capitalization-cancel fix: On cancelation of capitalization, reverse depreciation entry only if journal entry exists	2024-02-20 18:30:14 +05:30
Nabin Hait	5b9905f27a	fix: On cancelation of capitalization, reverse depreciation entry only if journal entry exists	2024-02-20 17:54:58 +05:30
Nabin Hait	a4fbea3722	fix: linter issue	2024-02-20 12:31:34 +05:30
Nabin Hait	e99485bfa7	fix: linter issues	2024-02-20 12:24:36 +05:30
Nabin Hait	963ddac528	fix: Adjust amount in last row due to rounding	2024-02-20 12:24:36 +05:30
Nabin Hait	abceb1b611	fix: linter issue	2024-02-20 12:21:12 +05:30
Nabin Hait	24386006d6	fix: cancel asset capitalization	2024-02-12 11:44:41 +05:30
Nabin Hait	f2d094d1ab	fix: Handling circular linking while cancelling asset capitalization	2024-02-08 15:51:29 +05:30
Nabin Hait	1dacb79441	fix: fetch correct quantity and amount for grouped asset (cherry picked from commit `06f48c678b`)	2024-01-25 10:51:48 +00:00
Nabin Hait	941f8824e5	fix: linter issue	2024-01-25 11:40:44 +05:30
Nabin Hait	f604798a45	fix: asset module test cases	2024-01-19 16:59:52 +05:30
Nabin Hait	b840eb90eb	fix: Asset Depreciation WDV as per Income Tax Act	2024-01-18 19:06:41 +05:30
Nabin Hait	ac6020a940	fix: composite asset capitalization using asset components (cherry picked from commit `5df40661d2`)	2024-01-17 15:35:56 +00:00
Nabin Hait	4edb73d398	fix: resolved merge conflict	2024-01-17 17:36:42 +05:30
Nabin Hait	1dff96057c	fix: Cancel asset capitalisation record on cancellation of asset and vice-versa (cherry picked from commit `efe9f6656f`) # Conflicts: # erpnext/assets/doctype/asset_capitalization/asset_capitalization.py	2024-01-17 06:44:52 +00:00
Nabin Hait	cc07213faa	Merge pull request #39189 from frappe/mergify/bp/version-14-hotfix/pr-39163 fix: Purchase information is not required for creating a composite asset (backport #39163)	2024-01-10 12:15:43 +05:30
Nabin Hait	0379ea5086	Merge pull request #39277 from frappe/mergify/bp/version-14-hotfix/pr-39238 fix: Set asset purchase amount based on qty and valuation_rate (backport #39238)	2024-01-10 12:14:24 +05:30
Nabin Hait	b529883897	fix: resolved conflict	2024-01-10 12:01:32 +05:30
Nabin Hait	41e384326e	fix: Set asset purchase amount based on qty and valuation_rate (cherry picked from commit `135e19d0aa`)	2024-01-10 06:03:03 +00:00
Nabin Hait	0f6477a253	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:52:33 +00:00
Nabin Hait	580e9f6e10	fix: improved validation message (cherry picked from commit `fe43dab4d7`)	2024-01-08 06:52:32 +00:00
anandbaburajan	1cbe1e894d	fix: asset WDV depreciation calc according to IT act	2023-12-31 23:34:15 +05:30
mergify[bot]	3b9feffc00	chore: additional_asset_cost field (backport #38904 ) (#38905 ) * chore: additional_asset_cost field (#38904) (cherry picked from commit `283763dfb2`) # Conflicts: # erpnext/assets/doctype/asset/asset.py * chore: resolve conflicts in asset.py --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-12-21 16:56:32 +05:30
mergify[bot]	8169c7de0d	feat: total_asset_cost field (backport #38879 ) (#38886 ) * feat: total_asset_cost field (#38879) (cherry picked from commit `d370c60a6c`) # Conflicts: # erpnext/assets/doctype/asset/asset.json # erpnext/assets/doctype/asset/asset.py # erpnext/patches.txt * chore: resolve conflicts in asset.json * chore: resolve conflicts in asset.py * chore: resolve conflicts in patches.txt --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-12-20 22:57:37 +05:30
Anand Baburajan	753a1b511d	fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (#38697 ) fix: 1st row value of asset put to less than 180 days acc. to IT S. 32	2023-12-12 20:53:44 +05:30
Sherin KR	14b908f8ab	fix: validate finance_books table length in asset (#38584 )	2023-12-05 14:44:59 +05:30
Karol Walczysko	9f43e9e668	Fix: Asset JS fieldname depreciation_schedule to schedules in make_schedules_editable function. (#38583 ) Fix fieldname depreciation_schedule to schedules Renames the depreciation_schedule fieldname to schedules in the make_schedules_editable function.	2023-12-05 14:22:23 +05:30
Gursheen Anand	ecde1d58b5	fix: set cwip account before asset tests (cherry picked from commit `ef8e4191cd`)	2023-11-29 13:21:46 +00:00
mergify[bot]	fd6a23cf41	fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342 ) fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342) * fix: Debit credit mimatch in multicurrecy asset purchase receipt * test: multi currency purchase receipt * chore: update init files * test: roolback (cherry picked from commit `add238c892`) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-11-29 09:07:42 +05:30
Anand Baburajan	d8c3935e64	feat: shift depreciation for assets [v14] [backport of #38327 ] (#38404 ) feat: shift depreciation for assets	2023-11-29 06:15:22 +05:30
Anand Baburajan	5261aba81f	fix: don't depreciate non-depreciable assets on scrapping [v14] (#38294 ) fix: don't depreciate non-depreciable assets on scrapping	2023-11-23 14:15:40 +05:30
Anand Baburajan	3daf6f822a	fix: set default asset quantity as 1 [v14] (#38224 ) fix: set default asset quantity as 1	2023-11-20 22:27:25 +05:30
mergify[bot]	58cb4303ee	chore: change read only condition of asset quantity field (backport #38111 ) (#38112 ) chore: change read only condition of asset quantity field (#38111) chore: change read only condition of asset quantity (cherry picked from commit `6e0362dee8`) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-11-15 18:01: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
viralkansodiya15	05fed9e352	fix: list index out of range (#37880 ) * fix: list index out of range * fix: changes in error message * fix: change error message and date comparision * fix: change a return a value when disposal date is equal to available for use date * fix: changes to fix linter test failing	2023-11-05 11:54:39 +05:30
Anand Baburajan	65dfef021a	chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based [v14] (#37898 ) chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based	2023-11-03 20:18:20 +00:00
Anand Baburajan	86c6ae6275	chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [v14] (#37895 ) chore: rename daily_depreciation to depreciation_amount_based_on_num_days_in_month	2023-11-03 23:26:34 +05:30
mergify[bot]	b605b08ec1	refactor: remove extraneous disabled filters (backport #37732 ) (#37748 ) * refactor: remove extraneous disabled filters (cherry picked from commit `f276fbba4f`) # Conflicts: # erpnext/accounts/report/profitability_analysis/profitability_analysis.js # erpnext/public/js/controllers/accounts.js * chore: `conflicts` --------- Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com> Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>	2023-10-30 10:10:16 +05:30
mergify[bot]	3f296eea3a	chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723 ) (#37725 ) * chore: allow wip_composite_asset in the MR PO PR PI flow (cherry picked from commit `0e5bea33a3`) # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.py * chore: resolve conflict --------- Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>	2023-10-27 18:54:47 +05:30
Smit Vora	375be8cd93	fix: purchase receipt with stock and asset items	2023-10-26 17:59:42 +05:30

1 2 3 4 5 ...

753 Commits