nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-28 22:28:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,272 Commits 619 Branches 1,804 Tags
d62985d9a76ca474b138a71b97cd9a98d342b7e1
Commit Graph

3069 Commits

Author SHA1 Message Date
Rohit Waghchaure
7c78aa6e5d fix: converted whitelist non class methods to class methods 2026-06-12 19:37:41 +05:30
Rohit Waghchaure
f4e6f14342 fix: multiple issues related to BOM Creator 2026-06-12 19:01:56 +05:30
mergify[bot]
09453f883b fix: remove item name from update items dialog item code column (backport #55718) (#55722) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
Co-authored-by: Abdullah <frappe@LAPTOP-4E788RM4.localdomain>
fix: remove item name from update items dialog item code column (#55718)
 2026-06-08 15:42:09 +05:30
mergify[bot]
ccbca57420 perf(transaction): exit early before backend query (backport #55556) (#55557) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-06-02 21:41:47 +02:00
rohitwaghchaure
897722c35f chore: fixed conflicts 2026-06-01 22:14:46 +05:30
Sudharsanan11
42e2fd5fc9 fix(stock): add warning message to notify the user to configure the inspection 
(cherry picked from commit e003fe4de0)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2026-06-01 16:13:51 +00:00
Sudharsanan11
10664b7b95 fix(stock): allow to create quality inspection after purchase/delivery 
(cherry picked from commit c6a88ab1d2)

# Conflicts:
#	erpnext/controllers/stock_controller.py
#	erpnext/public/js/controllers/transaction.js
 2026-06-01 16:13:50 +00:00
Rohit Waghchaure
5c392d6123 fix: billing address does not belongs to the company error 
(cherry picked from commit 9df07b367a)
 2026-05-29 17:23:55 +00:00
mergify[bot]
ff442cd8e7 fix(stock): apply posting datetime filters while fetching available batches (backport #54976) (#55184) 
fix(stock): apply posting datetime filters while fetching available batches

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-22 11:34:43 +00:00
mergify[bot]
da95f83686 fix: incorrect validation thrown for drop shipped PI (backport #54751) (#54752) 
* fix: incorrect validation thrown for drop shipped PI (#54751)

(cherry picked from commit 907a809f3f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-06 05:53:11 +00:00
mergify[bot]
329f4e01a3 fix: correct project filter in buying doctypes (backport #54644) (#54651) 
fix: correct project filter in buying doctypes (#54644)

(cherry picked from commit a04c028522)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-04-29 17:28:02 +05:30
mergify[bot]
28367ac966 fix: reset base_rounded_total when rounded_total resets (backport #54241) (#54303) 
* fix: reset base_rounded_total when rounded_total resets

(cherry picked from commit f8d278b733)

# Conflicts:
#	erpnext/controllers/tests/test_taxes_and_totals.py
#	erpnext/public/js/controllers/taxes_and_totals.js

* chore: spelling mistake

(cherry picked from commit e2ac476587)

* chore: resolve conflicts

---------

Co-authored-by: ljain112 <ljain112@gmail.com>
 2026-04-16 10:39:57 +05:30
PKSowmiya05
9ee059465a fix: non-collapsible in customer quick entry 
(cherry picked from commit 53e120269d)
 2026-04-15 11:56:39 +00:00
mergify[bot]
57815a07ac fix(stock): fix the property setter (backport #53422) (#53573) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): fix the property setter (#53422)
 2026-03-17 22:07:46 +05:30
Mihir Kandoi
85c4cc3e1b fix: update delivery date in line items (#53331) 2026-03-12 20:37:52 +05:30
Jatin3128
d425e90ef7 Merge pull request #53213 from Jatin3128/fix-53173 
fix: correct payment terms fetching and recalculation logic
 2026-03-11 02:56:03 +05:30
ruthra kumar
4d418d40db Merge pull request #52995 from frappe/mergify/bp/version-15-hotfix/pr-52630 
fix(account): compute tax net_amount in JS controller (backport #52630)
 2026-03-09 20:26:44 +05:30
Jatin3128
3148816451 fix: correct payment terms fetching and recalculation logic 2026-03-06 15:08:35 +05:30
mergify[bot]
10b40836a9 Merge pull request #53128 from frappe/mergify/bp/version-15-hotfix/pr-53037 
fix(stock): pass company to avoid document naming rule issue in QI (backport #53037)
 2026-03-03 15:56:44 +00:00
David Arnold
717c5b25eb fix: client-side taxes calculation (#44510) 
closes: #44328
 2026-02-26 13:55:17 +05:30
ruthra kumar
e5282a48ae chore: resolve conflicts 2026-02-26 13:52:23 +05:30
Luis Mendoza
516ad9021b fix(accounts): round and convert net_amount to company currency in JS tax controller 
(cherry picked from commit b10b205394)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2026-02-26 08:17:52 +00:00
Luis Mendoza
86c628521e style: prettier formatting 
(cherry picked from commit 485166b668)
 2026-02-26 08:17:51 +00:00
Luis Mendoza
6ad84d66cc fix(accounts): compute tax net_amount in JS controller 
(cherry picked from commit 153ad99f85)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2026-02-26 08:17:51 +00:00
ljain112
61ac18069b fix: prevent precision errors in discount distribution with inclusive tax 
(cherry picked from commit 2068299766)
 2026-02-24 11:28:44 +00:00
Abdeali Chharchhoda
4078e252c2 refactor: fetch employee contact details in realtime 
(cherry picked from commit 2ea6508fa5)
 2026-02-23 13:33:38 +00:00
Abdeali Chharchhoda
caa03efbe1 feat: retrieve employee contact details 
(cherry picked from commit a41297d841)
 2026-02-23 13:33:37 +00:00
Mihir Kandoi
97a4a5f1cc fix: update items fetches wrong item code 
(cherry picked from commit ba96d37c11)
 2026-02-20 08:54:14 +00:00
Mihir Kandoi
79c3bc9bcd fix: standalone credit/debit notes should not fetch any serial or batch by default 
(cherry picked from commit 2017edca88)
 2026-02-17 10:40:08 +00:00
Navin-S-R
383648fb59 feat: show formatted currency symbol on ledger preview 
(cherry picked from commit 5c8cb1e7ec)
 2026-02-12 05:58:43 +00:00
ruthra kumar
eedb93b2d6 Merge pull request #52100 from frappe/mergify/bp/version-15-hotfix/pr-51739 
fix(accounts): correct base grand total and rounded total mismatch (backport #51739)
 2026-02-12 11:13:27 +05:30
Dharanidharan S
8bdbb24d73 fix(accounts): correct base grand total and rounded total mismatch (#51739) 
(cherry picked from commit d82c92a237)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2026-02-10 19:05:23 +05:30
mergify[bot]
9519773c5c fix(map_current_doc): prevent mutation of query args in get_query (backport #52202) (#52583) 
fix(map_current_doc): prevent mutation of query args in get_query (#52202)

(cherry picked from commit 23a73c9cdb)

Co-authored-by: V Shankar <shankarv292002@gmail.com>
 2026-02-10 01:26:16 +05:30
NaviN
68338abe07 fix: merge taxes in purchase receipt when get items from multiple purchase invoices (#51422) 
* fix: merge taxes in purchase receipt when get items from multiple purchase invoices

* fix: make merge tax configurable

* chore: follow standard merge taxes method

* chore: follow standard merge taxes method

(cherry picked from commit 6fde0a6261)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2026-02-04 07:19:28 +05:30
Mihir Kandoi
19e0d75c22 fix(barcode): failing request when item has both batch and serial 
(cherry picked from commit 89f6f0f46f)
 2026-01-30 06:17:25 +00:00
SowmyaArunachalam
7146c0385c fix: handle parent level project change 
(cherry picked from commit 543b6e51c0)
 2026-01-27 16:24:06 +00:00
SowmyaArunachalam
e12564daa6 chore: use frappe.model.set_value 
(cherry picked from commit 3b27f49d79)
 2026-01-27 16:24:06 +00:00
SowmyaArunachalam
a09b73e65d fix(sales order): set project at item level from parent 
(cherry picked from commit 9e51701e2a)
 2026-01-27 16:24:05 +00:00
Sudharsanan11
0a87fa5348 fix: autofill warehouse for packed items 
(cherry picked from commit 3f8a0a4833)
 2026-01-22 17:28:03 +00:00
Pandiyan5273
d196956307 fix: prevent UOM from updating incorrectly while scanning barcode 
(cherry picked from commit 30263b26a5)
 2026-01-18 09:36:26 +00:00
Pandiyan5273
c508ef5b82 fix(stock): resolve quantity issue when adding items via barcode scan 
(cherry picked from commit f959b2c59a)
 2026-01-16 10:48:53 +00:00
Diptanil Saha
d5982cab03 chore: resolve conflict 2026-01-14 15:54:10 +05:30
diptanilsaha
f618bf212f fix(transaction.js): use flt instead of cint for plc_conversion_rate 
(cherry picked from commit 8b445e04e5)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2026-01-14 10:22:15 +00:00
Nishka Gosalia
3cc41cf643 fix: correct uom reflecting in sales order when fetching from barcode 2026-01-06 12:51:47 +05:30
ravibharathi656
9ef0e8beb7 fix(bank reconciliation tool): fix incorrect bank account field mapping 
(cherry picked from commit 9dfb0fdcbb)
 2025-12-30 10:28:40 +00:00
ravibharathi656
cd930c05b8 fix(bank reconciliation tool): carry bank account to payment entry 
(cherry picked from commit 6fc9636642)
 2025-12-30 10:28:39 +00:00
Navin-S-R
41659a875b refactor: standardize cost_center updation across transactions 
(cherry picked from commit c28f6f1856)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
 2025-12-16 11:04:41 +05:30
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
Rohit Waghchaure
8a3148eee6 fix: cost center not reset 
(cherry picked from commit 29f2ecbd6f)
 2025-12-02 16:30:41 +00:00
Pugazhendhi Velu
7d7f929cfc fix(barcode_scanner): set serial and batch before item to prevent FIFO override 
(cherry picked from commit 92ec633a5c)
 2025-12-02 12:02:36 +00:00