nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-18 17:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,714 Commits 606 Branches 1,802 Tags
27081bceca1ecc71c3b2564cb928485576fd2d34
Commit Graph

343 Commits

Author SHA1 Message Date
mergify[bot]
6d3cd7d38a Revert "fix: debit credit not equal in purchase transactions for mult… (backport #54906) (#54907) 
* Revert "fix: debit credit not equal in purchase transactions for mult… (#54906)

* Revert "fix: debit credit not equal in purchase transactions for multi currency"

This reverts commit 75bcea57f4.

* Revert "test: add test case"

This reverts commit 1d30a202c3.

* Revert "fix: include rejected qty in tax (purchase receipt)"

This reverts commit 8c9a88abbe.

(cherry picked from commit cf5e8ce878)

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

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-13 09:58:45 +00:00
mergify[bot]
78b2e45cb9 fix: debit credit not equal in purchase transactions for multi currency (backport #54456) (#54563) 
fix: debit credit not equal in purchase transactions for multi currency (#54456)

(cherry picked from commit 601581d6f8)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-04-27 15:14:58 +00:00
mergify[bot]
3fbfad1b9b fix: include rejected qty in tax (purchase receipt) (backport #53624) (#53971) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: include rejected qty in tax (purchase receipt) (#53624)
 2026-03-31 16:15:42 +00:00
ljain112
b80e10e15e chore: resolve conflicts 2026-03-30 20:22:30 +05:30
ljain112
25852879f6 fix: correct item valuation when "Deduct" is used in Purchase Invoice and Receipt. 
(cherry picked from commit e68f149d3a)

# Conflicts:
#	erpnext/controllers/buying_controller.py
 2026-03-30 14:24:21 +00:00
Rohit Waghchaure
f2a77d178d fix: cancel SABB if SLE cancelled from LCV 
(cherry picked from commit f23a49a25e)
 2026-02-16 15:42:04 +00:00
ljain112
25f5fb7637 fix: automatically append taxes if taxes_and_charges is set in Buying controller 
(cherry picked from commit d171dc7328)
 2025-11-11 09:34:16 +00:00
khushi8112
d8eddbfd03 fix: set status to Draft for auto-created assets from Purchase Receipt 
(cherry picked from commit 20c2cb40d1)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
#	erpnext/patches.txt
 2025-10-23 13:03:17 +00:00
rohitwaghchaure
c2140625f5 chore: fixed test case 2025-07-23 08:27:33 +05:30
rohitwaghchaure
4453e447dc chore: fix conflicts 2025-07-22 09:57:07 +05:30
Rohit Waghchaure
d378e51492 fix: valuation for rejected materials 
(cherry picked from commit b7039cc506)

# Conflicts:
#	erpnext/controllers/buying_controller.py
 2025-07-22 04:18:22 +00:00
Rohit Waghchaure
3e53660bba fix: precision issue for Sales Incoming Rate 
(cherry picked from commit 7b99275ceb)
 2025-07-17 10:05:43 +00:00
rohitwaghchaure
5bac652b5f fix: GL entries for rejected returned materials (#47612) 
(cherry picked from commit 3e098da01f)
 2025-06-03 10:57:14 +00:00
mergify[bot]
3582b32f03 feat: allow to set valuation rate for Rejected Materials (backport #47582) (#47869) 
feat: allow to set valuation rate for Rejected Materials (#47582)

(cherry picked from commit ca0e53dd78)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-06-03 16:25:53 +05:30
mergify[bot]
60dfe36195 fix: create Quality Inspection button not showing (backport #47746) (#47750) 
fix: create Quality Inspection button not showing (#47746)

(cherry picked from commit d8cb073eaf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-27 13:06:32 +05:30
Mihir Kandoi
9495a2ac9d feat: change sabb qty automatically incase of internal transfer PR if sabb only has 1 batch (#47256) 
* feat: change sabb qty automatically incase of internal transfer PR if sabb only has 1 batch

* fix: prevent creation of SABB on every save

* perf: optimize code

* fix: remove unnecessary conditon

* refactor: change if to elif

* fix: remove dn_item_qty and set to item.qty

* test: added test

(cherry picked from commit 47927b38a9)
 2025-04-29 06:17:04 +00:00
Karm Soni
1fe1563dab feat: add dispatch address support in party details and controllers 
(cherry picked from commit 53d0b7be23)
 2025-04-28 05:28:18 +00:00
Mihir Kandoi
fdaf5fafda fix: set landed cost based on purchase invoice rate 
(cherry picked from commit 17d415b105)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
#	erpnext/patches.txt
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 2025-03-05 09:02:34 +00:00
mergify[bot]
830edb8f52 fix: auto create asset due to message error (backport #45934) (#45952) 
fix: auto create asset due to message error (#45934)

* fix: auto create asset due to message error

* fix: linters

(cherry picked from commit 6f1bc5225a)

Co-authored-by: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com>
 2025-02-19 15:43:53 +05:30
Khushi Rawat
b8922823a3 fix: remove unused variable 2024-12-31 12:55:41 +05:30
Khushi Rawat
00ae829d89 fix: resolved conflicts 2024-12-31 12:43:38 +05:30
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
Ninad1306
05795af471 fix: always set sales incoming rate for internal transfers 
(cherry picked from commit d049c97884)
 2024-12-03 08:48:51 +00:00
mergify[bot]
ee2c8c869a fix: last purchase rate for purchase invoice (backport #43448) (#43452) 
* fix: last purchase rate for purchase invoice

(cherry picked from commit fb9d106633)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

* chore: fix conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-10-01 12:54:26 +05:30
Khushi Rawat
1121c6663f fix: link Purchase Invoice and Receipt Items to Asset 2024-09-05 14:31:05 +05:30
mergify[bot]
2203ea9301 fix: last purchase rate not updated from purchase invoice (backport #42847) (#42853) 
fix: last purchase rate not updated from purchase invoice (#42847)

(cherry picked from commit 5b9309cf34)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-21 15:20:50 +05:30
Ninad Parikh
6e833cce6a fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled (#42050) 
* fix: update rate for internal transfers only if settings enabled

* fix: better naming

* fix: create field for storing incoming rate in purchase doctypes

* fix: use qty instead of qty_in_stock_uom

* fix: add description, refactor for readablility

* test: test case to validate internal transfers at arm's length price

* fix: minor fix

* fix: deletion of code not required

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
(cherry picked from commit 723ac0ffc4)
 2024-07-26 12:58:12 +00:00
mergify[bot]
cf2651dd85 fix: not able to cancel the inter transfer DN (backport #42333) (#42340) 
fix: not able to cancel the inter transfer DN (#42333)

(cherry picked from commit 6d42cd0f4c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-15 16:52:28 +05:30
mergify[bot]
c27f272f06 perf: code optimization to handle large asset creation (backport #42018) (#42025) 
perf: code optimization to handle large asset creation (#42018)

(cherry picked from commit 5738d93f95)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2024-06-26 16:51:07 +05:30
ljain112
5ea2cdcaad fix: regional overide for updating item valution 
(cherry picked from commit 1a10f0bcbd)
 2024-06-13 08:09:51 +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
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
mergify[bot]
61d59b392a fix: serial and batch for internal transfer (backport #40467) (#40477) 
fix: serial and batch for internal transfer (#40467)

* fix: serial and batch for internal transfer

* chore: fix test cases

(cherry picked from commit 59222813af)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-15 18:19:56 +05:30
mergify[bot]
e0e80f7eed fix: not able to cancel purchase receipt for old subcontracting flow (backport #40298) (#40302) 
fix: not able to cancel purchase receipt for old subcontracting flow (#40298)

(cherry picked from commit 48da952fd7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-06 13:16:57 +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
mergify[bot]
a548f12941 fix: landed cost voucher not submitting because of incorrect reference (backport #39898) (#39900) 
fix: landed cost voucher not submitting because of incorrect reference (#39898)

(cherry picked from commit 6239fd704b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-14 15:57:40 +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
mergify[bot]
02ceee6669 fix: not able to make inter-company po from so (backport #38826) (backport #38828) (#38833) 
fix: not able to make inter-company po from so (backport #38826) (#38828)

fix: not able to make inter-company po from so (#38826)

(cherry picked from commit 23042dfc3c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 32a608f948)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-12-18 18:31:28 +05:30
mergify[bot]
c797c533ed fix: validation error has not throw for the batch (backport #38494) (#38502) 
fix: validation error has not throw for the batch (#38494)

* fix: validation error has not throw for the batch

* chore: fix test cases

(cherry picked from commit 5e9016ffab)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-01 21:46:35 +05:30
mergify[bot]
f6c48e8ecf fix: AttributeError while saving Purchase Invoice (backport #38482) (#38490) 
fix: `AttributeError` while saving Purchase Invoice

(cherry picked from commit 60a81a563e)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-01 14:10:31 +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
mergify[bot]
4fdd1ec498 chore: delete comments and unlink attachments on company transactions deletion (backport #38077) (#38079) 
* chore: delete comments and unlink attachments on company transactions deletion

(cherry picked from commit 2f9e96e324)

* fix: unrelated transation date typo

(cherry picked from commit b097bb20d9)

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-11-13 19:17:00 +05:30
mergify[bot]
e156564ea4 fix: don't reset rate if greater than zero in standalone debit note (backport #37935) (#37941) 
* fix: don't reset rate if greater than zero in standalone debit note

(cherry picked from commit 5cce522ecd)

* fix(test): `test_gl_entries_for_standalone_debit_note`

(cherry picked from commit f9fc6c9c9d)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 19:27:42 +05:30
mergify[bot]
be8399f52e fix: permission error while creating Supplier Quotation from Portal (backport #37864) (#37871) 
fix: permission error while creating Supplier Quotation from Portal

(cherry picked from commit e019d43d0b)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-03 16:21:20 +05:30
rohitwaghchaure
dd4769ecf1 feat: allow to edit Stock Quantity in the Sales and Purchase Transactions (#36600) 
feat: allow to edit Stock Quantity in the Sales and Purchase transactions
 2023-09-20 18:09:03 +05:30
ruthra kumar
097b9892dc fix: asset validation misfire on debit notes 2023-09-15 17:54:20 +05:30
s-aga-r
a33b75f2cd feat: allow manually entry for scrap items in SCR 2023-08-24 16:37:57 +05:30
Anand Baburajan
8f04945cef fix: incorrect schedule in asset value adjustment (#36747) 2023-08-22 12:36:09 +05:30
Rohit Waghchaure
d618aaef32 fix: accepted warehouse and rejected warehouse can't be same 2023-07-10 13:19:17 +05:30
mergify[bot]
50f83859db fix: consider field precision while setting sle actual_qty (backport #35717) (#35720) 
* fix: consider field precision while setting sle actual_qty (#35717)

(cherry picked from commit 3f62e854e5)

# Conflicts:
#	erpnext/controllers/buying_controller.py

* chore: `conflicts`

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-06-15 20:18:17 +05:30