nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,881 Commits 497 Branches 1,768 Tags
0785fa02572c596e6e80fda8dab8080ffc8e796e
Commit Graph

57881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
22c26f42e9 Merge pull request #55425 from frappe/mergify/bp/version-16-hotfix/pr-55417 
fix: billing address does not belongs to the company error (backport #55417)
 2026-05-30 12:43:06 +05:30
MochaMind
75465035ae chore: sync translations to version-16-hotfix (#55420) 2026-05-29 23:04:48 +05:30
Rohit Waghchaure
e1f29de078 fix: billing address does not belongs to the company error 
(cherry picked from commit 9df07b367a)
 2026-05-29 17:24:13 +00:00
mergify[bot]
26d94c5594 ci: configure upstream fetch refspec so git fetch creates tracking refs (backport #55422) (#55423) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-29 17:01:32 +00:00
mergify[bot]
542aff2677 ci: split sync into orchestrator + per-branch runners, generalise for any app (backport #55414) (#55418) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-29 20:37:33 +05:30
Loic Oberle
db4e459a5a refactor(sales_invoice): replace sql with qb in get_all_mode_of_payments (#55377) 
(cherry picked from commit 618045ec98)
 2026-05-29 12:05:16 +00:00
Khushi Rawat
e42c3961a9 Merge pull request #55409 from frappe/mergify/bp/version-16-hotfix/pr-55397 
fix: item master list view UI cleanup (backport #55397)
 2026-05-29 16:30:05 +05:30
Khushi Rawat
63aff0098c Merge pull request #55254 from frappe/mergify/bp/version-16-hotfix/pr-55126 
fix: asset scrap flow related changes (backport #55126)
 2026-05-29 15:48:03 +05:30
Khushi Rawat
6d747420a3 Merge pull request #55359 from frappe/mergify/bp/version-16-hotfix/pr-55137 
fix: use get_query instead of get_all for data fetching (backport #55137)
 2026-05-29 15:36:28 +05:30
Khushi Rawat
d82e03edb6 fix: import DateTimeLikeObject 2026-05-29 15:21:58 +05:30
khushi8112
2d554c05d6 fix: item master list view UI cleanup 
(cherry picked from commit 69ee7e93d8)
 2026-05-29 09:50:18 +00:00
mergify[bot]
876995a35f ci: fix branch base and per-language commits in sync-hotfix-translations (backport #55405) (#55407) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
fix branch base and per-language commits in sync-hotfix-translations (#55405)
 2026-05-29 15:10:40 +05:30
Khushi Rawat
abe19e1212 fix: resolve conflict 2026-05-29 15:05:41 +05:30
Nishka Gosalia
bfc8683e52 Merge pull request #55403 from frappe/mergify/bp/version-16-hotfix/pr-55400 
fix: Make Distributed Discount Amount field read only (backport #55400)
 2026-05-29 14:09:18 +05:30
Nishka Gosalia
84ce7c720e Merge pull request #55402 from frappe/mergify/bp/version-16-hotfix/pr-55399 
fix: over order allowance setting fix (backport #55399)
 2026-05-29 13:00:37 +05:30
nishkagosalia
29441b7249 fix: Make Distributed Discount Amount field read only 
(cherry picked from commit 512c95529e)
 2026-05-29 07:30:01 +00:00
nishkagosalia
41b2de35a9 fix: over order allowance setting fix 
(cherry picked from commit 30011963bc)
 2026-05-29 07:07:59 +00:00
mergify[bot]
faa15731cb fix(stock): get_actual_qty during cancellations (backport #55388) (#55392) 
Co-authored-by: archielister <archie.lister@lush.co.uk>
fix(stock): get_actual_qty during cancellations (#55388)
 2026-05-28 22:40:24 +05:30
Nishka Gosalia
0ce697b170 Merge pull request #55373 from frappe/mergify/bp/version-16-hotfix/pr-55367 
fix(UX): Move title field to More Info (backport #55367)
 2026-05-28 16:24:35 +05:30
mergify[bot]
933ac0108c fix: new bom version should not recalculate operations through routing (backport #55370) (#55372) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: new bom version should not recalculate operations through routing (#55370)
 2026-05-28 16:01:52 +05:30
nishkagosalia
b74e365421 fix: merge conflicts 2026-05-28 15:35:10 +05:30
nishkagosalia
20592fc25d fix(UX): Move title field to More Info 
(cherry picked from commit 34c24b86fa)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 2026-05-28 09:39:37 +00:00
Nishka Gosalia
4ac003a804 Merge pull request #55369 from frappe/mergify/bp/version-16-hotfix/pr-55340 
feat: over order allowance setting (backport #55340)
 2026-05-28 14:38:34 +05:30
nishkagosalia
08eaaa5b83 feat: over order allowance setting 
(cherry picked from commit 355d71dbd2)
 2026-05-28 08:49:11 +00:00
khushi8112
7cbef15596 fix: use get_query instead of get_all for data fetching 
(cherry picked from commit 1fd99337b3)
 2026-05-27 19:17:29 +00:00
mergify[bot]
3a7af0e59d ci: add node setup on sync translations to version 16 hotfix (backport #55355) (#55356) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix (#55355)
 2026-05-27 18:23:23 +00:00
mergify[bot]
65b6da552e ci: sync translations from develop to version-16-hotfix (backport #55348) (#55353) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
fix (#55348)
 2026-05-27 16:30:59 +00:00
MochaMind
91dcb96307 chore: update POT file (#55351) 2026-05-27 21:12:08 +05:30
Lakshit Jain
aa6c45bae1 Merge pull request #55343 from frappe/mergify/bp/version-16-hotfix/pr-55330 
fix(tds): treat NULL and empty-string tax_withholding_group as equivalent (backport #55330)
 2026-05-27 17:22:29 +05:30
Lakshit Jain
8c4d5d343b Merge pull request #55342 from frappe/mergify/bp/version-16-hotfix/pr-55333 
fix(custom_financial_template): sum account closing balances across dimensions (backport #55333)
 2026-05-27 17:21:24 +05:30
ljain112
8b1d9817a6 fix: changes as per review 
(cherry picked from commit 251e7b623c)
 2026-05-27 11:24:51 +00:00
ljain112
82e12d2d52 fix(tds): treat NULL and empty-string tax_withholding_group as equivalent 
(cherry picked from commit a85f8a64b1)
 2026-05-27 11:24:51 +00:00
ljain112
3359e20d06 fix(custom_financial_template): sum account closing balances across dimensions 
(cherry picked from commit 4a49a205b3)
 2026-05-27 11:24:13 +00:00
mergify[bot]
198970cdee fix(selling): handle None values while grouping opportunities by utm … (backport #55300) (#55328) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
fix(selling): handle None values while grouping opportunities by utm … (#55300)
 2026-05-27 07:17:24 +00:00
rohitwaghchaure
9919b3d75c Merge pull request #55299 from frappe/mergify/bp/version-16-hotfix/pr-55242 
fix: stock reco for legacy serial nos (backport #55242)
 2026-05-27 12:16:07 +05:30
mergify[bot]
ae92a82930 fix(manufacturing): allow to edit batch size while creating a work order (backport #55058) (#55326) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(manufacturing): allow to edit batch size while creating a work order (#55058)
 2026-05-27 06:22:59 +00:00
mergify[bot]
8b4ad229e7 Merge branch 'version-16-hotfix' into mergify/bp/version-16-hotfix/pr-55242 2026-05-27 06:18:17 +00:00
rohitwaghchaure
64ee4b8d99 Merge pull request #55320 from rohitwaghchaure/fixed-support-69397 
fix: material transfer in transit issue
 2026-05-27 11:23:21 +05:30
Rohit Waghchaure
356bb7878f fix: material transfer in transit issue 2026-05-27 10:29:46 +05:30
mergify[bot]
8925a6527b chore: remove frappe-semgrep-rules submodule (backport #55083) (#55318) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-05-27 01:00:48 +00:00
mergify[bot]
cd7e1bbff1 fix(sales_invoice): skip stock update for POS invoices linked to Delivery Note (backport #55311) (#55313) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(sales_invoice): skip stock update for POS invoices linked to Delivery Note (#55311)
 2026-05-26 20:32:53 +00:00
mergify[bot]
4dff5a7820 fix(employee): js error if user does not have write permission for date field (backport #55312) (#55314) 
Co-authored-by: Himanshu Jain <118419692+trufurs@users.noreply.github.com>
fix(employee): js error if user does not have write permission for date field (#55312)
 2026-05-27 01:58:49 +05:30
rohitwaghchaure
1781893c3c Merge pull request #55297 from frappe/mergify/bp/version-16-hotfix/pr-55290 
fix: inclusive tax amount not considered while setting LCV from purchase invoice (backport #55290)
 2026-05-26 16:13:51 +05:30
Nihantra C. Patel
304de47b48 Merge pull request #55295 from frappe/mergify/bp/version-16-hotfix/pr-55268 
fix: use passed posting date for period closing validation in reverse GL entries (backport #55268)
 2026-05-26 16:06:56 +05:30
Rohit Waghchaure
67c922cdf3 fix: stock reco for legacy serial nos 
(cherry picked from commit 9d5fd11bcd)
 2026-05-26 10:29:25 +00:00
Rohit Waghchaure
bd4c24493c fix: inclusive tax amount not considered while setting LCV from purchase invoice 
(cherry picked from commit 048ddfc265)
 2026-05-26 10:15:26 +00:00
Nihantra Patel
6925b6b645 test: update testcase 
(cherry picked from commit 9c39b01f1c)
 2026-05-26 10:14:00 +00:00
Nihantra Patel
3ce9cf2bd8 fix: use passed posting date in make_reverse_gl_entries 
(cherry picked from commit f040bdf165)
 2026-05-26 10:14:00 +00:00
Mihir Kandoi
0ede7759df Merge pull request #55289 from frappe/mergify/bp/version-16-hotfix/pr-55286 
fix: single variant creation error (backport #55286)
 2026-05-26 13:57:01 +05:30
diptanilsaha
1f14ef2344 fix: pos profile form cleanup (backport #52436) (#55285) 
fix: pos profile form cleanup (#52436)
 2026-05-26 13:49:39 +05:30