nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-24 12:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,004 Commits 607 Branches 1,802 Tags
d05b49b0f8ededce1da1f86fcf6c99db3da3b3db
Commit Graph

7206 Commits

Author SHA1 Message Date
mergify[bot]
6d2c14c75e fix: stock reco qty with inventory dimension (backport #47918) (#47922) 
fix: stock reco qty with inventory dimension (#47918)

(cherry picked from commit 342cebc778)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-06-06 09:51:23 +05:30
mergify[bot]
2e78e14c7e fix: consider expired batches in the stock reco (backport #47909) (#47919) 
fix: consider expired batches in the stock reco (#47909)

(cherry picked from commit 8fa3473945)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-06-05 17:35:23 +05:30
mergify[bot]
996fb7552a fix: key-error for COGS By Item Group report (backport #47914) (#47915) 
fix: key-error for COGS By Item Group report (#47914)

fix: keyerror for COGS By Item Group report
(cherry picked from commit 997ce4eaa7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-06-05 17:18:30 +05:30
mergify[bot]
e5d06f8c86 fix: stock adjustment entry during reposting (backport #47878) (#47883) 
fix: stock adjustment entry during reposting (#47878)

fix: stock adjustment entry
(cherry picked from commit cbcd580daa)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-06-04 12:51:10 +05:30
Mihir Kandoi
b99f8fd021 fix: zero division error in purchase receipt 
(cherry picked from commit 32229fb646)
 2025-06-03 13:09:28 +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
rohitwaghchaure
34b62d226c fix: decimal issue (#47839) 
(cherry picked from commit 0dbd9efc91)
 2025-06-02 07:55:28 +00:00
mergify[bot]
3879cbd86d fix: improved indexing for SLE queries. (backport #47194) (#47822) 
* fix: improved indexing for SLE queries. (#47194)

(cherry picked from commit b49a835b4c)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-30 15:36:51 +05:30
mergify[bot]
9df3b9b059 fix: incorrect actual qty in product bundle balance report (backport #47791) (#47814) 
fix: incorrect actual qty in product bundle balance report (#47791)

(cherry picked from commit c544c3e018)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-30 14:01:32 +05:30
Prateek Karamchandani
ba009f4626 fix: display stock value in currency format in chart warehouse wise stock value 
(cherry picked from commit 7a5cbc759c)
 2025-05-26 05:49:56 +00:00
mergify[bot]
2961e595c2 fix: filter of item for manufacture type material request (backport #47712) (#47717) 
fix: filter of item for manufacture type material request (#47712)

(cherry picked from commit 874750f9ce)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-25 20:51:14 +05:30
mergify[bot]
f41bcc6fec fix: absence of rounding causing discrepancy in the valuation rate calculation (backport #47700) (#47711) 
fix: absence of rounding causing discrepancy in the valuation rate calculation (#47700)

(cherry picked from commit 1e8ed22421)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-24 17:27:20 +05:30
Mihir Kandoi
f3bc80c89d Merge pull request #47678 from frappe/mergify/bp/version-15-hotfix/pr-47658 
fix: exchange rate not being fetched when creating supplier quotation… (backport #47658)
 2025-05-22 14:36:37 +05:30
Mihir Kandoi
2c22615b6b fix: exchange rate not being fetched when creating supplier quotation from MR 
(cherry picked from commit 9d12ae071a)
 2025-05-22 07:26:50 +00:00
Mihir Kandoi
cd1c10a43f fix: include rejected amount in PI/PR overbilling validation logic (#47572) 
* fix: include rejected amount in PI/PR overbilling validation logic

* fix: add check if amount is 0

* fix: unneccessary condition

(cherry picked from commit 8d9888b1b6)
 2025-05-22 07:23:46 +00:00
ljain112
70e190dbbb fix: include only invoices with update_stock = 0 for billed amt in delivery note. 
(cherry picked from commit 6dc459db58)
 2025-05-20 05:31:56 +00:00
Bhavan23
86aa072235 fix: validate inter-company transaction address links 
(cherry picked from commit aed46ad5b9)
 2025-05-19 07:39:50 +00:00
mergify[bot]
72ae80e2e3 fix: incorrect qty during reset (backport #47593) (#47595) 
fix: incorrect qty during reset (#47593)

(cherry picked from commit a058fe7319)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-19 12:02:29 +05:30
mergify[bot]
f225e1986e fix: validation message format (backport #47542) (#47549) 
fix: validation message format (#47542)

(cherry picked from commit a18e1cffa7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-15 10:31:28 +05:30
marination
9cede83de1 fix: Conflicts 2025-05-13 14:26:54 +02:00
Bernd Oliver Sünderhauf
cf45ffdabe refactor: Consolidate duplicate zero-quantity transaction Items checks. 
(cherry picked from commit 4918aeb4c6)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2025-05-13 12:13:47 +00:00
Bernd Oliver Sünderhauf
e91a0acbb3 test: Add, expand and refine test-cases for zero-quantity transactions. 
(cherry picked from commit b2d8a44199)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2025-05-13 12:13:46 +00:00
mergify[bot]
b6bf13ff02 refactor: available serial no report (backport #47333) (#47500) 
* refactor: available serial no report

(cherry picked from commit 74eb611563)

* chore: further optimizations

(cherry picked from commit 653e0a2e3a)

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-12 23:29:51 +05:30
mergify[bot]
309ea7b9cf fix: added PR/PI overbilling validation (backport #47385) (#47497) 
* fix: added PR/PI overbilling validation

(cherry picked from commit f4ffc57b51)

* test: added test

(cherry picked from commit b406ec724b)

* fix: linter error

(cherry picked from commit 27e842ba02)

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-11 14:31:46 +05:30
rohitwaghchaure
3ba7bb3ab7 Merge pull request #47454 from frappe/mergify/bp/version-15-hotfix/pr-47452 
fix: warning message for COGS account in the stock entry (backport #47452)
 2025-05-08 13:58:08 +05:30
Rohit Waghchaure
7ba7d1a2a4 fix: error while making SABB for backdated stock reco 
(cherry picked from commit ad25636afb)
 2025-05-07 15:49:10 +00:00
Rohit Waghchaure
7abe199e2a fix: warning message for COGS account in the stock entry 
(cherry picked from commit bba6b0ff45)
 2025-05-07 10:50:21 +00:00
mergify[bot]
09e7bfbacb perf: Skip link checking on repost's remove_attached_file (backport #45061) (#47450) 
perf: Skip link checking on repost's remove_attached_file (#45061)

This is internal detail, doesn't need to do horrible link checks in
framework.

(cherry picked from commit 4f690affc9)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2025-05-07 14:04:12 +05:30
Rohit Waghchaure
2bd30e3c46 fix: stock reco recalculate qty not works for opening stock reco 
(cherry picked from commit 97095c7d24)
 2025-05-06 12:57:56 +00:00
Rohit Waghchaure
b6908a79bd fix: precision issue 
(cherry picked from commit 69bee93bfd)
 2025-05-06 11:59:50 +00:00
mergify[bot]
f4551bb918 feat!: configure which rate is used to auto-update price list (backport #47417) 
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
 2025-05-06 17:00:03 +05:30
Rohit Waghchaure
f4a43d07b0 fix: validation for difference account 
(cherry picked from commit fb819c558e)
 2025-05-03 07:52:58 +00:00
mergify[bot]
1ef7da837f fix: completed transactions showing in the list (backport #47374) (#47379) 
fix: completed transactions showing in the list (#47374)

(cherry picked from commit 97db9da10e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-02 15:28:45 +05:30
mergify[bot]
4ef2b77973 fix: warning message before changing the valuation method (backport #47340) (#47342) 
fix: warning message before changing the valuation method (#47340)

(cherry picked from commit ffdc4347e8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-04-30 08:45:39 +05:30
mergify[bot]
0056fb1d0f fix: require email OR phone in shipment doctype not both (backport #47300) (#47330) 
fix: require email OR phone in shipment doctype not both (#47300)

(cherry picked from commit fc02a6510e)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-04-29 16:27:56 +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
mergify[bot]
b0399fe948 fix: QI reference not set if 'Action If Quality Inspection Is Not Sub… (backport #47294) (#47295) 
fix: QI reference not set if 'Action If Quality Inspection Is Not Sub… (#47294)

fix: qi reference not set if 'Action If Quality Inspection Is Not Submitted' is blank
(cherry picked from commit 0701a8cf5a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-04-28 22:01:57 +05:30
mergify[bot]
91bcefef8c fix: validation if no stock ledger entries against stock reco (backport #47292) (#47293) 
fix: validation if no stock ledger entries against stock reco (#47292)

(cherry picked from commit 3d36d0b1df)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-04-28 19:38:27 +05:30
ruthra kumar
1cbcf7532c Merge pull request #47281 from frappe/mergify/bp/version-15-hotfix/pr-46993 
feat: add dispatch address fields to purchase doctypes (backport #46993)
 2025-04-28 14:47:02 +05:30
mergify[bot]
2e6112f21b fix: update quantity validation using asset quantity field instead of… (backport #46731) (#47284) 
* fix: update quantity validation using asset quantity field instead of… (#46731)

* fix: update quantity validation using asset quantity field instead of total records

* fix: update throw message

(cherry picked from commit eae08bc619)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py

* chore: resolved conflicts

---------

Co-authored-by: l0gesh29 <logeshperiyasamy24@gmail.com>
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2025-04-28 14:18:51 +05:30
Smit Vora
d8c0e7156e fix: map dispatch address correctly for inter company transactions 
(cherry picked from commit ceaba4220b)
 2025-04-28 05:28:20 +00:00
Smit Vora
62261a276f refactor: address field position 
(cherry picked from commit 8ccd7a3e61)

# Conflicts:
#	erpnext/public/scss/erpnext.scss
 2025-04-28 05:28:20 +00:00
Karm Soni
5f101e7635 feat: add dispatch address fields to purchase doctypes 
(cherry picked from commit 54b5205221)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
 2025-04-28 05:28:18 +00:00
Rohit Waghchaure
925cc40efa fix: enable use serial / batch fields on batch selection 
(cherry picked from commit a4471865a9)
 2025-04-27 13:06:21 +00:00
Rohit Waghchaure
b2294ed6e3 fix: allow to change valuation method from FIFO to Moving Average 
(cherry picked from commit b454ed4b8f)
 2025-04-27 12:16:36 +00:00
marination
727c32d789 fix: Re-insert missing "Serial No Warranty Expiry" Report 
(cherry picked from commit deefac0abf)
 2025-04-25 09:28:36 +00:00
Sugesh393
2b05ccfa6f test: add new unit test to keep per_billed 100 for billed delivery note 
(cherry picked from commit fe5898a151)
 2025-04-22 11:42:12 +00:00
ruthra kumar
e2f8ca5f87 chore: resolve conflict 2025-04-22 16:46:57 +05:30
Mihir Kandoi
a09ab902e5 fix: revert unintended changes 
(cherry picked from commit eaaf34cda6)

# Conflicts:
#	erpnext/stock/doctype/material_request/material_request.json
 2025-04-22 10:46:37 +00:00