nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-21 18:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,060 Commits 605 Branches 1,802 Tags
98bc7b41fca732b6833e24cfa80165f5b7d351a0
Commit Graph

2815 Commits

Author SHA1 Message Date
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
diptanilsaha
c9f79b3ba9 fix: formatted string for disabled filter in get_income_account 
(cherry picked from commit 6320f7290f)
 2025-08-19 05:25:17 +00:00
Rohit Waghchaure
e4398d3761 fix: additional cost not consider in valuation rate for Stock Entry transfer 
(cherry picked from commit bbc772abe7)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2025-08-17 05:22:52 +00:00
Logesh Periyasamy
6e7fb2ea01 Merge pull request #48761 from aerele/exchange-gain-or-loss-on-repost 
fix: prevent gain or loss entry cancellation upon reposting
(cherry picked from commit a8d17b7590)
 2025-08-12 16:47:07 +05:30
mithili
0d47eb1fa0 fix: add condition to fetch active accounts 
(cherry picked from commit 7c8dd86a35)
 2025-08-08 05:25:04 +00:00
mithili
b060cdb4f5 fix(purchase invoice): filter only enabled account 
(cherry picked from commit c3111db6e2)
 2025-08-08 05:25:04 +00:00
Rohit Waghchaure
a96fa55704 perf: process_gl_map causing performance issues in the reposting 2025-08-02 18:44:32 +05:30
mergify[bot]
cb0addc122 fix: multiple fixes for advance payment accounting (backport #48341) (#48896) 
* fix: multiple fixes for advance payment accounting

(cherry picked from commit e70caedddc)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
#	erpnext/accounts/utils.py
#	erpnext/controllers/accounts_controller.py
#	erpnext/patches/v15_0/create_advance_payment_ledger_records.py

* chore: resolve conflicts

* fix: do not execute patch if no advance doctypes

---------

Co-authored-by: Lakshit Jain <108322669+ljain112@users.noreply.github.com>
Co-authored-by: ljain112 <ljain112@gmail.com>
 2025-08-01 15:30:30 +05:30
Mihir Kandoi
1efdff0ad1 fix: over billed purchase receipt status 
(cherry picked from commit 15e354f76e)
 2025-07-29 06:02:50 +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
Diptanil Saha
6b96a26462 Merge pull request #48614 from diptanilsaha/backport_48411 
fix: employee search based on the fields mentioned in the employee doctype search fields (backport #48411)
 2025-07-15 18:51:51 +05:30
Rohit Waghchaure
467fe1d72f fix: added serial no condition 
(cherry picked from commit bb7ddd11f1)
 2025-07-15 12:35:27 +00:00
rohitwaghchaure
9070c4302d Merge pull request #48598 from frappe/mergify/bp/version-15-hotfix/pr-48595 
fix: system was allowing credit notes with serial numbers for any customer (backport #48595)
 2025-07-15 16:35:29 +05:30
ljain112
78df52606f fix: handle cases where distributed discount amount is not set 
(cherry picked from commit 816b84be02)
 2025-07-15 09:38:01 +00:00
Rohit Waghchaure
4b6444e93b fix: system was allowing credit notes with serial numbers for any customer 
(cherry picked from commit e073075834)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py
#	erpnext/stock/doctype/serial_no/serial_no.json
 2025-07-15 09:28:35 +00:00
Mihir Kandoi
9aef3058a6 perf: optimize code for subcontracting 
(cherry picked from commit bc6f69ad54)
 2025-07-15 08:45:36 +00:00
Mihir Kandoi
5fce8191f9 fix: no attribute error in old subcontracting flow 
(cherry picked from commit 51751a7a05)
 2025-07-10 17:33:10 +00:00
pugazhendhivelu
65c277fd27 fix: update item reference in quality inspection 
(cherry picked from commit 9da5010265)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2025-07-08 17:16:50 +05:30
mergify[bot]
500972e8aa refactor: remove do_reposting_for_each_stock_transaction feature (backport #48444) (#48452) 
* refactor: remove do_reposting_for_each_stock_transaction feature

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-07-08 15:05:35 +05:30
ruthra kumar
9e831bbfc6 Merge pull request #48448 from frappe/mergify/bp/version-15-hotfix/pr-48326 
fix: cost center for payment entry against advance payment doctypes in accounts payable/rece (backport #48326)
 2025-07-08 14:06:28 +05:30
ljain112
00669661e5 chore: resolve conflicts 2025-07-08 13:19:03 +05:30
l0gesh29
a10e3948b2 fix: add selling price validation on update item 
(cherry picked from commit 327d067305)
 2025-07-08 06:45:18 +00:00
ljain112
82d03e2617 refactor: function to fetch advance payment doctypes 
(cherry picked from commit 48e8e85617)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.py
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/accounts/doctype/payment_request/payment_request.py
#	erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py
#	erpnext/accounts/utils.py
#	erpnext/controllers/accounts_controller.py
 2025-07-08 06:36:06 +00:00
Mihir Kandoi
4545213adc fix: valuation rate of raw materials in subcontracting receipt 
(cherry picked from commit 84ea6afd01)
 2025-07-08 06:28:44 +00:00
Abdallah A. Zaqout
f479675ce6 chore: fix translation message 
(cherry picked from commit bc002937ad)
 2025-06-30 05:34:05 +00:00
Rohit Waghchaure
0e2bca4b34 fix: not able to save material request 
(cherry picked from commit c5e36eb323)
 2025-06-27 10:55:48 +00:00
mergify[bot]
8f47505604 fix: better integration of Pick List with Delivery Note (backport #47831) (#48158) 
* fix: better integration of Pick List with Delivery Note (#47831)

Co-authored-by: priyanshshah2442 <priyanshshah2442@gmail.com>
(cherry picked from commit 527cfe9c7d)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#	erpnext/stock/doctype/pick_list/pick_list.py
#	erpnext/stock/doctype/pick_list_item/pick_list_item.json

* chore: resolve conflicts

* fix: setting status correctly as per v15 utility

* fix: get items from Pick List to DN even if not linked to Sales Order

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
Co-authored-by: Priyansh Shah <108476017+priyanshshah2442@users.noreply.github.com>
 2025-06-26 18:25:53 +05:30
ruthra kumar
3a6956ba05 Merge pull request #48230 from frappe/mergify/bp/version-15-hotfix/pr-47627 
fix: auto append_taxes_from_item_tax_template in backend (backport #47627)
 2025-06-24 17:38:14 +05:30
ruthra kumar
1deadb8daa Merge pull request #48236 from frappe/mergify/bp/version-15-hotfix/pr-48226 
Trends reports (backport #48226)
 2025-06-24 17:36:44 +05:30
Karuppasamy923
24f892d582 fix: Update indexing to populate correct values in trends report chart 
(cherry picked from commit b08d66113c)
 2025-06-24 10:18:44 +00:00
Karuppasamy923
651b9521b9 fix: Update transaction currency to company currency to show correct currency symbol 
(cherry picked from commit b0e201a332)
 2025-06-24 10:18:44 +00:00
Lakshit Jain
c2c5e45bc6 fix: get already billed amount from current doc instead of database (#48079) 
* fix: get already billed amount from current doc instead of database

* fix: throw overbilling validation for all items in single call

* refactor: minor fixes

---------

Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
(cherry picked from commit 47c3c4808e)
 2025-06-24 10:11:43 +00:00
ljain112
1ccdb67c55 chore: resolve conflicts 2025-06-24 15:31:34 +05:30
ljain112
2bf8dffb60 fix: auto append_taxes_from_item_tax_template in backend 
(cherry picked from commit 4cb1fa2b6b)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
#	erpnext/controllers/tests/test_accounts_controller.py
 2025-06-24 09:48:21 +00:00
Rohit Waghchaure
ad40bfe4ea fix: incoming rate for the stand-alone credit note 
(cherry picked from commit b06eca8dcb)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2025-06-23 15:40:49 +00:00
Karuppasamy923
ceab26d5f1 fix: add party and party_name columns to trend reports 
(cherry picked from commit d05204a960)
 2025-06-23 10:12:18 +00:00
Rohit Waghchaure
b3d337a45b fix: SABB validation during the LCV 
(cherry picked from commit e958f886d3)
 2025-06-20 15:55:02 +00:00
Rohit Waghchaure
4e70005937 fix: target inventory dimension for stock entry 
(cherry picked from commit d65cb56d66)
 2025-06-19 14:24:39 +00:00
Rohit Waghchaure
994454bfc3 fix: batch page length 
(cherry picked from commit 338256b799)
 2025-06-11 14:33:13 +00:00
DHINESH00
eaeb18c651 fix: update currency based on transaction 
(cherry picked from commit fc4f38eed1)
 2025-06-10 08:56:37 +00:00
ravibharathi656
9a47c507c0 feat: add validation for inter company transactions 2025-06-09 19:12:51 +05:30
Sagar Vora
5a5449c60c Revert "fix: calculate discount percentage if discount amount is specified (#…" 
This reverts commit bb474f4f42.

(cherry picked from commit 27dc0f5b70)
 2025-06-06 06:07:15 +00:00