nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,082 Commits 459 Branches 1,746 Tags
ca2b361a3e4c36731676e4b1063ad6fe50f94336
Commit Graph

2859 Commits

Author SHA1 Message Date
Sudharsanan11
2263f9a477 test(accounts): add validation test for dispatch address with drop ship enabled 
(cherry picked from commit f6a96e5563)
 2025-12-12 08:05:59 +00:00
Sudharsanan11
b340d7d4f4 fix(accounts): handle drop ship in company linked address validation 
(cherry picked from commit 2ec119e561)
 2025-12-12 08:05:58 +00:00
Sagar Vora
5bfdc010f3 fix: re-calculate outstanding / write-off amount during submission 
(cherry picked from commit 09c9ac1b66)
 2025-12-11 17:35:25 +00:00
Sagar Vora
2d198e698a fix: ensure fresh grand_total_diff is used for each calculation 
(cherry picked from commit b3fdef8d19)
 2025-12-11 12:35:29 +00:00
Diptanil Saha
9ccf4900fe chore: resolve conflict 2025-12-09 20:52:33 +05:30
ravibharathi656
bf1c606610 fix: include return invoice discount in discount validation 
(cherry picked from commit fab1ef5d76)

# Conflicts:
#	erpnext/controllers/taxes_and_totals.py
 2025-12-09 15:18:08 +00:00
Pugazhendhi Velu
ebb62966d3 fix: add return status for delivery note 
(cherry picked from commit dec67eecad)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py
 2025-12-09 13:06:51 +00:00
Diptanil Saha
3eaccfe201 Merge pull request #50873 from frappe/mergify/bp/version-15-hotfix/pr-50773 
fix: add validation for cancelled reposting entries (backport #50773)
 2025-12-02 21:15:56 +05:30
Pugazhendhi Velu
ef6f2389a0 test: add minimal test case 
(cherry picked from commit e64b6db2eb)
 2025-12-02 14:45:03 +00:00
Pugazhendhi Velu
1d4b97c619 test: add test for company linked address fields 
(cherry picked from commit e10007c646)
 2025-12-02 14:45:02 +00:00
Pugazhendhi Velu
0aed8c04c6 fix: add validation for company linked address fields 
(cherry picked from commit 800a44a65f)
 2025-12-02 14:45:02 +00:00
l0gesh29
085d685488 fix: add validation for cancelled reposting entries 
(cherry picked from commit d8fc369e38)
 2025-12-02 11:47:36 +00:00
Rohit Waghchaure
5def006033 fix: negative batch in subcontracting receipt 
(cherry picked from commit 71e46b3ef5)
 2025-12-01 06:15:37 +00:00
mergify[bot]
ff1ca9d480 fix: incorrect positional param for get_field_precision util (backport #50764) (#50795) 2025-11-28 08:50:03 +00:00
mergify[bot]
1995291194 fix: add validation for FG Items as per BOM qty (backport #50579) (#50715) 
Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
Co-authored-by: Kavin <78342682+kavin-114@users.noreply.github.com>
fix: add validation for FG Items as per BOM qty (#50579)
 2025-11-24 11:18:18 +00:00
Pugazhendhi Velu
8ccb9a5ad2 fix: add return status for purchase receipt 
(cherry picked from commit 3a0e1e8ef9)
 2025-11-18 12:33:18 +00:00
mergify[bot]
f8294f1754 feat(Company): allow setting default sales contact, fetch into sales transaction (backport #50159) (#50599) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-11-18 17:05:58 +05:30
ljain112
f0eac47037 fix: add doctype parameter to lead details for correct company details 
(cherry picked from commit 0b91338771)
 2025-11-17 13:39:09 +00:00
ruthra kumar
0c4295fb6f Merge pull request #50472 from frappe/mergify/bp/version-15-hotfix/pr-50469 
fix: automatically append taxes if taxes_and_charges is set in Buying controller (backport #50469)
 2025-11-11 15:57:52 +05:30
Sagar Vora
313e6af528 chore: resolve conflicts 2025-11-11 15:11:52 +05:30
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
Sagar Vora
22848eb4da chore: remove unused import 
(cherry picked from commit 81ab15351e)

# Conflicts:
#	erpnext/controllers/taxes_and_totals.py
 2025-11-11 09:32:59 +00:00
Sagar Vora
b4df87e545 refactor: simplify logic 
(cherry picked from commit 95f604457d)
 2025-11-11 09:32:56 +00:00
Sagar Vora
9ed40cc17d fix: handle returns as well 
(cherry picked from commit 0e026b9ccd)
 2025-11-11 09:32:56 +00:00
Sagar Vora
22b6760164 test: some tests to ensure correct discount mapping 
(cherry picked from commit 0968f435d2)
 2025-11-11 09:32:56 +00:00
Sagar Vora
e559fafa83 fix: validate that discount amount cannot exceed total before discount 
(cherry picked from commit f4f79d99e4)

# Conflicts:
#	erpnext/controllers/taxes_and_totals.py
 2025-11-11 09:32:56 +00:00
Sagar Vora
44539f0944 fix: ensure that additional discount amount is not mapped repeatedly 
(cherry picked from commit feb62102d9)
 2025-11-11 09:32:55 +00:00
diptanilsaha
7e3f30baad fix: trends report total mismatch with group filters 
(cherry picked from commit f7d09f8760)
 2025-11-07 07:03:51 +00:00
mergify[bot]
ac901dee3c Add support for subcontract return from rejected warehouse (backport #50299) (#50330) 
* Merge pull request #50299 from saadchaudharry/feature-subcontract-return-rejected

Add support for subcontract return from rejected warehouse

(cherry picked from commit 8854db51dd)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

* chore: resolve conflicts

---------

Co-authored-by: Saad Chaudhary <47004596+saadchaudharry@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-11-04 09:09:41 +00:00
Kerolles Fathy
5d4da9c68f fix: Respect allowed zero qty in SO and PO based on Buying/Selling settings when update items (#49673) 
* fix: respect allowed zero qty in SO and PO based on buying/selling settings

* refactor: remove parent_doctype param due to it's already avaliable

* refactor: rename is_allowed_zero_qty_for to is_allowed_zero_qty

* fix: prevent rate change for unit price items

* fix: unboundlocal variable rate_unchanged

* refactor: only throw on 'zero' qty items

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 44363c069e)
 2025-11-03 09:47:30 +00:00
Diptanil Saha
b04c06e034 chore: resolve conflict 2025-11-03 13:22:33 +05:30
diptanilsaha
4076798707 fix(accounts): populate correct fields on GL Entry during discount accounting 
(cherry picked from commit e41a7b8cd7)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2025-11-03 07:49:36 +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
mergify[bot]
43941ecd5e refactor: simplify expression (backport #50168) (#50170) 
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2025-10-19 23:59:27 +02:00
Rohit Waghchaure
d67a439051 fix: internal transfer entry with serial/batch 
(cherry picked from commit 9b4e62a758)
 2025-10-17 15:34:30 +00:00
Kavin
c64dcf3423 fix: preview stock ledger for manual serial and batch values 
(cherry picked from commit c5f68d0b27)
 2025-10-15 05:47:41 +00:00
Rohit Waghchaure
2184a28e91 fix: reset raw materials considering not available batches 
(cherry picked from commit ec1636db12)
 2025-10-14 07:19:43 +00:00
Rohit Waghchaure
6ba55bbee0 test: test case for sales return for product bundle 
(cherry picked from commit 1d57bbca11)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2025-10-09 09:40:27 +00:00
Rohit Waghchaure
ac46b3d1ca fix: sales return for product bundle items 
(cherry picked from commit 13ce7279a8)
 2025-10-09 09:40:26 +00:00
Rohit Waghchaure
81ed32ff51 fix: Reset Raw Materials Table button not working 
(cherry picked from commit 128e243945)
 2025-10-08 17:05:21 +00:00
mergify[bot]
baa6d2bcdc feat: dynamic due date in payment terms when fetched from order (backport #48864) (#49938) 
* feat: dynamic due date in payment terms when fetched from order (#48864)

* fix: dynamic due date when payment terms are fetched from order

* fix(test): use change_settings decorator for settings enable and disable

* fix(test): compare schedule for due_date dynamically

* fix: save conditions for due date at invoice level

* fix: make fields read only and on change of date unset the date condition fields

* fix: remove fetch_form

* fix: correct field assingment

* fix: revert unwanted changes

* refactor: streamline payment term field assignments and enhance discount date handling

* refactor: remove payment_term from fields_to_copy and optimize currency handling in transaction callback

* refactor: ensure default values for payment schedule and discount validity fields

(cherry picked from commit 3c70cbbaf8)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* chore: resolve conflicts

---------

Co-authored-by: Lakshit Jain <ljain112@gmail.com>
 2025-10-07 14:10:15 +05:30
Fawaz Alhafiz
d950de2d09 fix: SQL operator precedence in Project query customer filter 
Added explicit parentheses around customer OR conditions in get_project_name()
to ensure proper grouping with AND filters. Without these parentheses, SQL
operator precedence caused the status filter to be bypassed when a customer
filter was applied, resulting in completed and cancelled projects appearing
in link field dropdowns.

Before:
WHERE customer='X' OR customer IS NULL OR customer='' AND status NOT IN (...)
was interpreted as:
WHERE customer='X' OR customer IS NULL OR (customer='' AND status NOT IN (...))

After:
WHERE (customer='X' OR customer IS NULL OR customer='') AND status NOT IN (...)

Fixes: Completed/cancelled projects showing in Project link fields
Affected: Any doctype using Project link fields with customer filters
(cherry picked from commit 0ec30a1cea)
 2025-10-06 07:34:55 +00:00
Nabin Hait
bd3503a3d8 fix: Set paid amount automatically only if return entry validated and has negative grand total (#49829) 
(cherry picked from commit dcbcc596f2)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2025-10-06 05:58:29 +00:00
Kavin
c88a277ad9 fix: don't recalculate stock_qty with conversion_factor 
(cherry picked from commit fed8236919)
 2025-09-30 11:03:47 +00:00
Rohit Waghchaure
ba9b63af49 feat: service expense account in the subcontracting receipt 
(cherry picked from commit 6e597b9c42)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 2025-09-26 15:44:26 +00:00
rohitwaghchaure
62959e5a70 chore: fix conflicts 2025-09-26 11:21:16 +05:30
Rohit Waghchaure
6c8e8384d5 fix: auto batch not set for raw materials in subcontracting receipt 
(cherry picked from commit 23f9d4c600)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py
 2025-09-26 05:07:12 +00:00
Rohit Waghchaure
921f317423 fix: batch qty calculation performance issue 
(cherry picked from commit 1a262483a4)
 2025-09-07 11:20:42 +00:00
Kavin
1c7a18866f Merge pull request #49183 from aerele/fix/mr-status-from-wo 
Fix/mr status from wo

(cherry picked from commit 67e57018bc)
 2025-08-20 09:43:11 +00:00
diptanilsaha
4a0d7fd205 fix: use query builder instead of raw SQL in get_blanket_orders 
(cherry picked from commit 1db135262d)
 2025-08-19 05:25:18 +00:00