nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-11 13:41:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,395 Commits 592 Branches 1,795 Tags
3f00a0ffa9c03e891643f17b86a9ca9182c6e7f6
Commit Graph

55395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pandiyan
3f00a0ffa9 test: add tests for non stock item over billing against so/po 2026-06-28 00:23:04 +05:30
pandiyan
bba7fe9831 fix: skip qty over-allowance check for non-stock items only 2026-06-28 00:23:04 +05:30
mergify[bot]
db8a26a3af fix: precision issue causing COGS in inter transfer PR (backport #56420) (#56424) 
fix: precision issue causing COGS in inter transfer PR (#56420)

(cherry picked from commit 9b0e1b61f2)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-24 18:30:14 +05:30
Mihir Kandoi
b80fb47d6e Merge pull request #56429 from frappe/mergify/bp/version-15-hotfix/pr-55191 
refactor(sales_person_wise_transaction_summary): Replace SQL with que… (backport #55191)
 2026-06-24 16:43:17 +05:30
Loic Oberle
2585712500 refactor(sales_person_wise_transaction_summary): Replace SQL with que… (#55191) 
(cherry picked from commit df3d0859a1)
 2026-06-24 10:44:17 +00:00
ruthra kumar
6d12a2aaf7 Merge pull request #56418 from frappe/mergify/bp/version-15-hotfix/pr-56417 
refactor: configurable timeout on process pcv (backport #56417)
 2026-06-24 15:26:17 +05:30
ruthra kumar
df3c821f98 chore: resolve conflicts 2026-06-24 15:05:41 +05:30
ruthra kumar
c33d7e5d7b 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:30 +00:00
ruthra kumar
c97be8abe1 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)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 2026-06-24 07:58:30 +00:00
Diptanil Saha
a38da57c9e Merge branch 'version-15' into version-15-hotfix 2026-06-24 02:41:55 +05:30
mergify[bot]
334a0b2137 fix(pos): remove redundant opening balance dialog onchange handler (backport #54591) (#56402) 
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:29 +05:30
mergify[bot]
cef608d043 fix(payment_entry): recompute base amount when exchange rate changes (backport #56136) (#56397) 
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:10:54 +05:30
mergify[bot]
53a11229ec fix(budget): ambiguous error message for budget assignment validation (backport #56390) (#56391) 
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(budget): ambiguous error message for budget assignment validation (#56390)
 2026-06-23 19:49:07 +00:00
Shllokkk
094bdf2d3e Merge pull request #56385 from frappe/mergify/bp/version-15-hotfix/pr-56337 
fix: show contextual balance label on party dashboard for net balances (backport #56337)
 2026-06-23 23:31:19 +05:30
mergify[bot]
66d0a60140 feat(crm_settings)!: enable frappe crm data synchronization (backport #56268) (#56383) 
* feat(crm_settings): enable frappe crm data synchronization (#56268)

(cherry picked from commit 0ab812c3ec)

# Conflicts:
#	erpnext/crm/frappe_crm_api.py

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-23 22:02:47 +05:30
Shllokkk
9b6adc42b6 fix: show contextual balance label on party dashboard for net balances 
(cherry picked from commit 3251b40365)
 2026-06-23 15:53:02 +00:00
Mihir Kandoi
e5894b67bc Merge pull request #56373 from frappe/mergify/bp/version-15-hotfix/pr-56364 
fix(manufacturing): make item_code mandatory in Job Card Item (backport #56364)
 2026-06-23 19:36:33 +05:30
pandiyan
1b4da9dc96 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:32:41 +00:00
Khushi Rawat
f75e7a3dc8 Merge pull request #55548 from frappe/mergify/bp/version-15-hotfix/pr-55484 
fix: use fiscal year instead of calendar year in accounting dashboard number cards (backport #55484)
 2026-06-23 16:50:55 +05:30
khushi8112
f106513005 fix: resolve backport conflict in accounting dashboard number cards 
Resolved Mergify backport conflicts (PR #55548 / backport of #55484) by
taking the final upstream state: fiscal-year posting_date Between filter
with calendar-year fallback, Timespan filter removed.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-23 16:32:16 +05:30
mergify[bot]
506658c3a6 fix: attribute error because of missing margin_type field in Supplier Quotation (backport #48089) 
* fix: add missing margin related fields

(cherry picked from commit 67f96c66e4)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json

* chore: fix conflict

---------

Co-authored-by: iamkhanraheel <raheel@frappe.io>
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
 2026-06-23 14:49:58 +05:30
Lakshit Jain
4048f0666e Merge pull request #55770 from frappe/mergify/bp/version-15-hotfix/pr-55758 
fix: update round off account functions to accept document context for regional overrides (backport #55758)
 2026-06-22 18:13:50 +05:30
ljain112
42121f2e36 fix: simplify get_round_off_applicable_accounts function signature 2026-06-22 17:40:57 +05:30
Mihir Kandoi
94d7d8f9d6 Merge pull request #56287 from aerele/backport-56203 
fix: add partially transferred status and fix button visibility for p…
 2026-06-22 16:48:04 +05:30
ruthra kumar
5ca37b8c37 Merge pull request #56298 from frappe/mergify/bp/version-15-hotfix/pr-55488 
fix: add validation and tests for set_status (backport #55488)
 2026-06-22 13:58:43 +05:30
Shllokkk
7bea925230 fix: add validation and tests for set_status 
(cherry picked from commit b5a84c5e65)
 2026-06-22 07:50:39 +00:00
pandiyan
1f5283da58 fix: add partially transferred status and fix button visibility for partial material transfer on job card 2026-06-22 11:51:33 +05:30
mergify[bot]
37d26222d7 fix: clear stale payment rows on non-POS returns so they don't surface in bank reconciliation (backport #55903) (#56169) 
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 <140256508+Jatin3128@users.noreply.github.com>
 2026-06-22 05:17:49 +05:30
mergify[bot]
42af4ce7b0 fix: escape user image url on various templates (backport #56269) (#56270) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix: escape user image url on various templates (#56269)
 2026-06-22 03:00:50 +05:30
Mihir Kandoi
67925bde42 Merge pull request #56264 from frappe/mergify/bp/version-15-hotfix/pr-56206 
fix(stock): allow partial raw material picking/transfer from work order (backport #56206)
 2026-06-22 01:12:01 +05:30
Sudharsanan11
e6d45e35c7 test(stock): add test to validate the partial transfer of raw material 
(cherry picked from commit 4d055d374a)
 2026-06-21 23:36:43 +05:30
Sudharsanan11
a858d77461 fix(stock): allow partial raw material picking/transfer from work order 
(cherry picked from commit 8e3fbab94a)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/work_order.py
 2026-06-21 23:36:43 +05:30
mergify[bot]
37f847e730 fix(stock): update voucher valuaion rate in sle (backport #55960) (#56262) 
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 22:07:38 +05:30
Mihir Kandoi
3d46ae7cbc Merge pull request #56248 from frappe/mergify/bp/version-15-hotfix/pr-56201 
fix(stock): apply precision to the additional cost amount in stock entry (backport #56201)
 2026-06-21 14:01:45 +05:30
Sudharsanan11
deb11745e5 test(stock): add test to validate the precision for additional cost amount 
(cherry picked from commit 20b14395e3)
 2026-06-21 08:14:47 +00:00
Sudharsanan11
acc1444c03 fix(stock): apply precision to the additional cost amount in stock entry 
(cherry picked from commit 6ac699d3bb)
 2026-06-21 08:14:47 +00:00
Diptanil Saha
a0c062af90 Merge pull request #56193 from frappe/mergify/bp/version-15-hotfix/pr-56191 
fix: added missing permission validation on whitelisted function and removed unnecessary whitelisted decorator (backport #56191)
 2026-06-20 20:19:27 +05:30
diptanilsaha
7a04f031d9 chore: resolve conflicts 2026-06-20 20:00:29 +05:30
diptanilsaha
0efebf5d8c fix(report_utils): remove unnecessary whitelist decorator on get_invoiced_item_gross_margin 
(cherry picked from commit e29535f29c)

# Conflicts:
#	erpnext/accounts/report/utils.py
 2026-06-20 20:00:29 +05:30
diptanilsaha
041a9adbbf fix(err): add missing permission check on get_account_details 
(cherry picked from commit 9bf1e847d2)
 2026-06-20 20:00:23 +05:30
ruthra kumar
7b6dd42aa1 Merge pull request #56158 from frappe/mergify/bp/version-15-hotfix/pr-55265 
fix: update reference doctype mapping and field visibility in bank guarantee (backport #55265)
 2026-06-19 17:54:27 +05:30
nareshkannasln
e556cbbe6a fix: update reference doctype mapping and field visibility in bank guarantee 
(cherry picked from commit b1de654dfd)

# Conflicts:
#	erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
 2026-06-19 16:57:18 +05:30
Mihir Kandoi
ad9c16073e Merge pull request #56035 from aerele/fix/dashboard-party-dynamic-links 2026-06-19 11:09:39 +05:30
Smit Vora
ce2560e2fe Merge pull request #56122 from frappe/mergify/bp/version-15-hotfix/pr-56104 
fix: base_tax_amount as none when payment entry created using API (backport #56104)
 2026-06-19 09:25:41 +05:30
vorasmit
37dffa7273 fix: tax.base_tax_amount as none when payment entry created using API 
(cherry picked from commit b9b402f2ec)
 2026-06-19 03:17:39 +00:00
Mihir Kandoi
3ef6475249 Merge pull request #56114 from frappe/mergify/bp/version-15-hotfix/pr-56055 
fix: disable is_debit_note while creating credit note (backport #56055)
 2026-06-18 22:53:32 +05:30
Mihir Kandoi
6deff470d8 Merge pull request #56065 from barredterra/item-update-attribute-value 
fix(stock): propagate renamed attribute values to variant items
 2026-06-18 22:35:17 +05:30
Mihir Kandoi
03cda066a5 Merge pull request #56116 from frappe/mergify/bp/version-15-hotfix/pr-56098 
fix: apply docstatus filter to exclude cancelled Work Orders in Seria… (backport #56098)
 2026-06-18 22:30:44 +05:30
pandiyan
90fd057fb3 fix: apply docstatus filter to exclude cancelled Work Orders in Serial No 
(cherry picked from commit 3ba8f690a4)
 2026-06-18 16:56:24 +00:00
pandiyan
e4370ab332 fix: disable is_debit_note while creating credit note 
(cherry picked from commit 279c8dea06)
 2026-06-18 16:54:01 +00:00