nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-12 14:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,158 Commits 595 Branches 1,797 Tags
e429e608c2ab9451bf307b46776563dc8a3d2a44
Commit Graph

55158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
e429e608c2 fix: pick correct name when creating user from RFQ (backport #55468) (#55471) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: pick correct name when creating user from RFQ (#55468)
 2026-06-01 05:52:40 +00:00
mergify[bot]
75d00ef173 fix(stock): change qb to qb get_query to fix filter issues (backport #55443) (#55444) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): change qb to qb get_query to fix filter issues (#55443)
 2026-06-01 05:33:25 +00:00
mergify[bot]
94fd15e550 fix(stock): change valuation rate column label in stock ledger entry/report (backport #55323) (#55393) 
Co-authored-by: Sudharsanan11 <sudharsananashok1975@gmail.com>
 2026-06-01 05:10:27 +00:00
mergify[bot]
03532624b8 fix(pos): preserve contacts and enforce permissions in set_customer_info (backport #55463) (#55465) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(pos): preserve contacts and enforce permissions in set_customer_info (#55463)
 2026-06-01 05:18:34 +05:30
mergify[bot]
338feb31e1 fix(issue): check permission before issue status modification (backport #55458) (#55459) 
* fix(issue): check permission before issue status modification (#55458)

(cherry picked from commit 876f403500)

# Conflicts:
#	erpnext/support/doctype/issue/issue.py

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-05-31 19:06:01 +00:00
mergify[bot]
2a805e090c refactor: task_info portal pages (backport #55448) (#55453) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-05-31 22:07:01 +05:30
mergify[bot]
2a12ae1afe fix(book_appointment): when scheduling is disabled, block API endpoints (backport #55455) (#55456) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(book_appointment): when scheduling is disabled, block API endpoints (#55455)
 2026-05-31 16:06:25 +00:00
mergify[bot]
715ca39abc refactor(pos_profile): migrating raw sql to qb in set_defaults (backport #55447) (#55449) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-05-31 09:40:26 +00:00
Raffael Meyer
cad14ac3e6 chore: mark as out of beta (backport #55439) (#55440) 2026-05-30 19:09:45 +00:00
mergify[bot]
2a52ea6850 fix(regional): Japanese CT Rate (backport #54998) (#55437) 
Co-authored-by: mh35 <mh35jp@gmail.com>
fix(regional): Japanese CT Rate (#54998)
 2026-05-30 22:00:19 +05:30
mergify[bot]
a2d924c48f fix(quotation): made customer contact column visible (backport #55433) (#55434) 
* fix(quotation): made customer contact column visible (#55433)

(cherry picked from commit 9758eb868d)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.json

* chore: resolved conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-05-30 14:20:40 +00:00
rohitwaghchaure
3ad39c987b Merge pull request #55424 from frappe/mergify/bp/version-15-hotfix/pr-55417 
fix: billing address does not belongs to the company error (backport #55417)
 2026-05-30 12:43:31 +05:30
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]
ad6e3a45d2 fix(stock): get_actual_qty during cancellations (backport #55388) (#55391) 
Co-authored-by: archielister <archie.lister@lush.co.uk>
fix(stock): get_actual_qty during cancellations (#55388)
 2026-05-28 22:40:11 +05:30
mergify[bot]
4669ff295f fix: new bom version should not recalculate operations through routing (backport #55370) (#55371) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: new bom version should not recalculate operations through routing (#55370)
 2026-05-28 16:01:36 +05:30
Pandiyan P
41bf2f32fd fix(manufacturing): allow to edit batch size while creating a work order (#55332) 2026-05-27 18:39:59 +05:30
rohitwaghchaure
a6d4bc5c86 Merge pull request #55298 from frappe/mergify/bp/version-15-hotfix/pr-55242 
fix: stock reco for legacy serial nos (backport #55242)
 2026-05-27 12:15:19 +05:30
Rohit Waghchaure
93dcba40ec fix: stock reco for legacy serial nos 
(cherry picked from commit 9d5fd11bcd)
 2026-05-27 11:50:30 +05:30
mergify[bot]
067c23f20e fix: material transfer in transit issue (backport #55320) (#55324) 
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2026-05-27 11:45:23 +05:30
Diptanil Saha
60fdc6bc1a Merge branch 'version-15' into version-15-hotfix 2026-05-27 05:31:52 +05:30
mergify[bot]
b972b7c307 fix(general-ledger): show raw GL entries when categorize_by is empty (backport #54816) (#54829) 
fix(general-ledger): show raw GL entries when categorize_by is empty (#54816)

(cherry picked from commit dfbe847307)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.py

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-05-26 23:34:47 +00:00
Nihantra C. Patel
4927d346c8 Merge pull request #55294 from frappe/mergify/bp/version-15-hotfix/pr-55268 
fix: use passed posting date for period closing validation in reverse GL entries (backport #55268)
 2026-05-26 23:13:14 +05:30
Nihantra Patel
8f164cff1d test: immutable ledger reverse entry 2026-05-26 22:53:14 +05:30
Nihantra C. Patel
31c251d956 fix: update import 2026-05-26 22:17:23 +05:30
rohitwaghchaure
bc81992a40 Merge pull request #55296 from frappe/mergify/bp/version-15-hotfix/pr-55290 
fix: inclusive tax amount not considered while setting LCV from purchase invoice (backport #55290)
 2026-05-26 16:23:13 +05:30
rohitwaghchaure
66267cf99a chore: fix conflicts 2026-05-26 15:57:24 +05:30
Nihantra C. Patel
9d211990c3 fix: import change_settings 2026-05-26 15:56:38 +05:30
Nihantra C. Patel
76078a7fb9 fix: ERPNextTestSuite to change_settings 2026-05-26 15:48:41 +05:30
Rohit Waghchaure
cba4c9f0ee fix: inclusive tax amount not considered while setting LCV from purchase invoice 
(cherry picked from commit 048ddfc265)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2026-05-26 10:15:01 +00:00
mergify[bot]
46d5395148 fix: consumed operation cost calculation (backport #54858) (#55132) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: consumed operation cost calculation (#54858)
 2026-05-26 10:14:19 +00:00
Nihantra Patel
b8b2141e20 test: update testcase 
(cherry picked from commit 9c39b01f1c)
 2026-05-26 10:13:33 +00:00
Nihantra Patel
4436585aa0 fix: use passed posting date in make_reverse_gl_entries 
(cherry picked from commit f040bdf165)
 2026-05-26 10:13:33 +00:00
mergify[bot]
937eb87932 fix: single variant creation error (backport #55286) (#55288) 
* fix: single variant creation error

(cherry picked from commit bda75135c3)

* feat: allow creation of any number of variants in multiple item variant creation dialog

(cherry picked from commit 090c25d848)

# Conflicts:
#	erpnext/controllers/item_variant.py

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-26 08:25:21 +00:00
ruthra kumar
6a21d28030 Merge pull request #55280 from frappe/mergify/bp/version-15-hotfix/pr-55256 
refactor: handle processes stuck in running state in process pcv (backport #55256)
 2026-05-26 10:52:25 +05:30
mergify[bot]
4f89f3a856 fix: prevent AttributeError in batch query filters (backport #55257) (#55278) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
fix: prevent AttributeError in batch query filters (#55257)
 2026-05-26 05:11:11 +00:00
mergify[bot]
8b241b45e2 fix(stock): remove precision for valuation rate while creating sle (backport #55249) (#55259) 
Co-authored-by: Sudharsanan11 <sudharsananashok1975@gmail.com>
 2026-05-26 10:29:27 +05:30
ruthra kumar
b517f26085 refactor: atomic summarization step for process pcv 
(cherry picked from commit 6cb7971342)
 2026-05-26 04:57:58 +00:00
ruthra kumar
f28b948e1b refactor: handle processes stuck in running state in process pcv 
(cherry picked from commit f414778486)
 2026-05-26 04:57:57 +00:00
ruthra kumar
a797ab3482 refactor: summarize in background 
(cherry picked from commit 1c3a9f7dd9)
 2026-05-26 04:57:57 +00:00
mergify[bot]
d31a051c74 fix(payment_entry): sync paid/received amounts for cross-currency entries (backport #55270) (#55271) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(payment_entry): sync paid/received amounts for cross-currency entries (#55270)
 2026-05-25 23:21:43 +05:30
rohitwaghchaure
aad270914a Merge pull request #55243 from frappe/mergify/bp/version-15-hotfix/pr-55216 
fix: fg valuation rate in repack entry when multiple FGs (backport #55216)
 2026-05-25 15:34:30 +05:30
mergify[bot]
af3e7f53ac refactor: stock ageing report (backport #55231) (#55236) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-25 12:44:55 +05:30
Rohit Waghchaure
238f1685f1 fix: fg valuation rate in repack entry when multiple FGs 
(cherry picked from commit a47e4c04f7)
 2026-05-25 06:15:07 +00:00
mergify[bot]
418a7fb301 fix: consider batchwise valuation in stock ageing report (backport #54919) (#55229) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-24 09:48:12 +00:00
Nishka Gosalia
304474d2f7 Merge pull request #55195 from frappe/mergify/bp/version-15-hotfix/pr-55189 
fix(project): update customer and sales order as no copy (backport #55189)
 2026-05-23 16:00:12 +05:30
Nishka Gosalia
59e9f5192c fix: merge conflicts 2026-05-23 15:35:19 +05:30
nareshkannasln
914576040e fix(project): update customer and sales order as no copy 
(cherry picked from commit 9d8f3863f2)

# Conflicts:
#	erpnext/projects/doctype/project/project.json
 2026-05-22 12:21:04 +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]
25739ae217 fix: invalid filter on item_group (backport #55186) (#55187) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: invalid filter on item_group (#55186)
 2026-05-22 16:49:10 +05:30
mergify[bot]
425e6c52f4 fix: edit stock uom qty for purchase documents (backport #55135) (#55178) 
Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com>
fix: edit stock uom qty for purchase documents (#55135)
 2026-05-22 09:12:19 +00:00