nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,356 Commits 484 Branches 1,768 Tags
mergify/bp/version-15-hotfix/pr-39320
Commit Graph

804 Commits

Author SHA1 Message Date
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
Nabin Hait
e89dce726b fix: improved validation message 
(cherry picked from commit fe43dab4d7)
 2024-01-08 06:53:10 +00:00
Aulia Bismar
5e4693763a fix: Creating Asset Activity while Importing Asset (#39113) 
* fix: import asset not working on activity

* chore: fix linting issue in asset_activity.py

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2024-01-05 10:46:31 +05:30
mergify[bot]
a99470e017 chore: additional_asset_cost field (backport #38904) (#38906) 
chore: additional_asset_cost field (#38904)

(cherry picked from commit 283763dfb2)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-12-21 16:55:41 +05:30
mergify[bot]
58f1df5004 feat: total_asset_cost field (backport #38879) (#38887) 
* feat: total_asset_cost field (#38879)

(cherry picked from commit d370c60a6c)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

* chore: remove unnecessary patch

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-12-20 22:47:48 +05:30
mergify[bot]
2bd96713db fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (backport #38696) (#38703) 
fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (#38696)

fix: 1st row value of asset put to less than 180 days acc. to IT S. 32
(cherry picked from commit e7984b3ef9)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-12-12 21:09:38 +05:30
mergify[bot]
5e6a4d257e feat: enable automatic type annotations (backport #38452) (#38454) 
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 14:43:16 +05:30
Gursheen Anand
de7e1ab237 fix: set cwip account before asset tests 
(cherry picked from commit ef8e4191cd)
 2023-11-29 13:24:56 +00:00
mergify[bot]
12ad1ec71a feat: shift depreciation for assets (backport #38327) (#38417) 
feat: shift depreciation for assets (#38327)

* feat: shift depreciation for assets

* chore: create new asset depr schedule on shift change

* refactor: move create_depr_schedule to after_insert

* fix: args in get_depreciation_amount test

* refactor: rename shift adjustment to shift allocation

* chore: asset shift factor doctype and auto allocate shift diff

* chore: use check instead of depr type, and add tests

* chore: make linter happy

* chore: give permissions to accounts users

(cherry picked from commit fe5fc5bd3a)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-29 12:15:53 +05:30
mergify[bot]
b9f26ae849 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:06:34 +05:30
mergify[bot]
18613c595f fix: don't depreciate assets with no schedule on scrapping (backport #38276) (#38293) 
fix: don't depreciate assets with no schedule on scrapping (#38276)

fix: don't depreciate non-depreciable assets on scrapping
(cherry picked from commit 816b1b6bd5)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-23 14:05:08 +05:30
mergify[bot]
99bf63ec0f fix: set default asset quantity as 1 [dev] (backport #38223) (#38226) 
fix: set default asset quantity as 1 [dev] (#38223)

* fix: make default asset quantity as 1

* fix: get rate_of_depreciation from asset category for asset auto-creation

* chore: create asset depr schedules on PR submit, not asset submit

* fix: set default asset quantity as 1

* chore: move patch from v15 to v14

(cherry picked from commit 9903049c7a)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-20 22:49:38 +05:30
Deepesh Garg
d51237195a fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#38123) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* test: Update tests
 2023-11-16 13:38:10 +05:30
mergify[bot]
8bc871a842 chore: change read only condition of asset quantity field (backport #38111) (#38113) 
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:33 +05:30
mergify[bot]
b3562bdb87 fix: asset depreciation ledger (backport #37991) (#37993) 
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)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-08 22:52:16 +05:30
mergify[bot]
e71ef10ca9 fix: list index out of range (backport #37890) (#37920) 
fix: list index out of range (#37890)

* fix: list index out of range

* fix: solve linter test failing

(cherry picked from commit e5bc8fccb1)

Co-authored-by: viralkansodiya15 <98073516+viralpatel15@users.noreply.github.com>
 2023-11-05 12:33:58 +05:30
mergify[bot]
5171e3238d chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based [dev] (copy #37897) (#37899) 
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based

(cherry picked from commit 7c49b277ef)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-11-04 02:02:25 +05:30
mergify[bot]
fc4bcc0965 chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (backport #37893) (#37896) 
chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (#37893)

* chore: rename daily_depreciation to depreciation_based_on_num_days_in_month

* chore: add patch

* chore: remove unnecessary files

* chore: add amount in field name

* chore: add amount in label

(cherry picked from commit 568d5bfbe8)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-03 23:26:32 +05:30
mergify[bot]
18e40dd032 refactor: remove extraneous disabled filters (backport #37732) (#37749) 
refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-10-30 09:57:32 +05:30
mergify[bot]
a3d3c0024e chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723) (#37724) 
* 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:43 +05:30
Anand Baburajan
18e3a8907a fix: don't set finance books if gross_purchase_amount is not set (#37480) 2023-10-12 19:41:11 +05:30
anandbaburajan
9468513d7c test: fixing test_capitalization_with_wip_composite_asset 2023-10-04 22:11:15 +05:30
mergify[bot]
f4f40cc776 feat: composite WIP asset (copy #37352) (#37353) 
* feat: wip composite asset

(cherry picked from commit 4907e7acd4)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolving conflicts

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-10-04 10:29:18 +05:30
Anand Baburajan
fed94845ce feat: asset salvage_value_percentage (#37302) 
* feat: asset salvage_value_percentage

* chore: add missing parameter in get_item_details

* chore: change asset depr table colors
 2023-10-03 12:21:17 +05:30
Marica
d6e4f80187 fix: Set serial_and_batch_bundle in right field for Asset Repair Stock Entry (#37273) 
fix: Set `serial_and_batch_bundle` in same field for Asset Repair SE
- `serial_and_batch_bundle` was earlier set in `serial_no` field
 2023-09-27 23:34:57 +05:30
HENRY Florian
34bb64e41a fix(ux): move get_route_options_for_new_doc to refresh (#37096) 
fix: move `get_route_options_for_new_doc` to `refresh`
 2023-09-16 15:59:09 +05:30
Bernd Oliver Sünderhauf
846ae32d92 feat: Add half-yearly asset maintenance periodicity. (#37006) 2023-09-10 17:00:01 +05:30
Anand Baburajan
034322c53f fix: correct asset daily depr schedule calculation [dev] (#36993) 
fix: correct asset daily depr schedule calculation
 2023-09-06 22:20:38 +05:30
Anand Baburajan
0077659e93 chore: asset finance books validation (#36979) 2023-09-06 12:44:07 +05:30
Anand Baburajan
4f0bb45a8b chore: patch to correct asset values if je has workflow [dev] (#36914) 
chore: patch to correct asset values if je has workflow
 2023-09-02 18:31:32 +05:30
Suraj Shetty
e92d4e9b4a Merge branch 'develop' into develop-ritvik-ignore-perm-tree-doctype 2023-08-30 16:46:00 +05:30
RitvikSardana
de433d8626 fix: added ignore_user_permissions to parent field of tree doctypes 2023-08-29 13:07:13 +05:30
ViralKansodiya
3a2933db4d fix: error in report when data is not available to load chart in report (#36842) 2023-08-28 18:14:52 +05:30
Anand Baburajan
bb3bd02f53 chore: styling improvements for asset depr sch table (#36792) 
* chore: improve asset depr sch table

* chore: fix text color
 2023-08-23 19:22:25 +05:30
Anand Baburajan
56b26852f3 fix: use current asset depr schedule to make temp schedule (#36783) 
fix: use current depr schedule to make temp schedule
 2023-08-23 18:01:59 +05:30
Anand Baburajan
87e2309e8e fix: avoid duplicate asset activity entries on asset capitalization (#36756) 2023-08-22 15:30:04 +05:30
Anand Baburajan
8f04945cef fix: incorrect schedule in asset value adjustment (#36747) 2023-08-22 12:36:09 +05:30
Anand Baburajan
e0c79d3b53 chore: add validation for depreciation expense account in asset category (#36659) 2023-08-15 10:17:15 +00:00
Anand Baburajan
98e82e0d99 chore: set default filter dates if missing (#36597) 2023-08-11 08:51:48 +00:00
Anand Baburajan
d138948c70 feat: daily asset depreciation method [dev] (#36588) 
feat: daily asset depreciation method
 2023-08-10 17:46:01 +00:00
Anand Baburajan
ad33cd73e8 perf: asset depreciation entry posting [develop] (#36555) 
* perf: optimise post_depreciation_entries and make_depreciation_entry

* chore: fixing minor mistake

* chore: fix asset_value_adjustment test
 2023-08-09 20:26:28 +05:30
mergify[bot]
b717e2b5bf chore: don't merge asset capitalization gl entries (copy #36514) (#36515) 
chore: don't merge asset capitalization gl entries

(cherry picked from commit 3c8f292ac3)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-08-06 23:44:22 +05:30
Anand Baburajan
38a612c62e chore: better cost center validation for assets (#36477) 2023-08-03 16:37:05 +05:30
Anand Baburajan
a8df875820 chore: use datatable for asset depr sch table view (#36449) 
* chore: use datatable for asset depr sch table view

* chore: remove unnecessary code
 2023-08-01 21:14:27 +05:30
Anand Baburajan
2ab3d75274 feat: asset activity (#36391) 
* feat: asset activity

* chore: add more actions to asset activity

* chore: fix failing test due to timestamp mismatch error

* chore: rewriting asset activity messages

* chore: add report and add it to workspace

* chore: show user in list view
 2023-08-01 12:00:24 +05:30
mergify[bot]
3f09f811bf fix: allow fully depreciated existing assets (copy #36378) (#36379) 
* fix: allow fully depreciated existing assets

(cherry picked from commit 9489cba275)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/assets/doctype/asset/depreciation.py

* chore: fix conflicts in asset.json

* chore: fix conflicts in depreciation.py

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-08-01 11:20:04 +05:30