nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 07:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,053 Commits 621 Branches 1,804 Tags
ca6dec1c3e2b9b94c19f40b72d600f42e569b936
Commit Graph

59053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihir Kandoi
ca6dec1c3e fix(manufacturing): handle duplicate root BOM items (#58614) 
* fix(manufacturing): handle duplicate root BOM items

* test(manufacturing): remove duplicate root item test

(cherry picked from commit 24209ae699)
 2026-08-31 14:05:01 +00:00
Lakshit Jain
2390d48c01 Merge pull request #58602 from frappe/mergify/bp/version-16-hotfix/pr-58483 
fix(taxes): skip tax addition for invoice created from opening invoice tool (backport #58483)
 2026-08-31 18:38:56 +05:30
mergify[bot]
765a7736ed fix(accounts): added permission checks on get_available_payment_schedules (backport #58588) (#58595) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-31 17:14:27 +05:30
mergify[bot]
d95eeb0f6a fix(pos): add permission checks on get_invoices (backport #58591) (#58597) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-31 17:14:16 +05:30
ljain112
32393caa39 chore: resolve conflicts 2026-08-31 16:54:30 +05:30
mergify[bot]
c7582e986d fix/payment-request-subscription-plans-population (backport #57494) (#58430) 
* fix(payment-request): populate subscription plans (#57494)

* fix(payment-request): populate subscription plans

* test: add coverage for subscription plans in payment request

---------

Co-authored-by: Dharanidharan2813 <dharanidharans1328@gmail.com>
(cherry picked from commit 1b81db4754)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
#	erpnext/accounts/doctype/payment_request/test_payment_request.py

* fix(payment-request): resolve cherry-pick conflicts for version-16-hotfix backport

---------

Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
Co-authored-by: ervishnucs <ervishnucs369@gmail.com>
Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-08-31 16:28:20 +05:30
ljain112
bfbc13d147 fix(taxes): skip tax addition for invoice created from opening invoice tool 
(cherry picked from commit e08a166281)

# Conflicts:
#	erpnext/accounts/services/taxes.py
 2026-08-31 09:35:42 +00:00
Nishka Gosalia
40fe739c9e Merge pull request #58592 from frappe/mergify/bp/version-16-hotfix/pr-58325 
fix(projects): check read permission on source in create_duplicate_project (backport #58325)
 2026-08-31 14:17:07 +05:30
Shllokkk
bd35957582 fix(projects): check read permission on source in create_duplicate_project 
(cherry picked from commit 8c8b282a2e)
 2026-08-31 07:10:45 +00:00
Mihir Kandoi
e64fddfad5 fix(manufacturing): use packed row delivery date (#58570) 2026-08-30 11:06:06 +00:00
MochaMind
ac61e6ac0d chore: update POT file (#58567) 2026-08-30 13:01:08 +02:00
Henil Maru
cb4ec72370 fix: Work Order picks wrong Delivery Date when Sales Order has the same item in multiple rows (#58526) 2026-08-30 15:56:28 +05:30
mergify[bot]
06758f2792 fix(stock): load available serial no report (backport #58558) (#58562) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
 2026-08-29 14:56:27 +00:00
mergify[bot]
01a398f263 refactor(stock): remove dead warehouse_condition branch on get_stock_ledger_entries (backport #58552) (#58554) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-29 17:55:34 +05:30
Shllokkk
446b5375e4 Merge pull request #58544 from frappe/mergify/bp/version-16-hotfix/pr-58324 
fix(crm): check write permission in edit_note (backport #58324)
 2026-08-29 13:27:56 +05:30
Shllokkk
c6082617ec chore: resolving conflicts 2026-08-29 13:03:59 +05:30
Shllokkk
c2261f6129 fix(crm): check write permission in edit_note 
(cherry picked from commit eb49f51d29)

# Conflicts:
#	erpnext/crm/utils.py
 2026-08-28 15:05:24 +00:00
mergify[bot]
eb4c327a2b fix(stock): auto-select batch no before saving transaction records (backport #58536) (#58539) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-28 12:06:38 +00:00
mergify[bot]
629bc20e90 fix: persist redistributed additional costs during stock entry repost (backport #58433) (#58533) 
fix: persist redistributed additional costs during stock entry repost (#58433)

* fix: persist redistributed additional costs during stock entry repost

* test: cover additional cost persistence on stock entry recalculation

(cherry picked from commit 074c84e880)

Co-authored-by: Afsal Syed <146159709+Afsalsyed@users.noreply.github.com>
 2026-08-28 10:34:20 +00:00
Sudharsanan Ashok
cc73c3b879 Merge pull request #58495 from frappe/mergify/bp/version-16-hotfix/pr-58493 
fix(selling): check quotation write permission before marking lost (backport #58493)
 2026-08-28 13:11:58 +05:30
pandiyan
4e74831a08 fix(selling): check quotation write permission before marking lost (#58493) 
(cherry picked from commit 5f99a3418d)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
 2026-08-28 13:01:15 +05:30
mergify[bot]
23290a60da fix(accounts): set pos profile on invoices respecting user permissions (backport #58508) (#58519) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-28 06:48:18 +00:00
mergify[bot]
ee3b22403d fix(manufacturing): classify MRP items without a BOM as Purchase (backport #58509) (#58513) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-08-27 17:37:09 +00:00
mergify[bot]
f0d2d40d35 fix: translate doctype in map msg (backport #58515) (#58517) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-08-27 19:25:51 +02:00
Sudharsanan Ashok
60252cacdd Merge pull request #58521 from frappe/revert-58489-mergify/bp/version-16-hotfix/pr-58486 
Revert "refactor(stock): use db.count for the empty ledger check (backport #58486)"
 2026-08-27 22:46:17 +05:30
Sudharsanan Ashok
8287906a71 Revert "refactor(stock): use db.count for the empty ledger check (backport #58486)" 2026-08-27 22:34:55 +05:30
mergify[bot]
d732d06e25 fix(projects): ignore cancelled invoices in timesheet portal (backport #58501) (#58504) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-08-27 13:04:09 +00:00
Shllokkk
4538689e5f Merge pull request #58502 from Shllokkk/work-order-transferred-qty-sum-alternate-items-v16 
fix: sum item and its alternate transferred qty on work order
 2026-08-27 18:27:56 +05:30
Shllokkk
7464f6c76e test: transferred qty sums item and its alternate 2026-08-27 18:07:57 +05:30
Shllokkk
1411835507 fix: sum item and its alternate transferred qty on work order required items 2026-08-27 18:07:57 +05:30
Mihir Kandoi
76d0cb382d fix(manufacturing): preserve job card qty in mr transfer (backport #58482) (#58499) 2026-08-27 12:19:33 +00:00
Sudharsanan Ashok
eedf991b43 Merge pull request #58489 from frappe/mergify/bp/version-16-hotfix/pr-58486 
refactor(stock): use db.count for the empty ledger check (backport #58486)
 2026-08-27 16:50:09 +05:30
Sudharsanan Ashok
38aaceafc6 refactor(stock): use db.count for the empty ledger check (#58486) 
Align the existence check in `reset_bin_without_stock_ledger_entries()` with
the version-15-hotfix backport in #58434, per review feedback there.

(cherry picked from commit 2866be2816)
 2026-08-27 11:07:21 +00:00
Sudharsanan Ashok
f7f34ffd3b Merge pull request #58467 from frappe/mergify/bp/version-16-hotfix/pr-58466 
fix(manufacturing): account for pending job card qty (backport #58466)
 2026-08-27 16:13:54 +05:30
Sudharsanan Ashok
f19450858c Merge pull request #58475 from frappe/mergify/bp/version-16-hotfix/pr-58469 
fix: clarify duplicate internal party messages (backport #58469)
 2026-08-27 16:13:28 +05:30
Sudharsanan Ashok
8dc3bc3485 Merge pull request #58429 from frappe/mergify/bp/version-16-hotfix/pr-58402 
feat(analytics): filter sales and purchase analytics by entity  (backport #58402)
 2026-08-27 16:12:20 +05:30
pandiyan
7b9cdb4926 fix(manufacturing): account for pending job card qty (#58466) 
(cherry picked from commit 0d90608bc1)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
#	erpnext/manufacturing/doctype/job_card/test_job_card.py
 2026-08-27 14:03:00 +05:30
pandiyan
f0e603aec5 fix: clarify duplicate internal party messages (#58469) 
(cherry picked from commit 4d4cf034b5)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.py
 2026-08-27 13:57:12 +05:30
Shllokkk
bfb27039ed Merge pull request #58470 from Shllokkk/material-request-validate-with-so-v16 
fix: validate items against source Sales Order in Material Request
 2026-08-27 13:06:38 +05:30
Shllokkk
07f8250e40 test: block item change on Sales Order-sourced Material Request row 2026-08-27 12:48:45 +05:30
Shllokkk
65466464df fix: validate items against source Sales Order in Material Request 2026-08-27 12:48:45 +05:30
Diptanil Saha
60599ec692 ci: crowdin actions to upload main.pot file (#58461) 2026-08-26 18:31:04 +00:00
Aarol D'Souza
6093316ba3 Merge pull request #58427 from frappe/mergify/bp/version-16-hotfix/pr-58351 
fix(company): throw if linked to demo_company field (backport #58351)
 2026-08-26 23:14:32 +05:30
mergify[bot]
cabecd2527 ci: ignore python tests on update of **.po (backport #58457) (#58459) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-26 20:43:42 +05:30
MochaMind
c924de3c55 fix: sync translations from crowdin (version-16-hotfix) (#58455) 
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
 2026-08-26 18:31:46 +05:30
Sudharsanan Ashok
655ed81575 feat(analytics): filter sales and purchase analytics by entity (#58402) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit 3f29cdf8d2)

# Conflicts:
#	erpnext/buying/report/purchase_analytics/test_purchase_analytics.py
#	erpnext/selling/report/sales_analytics/test_sales_analytics.py
 2026-08-26 07:33:42 +00:00
AarDG10
9f3dd7eabd fix(company): throw if linked to demo_company field 
Throws an error msg if user is deleting demo company directly.

(cherry picked from commit aaa3100efc)
 2026-08-26 07:24:12 +00:00
Sudharsanan Ashok
2cd865fffc Merge pull request #58405 from aerele/fix/pick-list-transfer-qty-lost-v16 
fix(stock): keep pick list links when refetching stock entry items (backport #58374)
 2026-08-26 12:45:46 +05:30
Sudharsanan Ashok
e32a8f008e Merge pull request #58422 from frappe/mergify/bp/version-16-hotfix/pr-58168 
fix: correct is_frozen description on customer and supplier (backport #58168)
 2026-08-26 12:39:35 +05:30
Pandiyan P
9e00888d67 fix: correct is_frozen description on customer and supplier (#58168) 
(cherry picked from commit cc60c80e68)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/selling/doctype/customer/customer.json
 2026-08-26 12:08:14 +05:30