nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-04 10:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,146 Commits 572 Branches 1,792 Tags
267086153b052dac996eeff2e258b15383797f32
Commit Graph

58146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
267086153b chore: resolve conflicts 2026-06-24 15:08:04 +05:30
ruthra kumar
66b28cf456 refactor: patch, display depends on and json changes 
(cherry picked from commit 3da7eefebb)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
#	erpnext/patches.txt
 2026-06-24 07:58:49 +00:00
ruthra kumar
d389014e57 feat(accounts): add configurable job timeout for Process Period Closing Voucher 
Adds a `pcv_job_timeout` Int field (default 3600s) to Accounts Settings
so admins can tune the enqueue timeout for PCV background jobs without
a code change. All three `frappe.enqueue` calls in
`process_period_closing_voucher.py` now read this value at runtime.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 13b6c4a165)
 2026-06-24 07:58:48 +00:00
mergify[bot]
54c45d7b22 fix: job card timer issue (backport #56405) (#56406) 
fix: job card timer issue (#56405)

(cherry picked from commit 21541e3ad3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-24 09:21:02 +05:30
mergify[bot]
d54938fa64 feat(opening invoice creation tool): add project to opening invoice child row (backport #54662) (#56401) 
Co-authored-by: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com>
 2026-06-23 21:07:26 +00:00
mergify[bot]
4555c323af fix(pos): remove redundant opening balance dialog onchange handler (backport #54591) (#56403) 
Co-authored-by: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com>
fix(pos): remove redundant opening balance dialog onchange handler (#54591)
 2026-06-24 02:24:23 +05:30
mergify[bot]
1d0edf1b9a fix(payment_entry): recompute base amount when exchange rate changes (backport #56136) (#56398) 
Co-authored-by: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com>
Co-authored-by: ervishnucs <ervishnucs369@gmail.com>
fix(payment_entry): recompute base amount when exchange rate changes (#56136)
 2026-06-24 02:11:35 +05:30
mergify[bot]
2b6f2c2f9c fix(budget): ambiguous error message for budget assignment validation (backport #56390) (#56392) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
fix(budget): ambiguous error message for budget assignment validation (#56390)
 2026-06-24 01:03:05 +05:30
mergify[bot]
00ba64baae feat(crm_settings)!: enable frappe crm data synchronization (backport #56268) (#56384) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-23 22:02:23 +05:30
Mihir Kandoi
3dc128881c Merge pull request #56374 from frappe/mergify/bp/version-16-hotfix/pr-56364 
fix(manufacturing): make item_code mandatory in Job Card Item (backport #56364)
 2026-06-23 19:36:44 +05:30
pandiyan
d40c36a4b1 fix(manufacturing): make item_code mandatory in Job Card Item 
The item_code field in the Job Card Item child table was optional,
allowing job cards to be saved without a raw material item linked.
Set reqd=1 in the JSON and update the Python type annotation accordingly.

(cherry picked from commit d7e9a97f8a)
 2026-06-23 13:33:00 +00:00
Khushi Rawat
7b50f67b55 Merge pull request #56317 from frappe/mergify/bp/version-16-hotfix/pr-55341 
fix: customer master form cleanup (backport #55341)
 2026-06-23 16:44:22 +05:30
Khushi Rawat
b40445fe44 Merge pull request #56316 from frappe/mergify/bp/version-16-hotfix/pr-55461 
fix: supplier master form cleanup (backport #55461)
 2026-06-23 16:37:47 +05:30
khushi8112
77121f2a41 fix: resolve backport merge conflicts in customer.json 
Keep both customer_type (list view) and the hotfix-only alias field in
field_order; take the newest modified timestamp.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-23 16:14:24 +05:30
khushi8112
a80de9bd01 fix: resolve backport merge conflicts in supplier.json 
Apply form-cleanup label changes while preserving the hotfix-only
no_copy flags and the alias field. Drop removed column_break_44 and
the duplicate is_frozen field_order entry.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-23 16:10:11 +05:30
Nishka Gosalia
be605adbc1 Merge pull request #56351 from frappe/mergify/bp/version-16-hotfix/pr-56350 
fix: handling default company in purchase transactions created from project (backport #56350)
 2026-06-23 12:40:38 +05:30
nishkagosalia
29323cb0b1 fix: company default handling in purchase transactions made from project 
(cherry picked from commit 359717115f)
 2026-06-23 07:08:07 +00:00
MochaMind
17324ec45b chore: sync translations to version-16-hotfix (#56321) 2026-06-23 02:16:25 +05:30
mergify[bot]
f5d05b969b fix: update round off account functions to accept document context for regional overrides (backport #55758) (#55771) 
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
fix: update round off account functions to accept document context for regional overrides (#55758)
 2026-06-22 12:30:09 +00:00
khushi8112
c788106011 fix: add customer type in the list view 
(cherry picked from commit 059f560017)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.json
 2026-06-22 11:42:59 +00:00
khushi8112
8b56b7ba0e fix: customer master form cleanup 
(cherry picked from commit 6f6e17188f)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.json
 2026-06-22 11:42:59 +00:00
khushi8112
2035fac494 fix: supplier status in list view 
(cherry picked from commit 515983e016)
 2026-06-22 11:42:29 +00:00
khushi8112
e5c9e7abdc fix: supplier master form cleanup 
(cherry picked from commit 820c0caf88)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
 2026-06-22 11:42:29 +00:00
Mihir Kandoi
b4f2b6cab2 Merge pull request #56313 from mihir-kandoi/backport-55802-version-16-hotfix 
fix: backport product bundle issue fixes to v16
 2026-06-22 17:04:30 +05:30
Mihir Kandoi
373476042e Merge pull request #56285 from aerele/backport-56204 
fix: add partially transferred status and fix button visibility for partial material transfer on job card
 2026-06-22 16:47:24 +05:30
Mihir Kandoi
c066880978 fix: address product bundle review comments 
(cherry picked from commit d48a1e0d16)
 2026-06-22 16:32:42 +05:30
Mihir Kandoi
7a1def07e9 fix: submittable product bundle issues 
(cherry picked from commit a218b8db8c)
 2026-06-22 16:32:10 +05:30
Nishka Gosalia
0051950afb Merge pull request #56311 from frappe/mergify/bp/version-16-hotfix/pr-56309 
fix: Removing the document naming series dialog and moving to framework (backport #56309)
 2026-06-22 16:23:42 +05:30
nishkagosalia
97279c7e26 fix: removing the document naming series dialog and moving to framework 
(cherry picked from commit aa7402b1e3)
 2026-06-22 10:37:41 +00:00
Mihir Kandoi
0be5ba6bac Merge pull request #56305 from frappe/mergify/bp/version-16-hotfix/pr-56300 
fix: party specific item doesnt work if there are 2 suppliers with sa… (backport #56300)
 2026-06-22 15:54:59 +05:30
Mihir Kandoi
a67b489d17 test: add test case 
(cherry picked from commit 7d205c89ea)
 2026-06-22 09:27:41 +00:00
Mihir Kandoi
3df7a28476 fix: party specific item doesnt work if there are 2 suppliers with same item 
(cherry picked from commit 98f5116a09)
 2026-06-22 09:27:40 +00:00
ruthra kumar
694ebb53ec Merge pull request #56299 from frappe/mergify/bp/version-16-hotfix/pr-55488 
fix: add validation and tests for set_status (backport #55488)
 2026-06-22 14:09:16 +05:30
Mihir Kandoi
9643720858 Merge pull request #56297 from mihir-kandoi/codex/party-alias-v16 
feat: party aliases
 2026-06-22 13:54:24 +05:30
Shllokkk
bcd72a7fec fix: add validation and tests for set_status 
(cherry picked from commit b5a84c5e65)
 2026-06-22 07:51:06 +00:00
Mihir Kandoi
768425ebf1 feat: party aliases 
(cherry picked from commit 5e16d41387)
 2026-06-22 13:16:56 +05:30
Nabin Hait
5d031c0a04 Merge pull request #56289 from frappe/mergify/bp/version-16-hotfix/pr-56288 
ci: Wait for processes to die (backport #56288)
 2026-06-22 12:51:28 +05:30
Ankush Menat
476054f684 ci: Wait for processes to die (#56288) 
(cherry picked from commit 7256fc98e9)
 2026-06-22 06:56:03 +00:00
pandiyan
570ef45e46 fix: add partially transferred status and fix button visibility for partial material transfer on job card 2026-06-22 11:37:41 +05:30
Ravibharathi
2462be0e61 Merge pull request #56200 from frappe/mergify/bp/version-16-hotfix/pr-56155 
fix: fetch party types based on account type in journal entry (backport #56155)
 2026-06-22 10:06:40 +05:30
mergify[bot]
d3631860db fix: clear stale payment rows on non-POS returns so they don't surface in bank reconciliation (backport #55903) (#56171) 
fix: clear stale payment rows on non-POS returns so they don't surface in bank reconciliation (#55903)

(cherry picked from commit 322d4dff25)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/accounts/doctype/sales_invoice/services/pos.py

Co-authored-by: Jatin3128 <jatinsarna8@gmail.com>
 2026-06-22 05:17:33 +05:30
mergify[bot]
3b734f4d5d fix: escape user image url on various templates (backport #56269) (#56271) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix: escape user image url on various templates (#56269)
 2026-06-22 03:00:39 +05:30
Mihir Kandoi
f3307b3ca9 Merge pull request #56206 from aerele/backport-#55807 
fix(stock): allow partial raw material picking/transfer from work order
 2026-06-21 22:23:49 +05:30
mergify[bot]
82e1221dc9 fix(stock): update voucher valuaion rate in sle (backport #55960) (#56263) 
fix(stock): update voucher valuaion rate in sle (#55960)

(cherry picked from commit 130c2594e1)

Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
 2026-06-21 16:41:05 +00:00
Sudharsanan11
4d055d374a test(stock): add test to validate the partial transfer of raw material 2026-06-21 21:57:51 +05:30
Sudharsanan11
8e3fbab94a fix(stock): allow partial raw material picking/transfer from work order 2026-06-21 21:57:51 +05:30
MochaMind
6f9954bb62 chore: update POT file (#56254) 2026-06-21 14:25:56 +02:00
rohitwaghchaure
3f53af8b1f fix: placement of fields (#56257) 2026-06-21 12:00:20 +00:00
rohitwaghchaure
9469889bd5 feat: allocate full actual charge to stock items only (e.g. Freight) (backport #56102) (#56222) 
* feat: allocate full actual charge to stock items only (e.g. Freight)

Backport of #56102 to version-16-hotfix. Adapts the GL valuation-tax change
to the inline make_tax_gl_entries in purchase_receipt.py (no services/ refactor
on hotfix) and additionally applies it to purchase_invoice.py.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix: distribute each Actual valuation charge individually

distribute_actual_tax_amount pooled all "Actual" valuation charges (both
the spread-across-all-items charges and the allocate_full_amount_to_stock_items
freight charges) into single totals before spreading, while the GL path
(get_capitalized_valuation_tax) capitalizes each tax row separately. For
multiple charges over unevenly valued items, pool-then-spread can drift by a
rounding cent from spread-each-then-sum, so a row's item_tax_amount no longer
decomposed exactly into the per-account capitalized GL amounts (the document
total still balanced).

get_tax_details now returns the per-row charge amounts as lists and
distribute_actual_tax_amount spreads each charge on its own, mirroring
get_capitalized_valuation_tax. Per-item valuation now reconciles exactly with
per-account GL credits. Single-charge behaviour is unchanged.

Adds test_multiple_actual_charges_per_item_matches_gl_per_account covering two
freight charges over items of net 100 and 200 (asserts 6.66 / 13.34, which the
old pooled logic would have rounded to 6.67 / 13.33).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-21 16:21:06 +05:30
Mihir Kandoi
6e61ee8d70 Merge pull request #56201 from aerele/backport-#56077 
fix(stock): apply precision to the additional cost amount in stock entry
 2026-06-21 13:44:17 +05:30