schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,922 Commits 322 Branches 1,581 Tags
bd89c19c98fca7e90a22ccde96aa92cba2d29566
Commit Graph

913 Commits

Author SHA1 Message Date
Khushi Rawat
7f7f403f5b fix: set asset value correctly after cancelling value adjustment 
(cherry picked from commit fee3846144)
 2025-02-05 09:56:11 +00:00
Khushi Rawat
223fe62638 fix: resolved conflicts 2025-02-05 14:43:24 +05:30
rahulgupta8848
bbecd36a5d feat: account heads changed along with journal entry type and descrip… (#42845) 
* feat: account heads changed along with journal entry type and description

* feat: added patch for difference_amount for asset value adjustment and refactor

---------

Co-authored-by: “rahulgupta8848” <“rahul.gupta@8848digital.com”>
(cherry picked from commit d4fdada83c)

# Conflicts:
#	erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#	erpnext/patches.txt
 2025-02-05 09:09:49 +00:00
mergify[bot]
bdc65daadd fix: added debounce to prevent multiple clicks (backport #45369) (#45376) 
fix: added debounce to prevent multiple clicks (#45369)

* fix: added debounce to prevent multiple clicks

* fix: linters check

(cherry picked from commit 9ff3101b2d)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2025-01-22 17:53:04 +05:30
mergify[bot]
0665bc4a28 chore: removal of decapitalization feature (backport #45162) (#45173) 
* chore: removal of decapitalization feature (#45162)

* chore: removal of decapitalization feature

* fix: rearrangement of asset capitalization doctype fields

(cherry picked from commit 7ea73d8265)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.json

* fix: resolved conflicts

---------

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2025-01-13 11:58:53 +05:30
Khushi Rawat
7318748a4c fix: resolved conflicts 2025-01-08 11:07:30 +05:30
Khushi Rawat
1ea36bba88 feat: work in progress status for asset (#45066) 
* feat: work in progress status for asset

* fix: test case correction

* fix(patch): added patch to update status of assets

* fix: updated tests

(cherry picked from commit 6850019649)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/patches.txt
 2025-01-07 18:14:22 +00:00
Khushi Rawat
839ffb3f2a fix: copy accounting dimensions to asset and sales invoice (#44964) 
* fix: copy accounting dimensions to asset and sales invoice

* fix: replace sql query with query builder

* refactor: reuse function for accounting dimensions

* fix: loop handling

* fix: use explicit param

(cherry picked from commit 079ec864de)

# Conflicts:
#	erpnext/controllers/buying_controller.py
 2024-12-31 07:07:16 +00:00
Khushi Rawat
ddfead2cde fix: test case correction 
(cherry picked from commit 2f7e6230a6)
 2024-12-23 18:31:28 +00:00
Khushi Rawat
516a325a31 fix: asset field precision check 
(cherry picked from commit 92b8768ae2)
 2024-12-23 18:31:28 +00:00
Khushi Rawat
ed42ed04d2 fix: make rate of depreciation mandatory 2024-12-17 11:39:36 +05:30
Khushi Rawat
632a45d82e fix: handle zero salvage value case 2024-12-17 11:37:05 +05:30
Khushi Rawat
ef5a5643dc fix: precision check for salvage value 2024-12-10 15:17:04 +05:30
mahsem
843ff18cf9 fix: add title for translation in asset.js 
(cherry picked from commit 61439132a4)
 2024-12-05 09:47:58 +00:00
Sugesh393
db21def58b fix: add company dynamic filters in number cards 
(cherry picked from commit 4e7725de66)
 2024-11-26 05:24:57 +00:00
Khushi Rawat
b665e4e24a fix: add precision validation 
(cherry picked from commit 7daadcf420)
 2024-11-05 19:03:26 +00:00
Khushi Rawat
1af2326a52 fix: consider opening asset values while calculating asset depreciation rate 
(cherry picked from commit 9d0fe7aa56)
 2024-10-29 18:36:31 +00:00
Khushi Rawat
0a03076148 chore: resolved conflicts 2024-10-22 01:17:33 +05:30
Khushi Rawat
a3b8f9759d feat: added assignee email field in asset maintenance log 
(cherry picked from commit 5911934dc7)

# Conflicts:
#	erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#	erpnext/patches.txt
 2024-10-21 19:44:34 +00:00
Doğancan
84e26e21ab fix: translate in js 
(cherry picked from commit 25faec5662)
 2024-09-19 03:27:13 +00:00
Khushi Rawat
c5051561e4 fix: do not validate purchase document for composite asset 
(cherry picked from commit 5fd058dde9)
 2024-09-16 18:48:26 +00:00
Khushi Rawat
9e72a844f7 fix: pass company from asset to asset capitalization 
(cherry picked from commit f3445d645d)
 2024-09-09 17:00:01 +00:00
Khushi Rawat
208bd2b8ff fix: unhide action button after form redirect 
(cherry picked from commit 5ce5b1b6a2)
 2024-09-09 17:00:01 +00:00
Khushi Rawat
6fde07da0e fix(minor): reorder expected value validation 
(cherry picked from commit 0a6bf1559b)
 2024-09-06 18:44:41 +00:00
Khushi Rawat
1121c6663f fix: link Purchase Invoice and Receipt Items to Asset 2024-09-05 14:31:05 +05:30
Khushi Rawat
88e5ed7998 chore: test case failing issue 
(cherry picked from commit 0bdffdfa98)
 2024-09-02 22:09:22 +00:00
Khushi Rawat
f3c60ea0a7 fix(capitalization): debit cwip account instead of fixed asset account (#42857) 
* fix(capitalization): debit cwip account instead of fixed asset account

* fix: post entries for capitalized asset through background jobs

* chore: run pre-commit

* fix: correct GL entries posting for composite assets

* fix(minor): resolve failing check

* chore: update gl entry check logic

* chore: handle none values

(cherry picked from commit 5d99f17583)
 2024-08-29 11:01:03 +00:00
Khushi Rawat
a833010d2b fix: don't allow capitalizing only service item for new composite asset 
(cherry picked from commit f1d2138258)
 2024-08-28 20:43:15 +00:00
Khushi Rawat
fa85482662 fix: calculation correction for annual depreciation 
(cherry picked from commit f440243b75)
 2024-08-22 05:48:09 +00:00
Khushi Rawat
1040198ce1 perf: asset creation from purchase receipt 
(cherry picked from commit 6e84fc5143)
 2024-08-20 08:12:48 +00:00
barredterra
4914481105 fix: translatability of boldened text 
(cherry picked from commit af0ae930ca)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-08-17 00:21:05 +00:00
Khushi Rawat
ecf0d0b388 chore: linters check 
(cherry picked from commit 0d42793397)
 2024-08-14 09:07:38 +00:00
Khushi Rawat
b84ca04975 fix: removed extra filter condition 
(cherry picked from commit 6fa29376a0)
 2024-08-14 09:07:38 +00:00
Khushi Rawat
abb88662c1 fix: set up filters for dimensions 
(cherry picked from commit 2fd8de2f76)
 2024-08-14 09:07:37 +00:00
Khushi Rawat
d890d02b5c test: new depreciation after cancelling asset repair 
(cherry picked from commit 88a5824e31)
 2024-08-13 19:01:02 +00:00
Khushi Rawat
defd5541b0 fix: resolved conflict 
(cherry picked from commit c085b6159b)
 2024-08-13 19:01:01 +00:00
Khushi Rawat
765c1104c4 fix: fetch months last date to avoid miscalculation 
(cherry picked from commit 70ff4e7644)
 2024-08-13 08:42:33 +00:00
Khushi Rawat
a429f2f626 fix: cancel Journal Entry on cancellation of asset value adjustment 
(cherry picked from commit 4b7f1f2d67)
 2024-08-12 20:43:30 +00:00
Khushi Rawat
2d644ac066 fix: disable primary action button only when there are no active capitalization 
(cherry picked from commit bb877f4a6b)
 2024-08-06 13:43:27 +00:00
mergify[bot]
2de86eb0f4 fix: use get_last_day to get the correct date (backport #42564) (#42598) 
fix: use get_last_day to get the correct date (#42564)

(cherry picked from commit 5d58eb67a6)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2024-08-02 17:10:37 +05:30
Khushi Rawat
1390c86fc4 fix(tests): added tests for usecase 
(cherry picked from commit f0768010d9)
 2024-07-30 13:35:18 +00:00
Khushi Rawat
9d2ef4d3e8 fix: Adjust initial month's depreciation to end of depreciation period 
(cherry picked from commit cbb749a3a5)
 2024-07-30 13:35:17 +00:00
Khushi Rawat
ffacf4222b fix: correct validation for depreciation posting date 
(cherry picked from commit da4ed90a3e)
 2024-07-23 09:54:44 +00:00
Khushi Rawat
29fc975fb8 fix: set filter to show only submitted asset 
(cherry picked from commit 69b8e10e20)
 2024-07-19 13:47:45 +00:00
Khushi Rawat
cfab956811 chore: resolved conflicts 2024-07-16 22:46:54 +05:30
Khushi Rawat
2ffe7d5838 fix: service item capitalization (#42188) 
* feat: capitalize with service expenses only

* chore: added test

* refactor: removed Capitalized In field from asset doc

(cherry picked from commit 81e0b96c30)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2024-07-16 12:16:47 +00:00
Khushi Rawat
ddd1ca7f7c feat: configurable depreciation calculation via accounts settings (#42276) 
* feat: configurable depreciation calculation via accounts settings

* refactor: code optimization

* style: changes in description and label

(cherry picked from commit b04da63aad)
 2024-07-12 08:57:11 +00:00
Khushi Rawat
19ed6d1081 fix: added filter to show only submitted assets 
(cherry picked from commit cd3a900495)
 2024-07-09 11:12:01 +00:00
Khushi Rawat
317cc0358c fix: add auto-update for overdue status (#42105) 
* fix: auto-update for overdue status

* chore: use qb.update

(cherry picked from commit c5e474f4f5)
 2024-07-01 11:27:02 +00:00
mergify[bot]
97c49b93b6 fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (backport #41919) (#42058) 
* fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (#41919)

* fix: refactor Asset Repair and Stock Entry linkage to resolve amendment issues

* chore: added missing patch to patches.txt

* chore: fixing previous changes

* chore: fixing minor issues

* fix: code changes to enhance efficiency

* chore: replaced frappe.qb with db.sql because of conflict

* fix: minor changes

(cherry picked from commit ba79e68190)

# Conflicts:
#	erpnext/assets/doctype/asset_repair/asset_repair.json
#	erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#	erpnext/patches.txt
#	erpnext/stock/doctype/stock_entry/stock_entry.json

* chore: fixed conflicts

* fix: removed unmerged patches

* fix: use f-string instead of format call

---------

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2024-07-01 16:53:29 +05:30