CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 05:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,661 Commits 424 Branches 1,724 Tags
c5796fed4a484cc05b9e2fcc83cdfaffbcc15111
Commit Graph

54661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Poovitha Palanivelu
c5796fed4a fix: update user status depends on employee status 
(cherry picked from commit 194d060f13)

# Conflicts:
#	erpnext/setup/doctype/employee/employee.py
 2026-03-10 07:39:56 +00:00
Mihir Kandoi
2b25059315 Merge pull request #53276 from frappe/mergify/bp/version-15-hotfix/pr-53235 
fix: update item row delivery dates when header delivery date changes in sales order (backport #53235)
 2026-03-10 13:09:31 +05:30
Pandiyan37
dfbb3e97a8 fix(selling): update delivery date in line items 
(cherry picked from commit 77367b5517)
 2026-03-10 07:23:38 +00:00
ruthra kumar
ee22347d64 Merge pull request #53243 from frappe/mergify/bp/version-15-hotfix/pr-53239 
fix: validation for cancellation (backport #53239)
 2026-03-10 12:23:14 +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
Rohit Waghchaure
c142a2be9c fix: validation for cancellation 
(cherry picked from commit 8de272a8a1)
 2026-03-09 07:49:22 +00:00
Mihir Kandoi
3c77653508 Merge pull request #53240 from frappe/mergify/bp/version-15-hotfix/pr-53234 
fix(manufacturing): show returned qty in progress bar (backport #53234)
 2026-03-09 12:42:04 +05:30
Sudharsanan11
c572a019b4 feat(manufacturing): show disassembled qty in progress bar 
(cherry picked from commit ae9ff767fa)
 2026-03-09 07:04:32 +00:00
Sudharsanan11
260d87a80c fix(manufacturing): show returned qty in progress bar 
(cherry picked from commit 8027f5aafd)
 2026-03-09 07:04:31 +00:00
ruthra kumar
e0f5ae2d4c Merge pull request #53228 from frappe/mergify/bp/version-15-hotfix/pr-53227 
refactor: party type and party filter for comparison report (backport #53227)
 2026-03-08 05:49:51 +05:30
ruthra kumar
37e750e877 refactor: party type and party filter for comparison report 
(cherry picked from commit b6f9c0844e)
 2026-03-07 12:49:44 +00:00
rohitwaghchaure
5764f5ec80 Merge pull request #53207 from frappe/mergify/bp/version-15-hotfix/pr-53200 
fix: stock balance report qty (backport #53200)
 2026-03-06 13:08:11 +05:30
mergify[bot]
e9ae156323 refactor: use postprocess in mapped_doc to update items in subcontracting controller (backport #52724) (#52936) 
* refactor: use postprocess in mapped_doc to update items in subcontracting controller

(cherry picked from commit 1d3d09f48c)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: ljain112 <ljain112@gmail.com>
 2026-03-06 12:59:15 +05:30
rohitwaghchaure
54fdce648e chore: fix conflicts 2026-03-06 12:47:18 +05:30
Rohit Waghchaure
180e232eb0 fix: stock balance report qty 
(cherry picked from commit a15e5fdc4e)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.py
 2026-03-06 07:15:30 +00:00
mergify[bot]
ba4a99b22c fix(help): escape query (backport #53192) (#53194) 
fix(help): escape query (#53192)


(cherry picked from commit 702adda000)

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
Co-authored-by: Akhil Narang <me@akhilnarang.dev>
 2026-03-05 18:40:49 +05:30
Mihir Kandoi
9100428f1b Merge pull request #53176 from frappe/resolve/version-15-hotfix/pr-53084 2026-03-05 17:36:47 +05:30
rohitwaghchaure
1950e82d1e Merge pull request #53180 from frappe/mergify/bp/version-15-hotfix/pr-52745 
fix: balance qty for inv dimension (backport #52745)
 2026-03-05 14:27:27 +05:30
Rohit Waghchaure
6898d70382 fix: balance qty for inv dimension 
(cherry picked from commit a3eafe5b18)
 2026-03-05 08:20:02 +00:00
Sudharsanan11
624d1d4759 fix(manufacturing): ignore sales order validation for subassembly item 
(cherry picked from commit 6b1aac4aee)
 2026-03-05 12:50:27 +05:30
Mihir Kandoi
bf6b5b7b7f Merge pull request #53164 from frappe/mergify/bp/version-15-hotfix/pr-53157 
fix: disallow all actions on job card if work order is closed (backport #53157)
 2026-03-04 17:09:17 +05:30
Khushi Rawat
24d9e2c5a9 Merge pull request #53162 from frappe/mergify/bp/version-15-hotfix/pr-53154 
fix: skip asset sale processing for internal transfer invoices (backport #53154)
 2026-03-04 17:00:56 +05:30
Mihir Kandoi
7b2e4832aa fix: disallow all actions on job card if work order is closed 
(cherry picked from commit ee19c32c3a)
 2026-03-04 11:21:34 +00:00
khushi8112
a7e8f31f56 fix: skip asset sale processing for internal transfer invoices 
(cherry picked from commit 9cb3dad079)
 2026-03-04 11:07:05 +00:00
Nishka Gosalia
d5a250a254 Merge pull request #53158 from frappe/mergify/bp/version-15-hotfix/pr-53156 
fix: updating costing based on employee change in timesheet (backport #53156)
 2026-03-04 16:35:06 +05:30
Nishka Gosalia
be598108b6 fix: updating costing based on employee change in timesheet 
(cherry picked from commit e37d4a6f7c)
 2026-03-04 10:42:50 +00:00
mergify[bot]
68bac20198 Merge pull request #53095 from frappe/mergify/bp/version-15-hotfix/pr-52838 
fix: correct fields being updated on material request and purchase or… (backport #52838)
 2026-03-04 07:33:02 +00:00
mergify[bot]
072ab8d5f3 feat: allowing rate modification in update item in quotation (backport #53147) (#53150) 
Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local>
 2026-03-04 07:29:46 +00:00
diptanilsaha
f9e5ac6b60 Merge branch 'version-15' into version-15-hotfix 2026-03-03 23:11:48 +05:30
Mihir Kandoi
8131af51a3 Merge pull request #53137 from frappe/mergify/bp/version-15-hotfix/pr-52784 
fix(stock): validate company for receipt documents and expense accounts (backport #52784)
 2026-03-03 21:46:25 +05:30
Mihir Kandoi
17dc1681b0 Merge pull request #53133 from frappe/mergify/bp/version-15-hotfix/pr-53070 
fix: handle html email template separately in RFQ to avoid jinja cont… (backport #53070)
 2026-03-03 21:37:21 +05:30
Kavin
62340babb8 Merge pull request #53135 from frappe/mergify/bp/version-15-hotfix/pr-53132 
fix(selling): handle selling price validation for FG item  (backport #53132)
 2026-03-03 21:31:12 +05:30
Kavin
6846f02cea fix: resolve conflicts 2026-03-03 21:28:34 +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
Sudharsanan11
9b0d4ab4da test(stock): add test to validate company for receipts and expense accounts 
(cherry picked from commit d58171987c)
 2026-03-03 15:46:49 +00:00
Sudharsanan11
74e71f3868 fix: set company based expense account 
(cherry picked from commit d54d0c25a2)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
 2026-03-03 15:46:48 +00:00
Sudharsanan11
44620884c1 fix(stock): validate company for receipt documents and expense accounts 
(cherry picked from commit 15dfc08a31)
 2026-03-03 15:46:48 +00:00
Mihir Kandoi
bd76ef29cc Merge pull request #53124 from frappe/mergify/bp/version-15-hotfix/pr-53123 
fix: serial no status for Disassemble entry (backport #53123)
 2026-03-03 21:12:48 +05:30
kavin-114
dced21faf2 test: add unit test for FG Item selling price validation 
(cherry picked from commit 723993fdf6)
 2026-03-03 15:40:19 +00:00
kavin-114
d5cc51b426 fix(selling): handle selling price validation for FG item 
System checks valuation rate in incoming_rate field, since SO has it in valuation_rate field of item row,
need to handle the field name dynamically based upon the doctype name in Selling Controller.

(cherry picked from commit 4335318482)
 2026-03-03 15:40:18 +00:00
Mihir Kandoi
3581906033 chore: resolve conflicts 2026-03-03 21:09:03 +05:30
Pugazhendhi Velu
90169a39bb fix: handle html email template separately in RFQ to avoid jinja context error 
(cherry picked from commit 49d363b174)

# Conflicts:
#	erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
 2026-03-03 15:36:27 +00:00
Mihir Kandoi
86f8bd403d Merge pull request #53126 from frappe/mergify/bp/version-15-hotfix/pr-53099 
fix: populate mr owner and set po owner as fallback (backport #53099)
 2026-03-03 20:54:40 +05:30
kavin-114
c1f2991694 fix: populate mr owner and set po owner as fallback 
(cherry picked from commit bdf4e51da3)
 2026-03-03 15:09:12 +00:00
Rohit Waghchaure
8ce541bf46 fix: serial no status for Disassemble entry 
(cherry picked from commit 81acefa8ad)
 2026-03-03 13:24:03 +00:00
Shariq Ansari
0c0f1a6591 Merge pull request #53121 from frappe/mergify/bp/version-15-hotfix/pr-53119 
fix: do not create contact if not passed from crm (backport #53119)
 2026-03-03 04:00:02 -08:00
shariquerik
e2b6179b17 fix: ensure contacts are processed only if present in create_prospect_against_crm_deal 
(cherry picked from commit 800810d23d)
 2026-03-03 11:43:24 +00:00
Mihir Kandoi
96872d314d Merge pull request #53120 from frappe/gh53107 2026-03-03 17:12:33 +05:30
Mihir Kandoi
3c6a120c5c fix: item description html validation error 2026-03-03 16:57:02 +05:30
diptanilsaha
067a57d4c3 Merge pull request #53113 from frappe/mergify/bp/version-15-hotfix/pr-53110 
fix(pricing_rule): strict validation of `transaction_type` (backport #53110)
 2026-03-03 15:19:30 +05:30