nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-11 21:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,307 Commits 593 Branches 1,795 Tags
5f5b2a6ae2f5047e9dbfb3e316ccdcbfbc68d9dd
Commit Graph

55307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
5f5b2a6ae2 fix: updated role based permission for terms and conditions doctype (backport #55674) (#55675) 
* fix: updated role based permission for terms and conditions doctype (#55674)

(cherry picked from commit 0ba2961103)

# Conflicts:
#	erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-16 21:30:22 +00:00
mergify[bot]
8a9461ff45 fix(company): replaced "this company" with company name on delete transactions dialog (backport #56021) (#56022) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(company): replaced "this company" with company name on delete transactions dialog (#56021)
 2026-06-17 02:14:05 +05:30
mergify[bot]
64bbc019ad fix(accounts): removed whitelist on get_balance_on (backport #55956) (#55964) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(accounts): removed whitelist on `get_balance_on` (#55956)
 2026-06-16 22:46:15 +05:30
Mihir Kandoi
797e740aea Merge pull request #56001 from aerele/fix/qi-stock-entry-inspection-v15 
fix(stock): enable quality inspection for all Stock Entry purposes
 2026-06-16 21:27:22 +05:30
Mihir Kandoi
8f2bd2b77e Merge pull request #55991 from frappe/mergify/bp/version-15-hotfix/pr-55985 
fix(stock): show only batched items in batch item selector (backport #55985)
 2026-06-16 21:27:06 +05:30
Mihir Kandoi
776031b277 Merge pull request #56004 from frappe/mergify/bp/version-15-hotfix/pr-55978 
fix: update system manager permissions (backport #55978)
 2026-06-16 21:20:14 +05:30
nareshkannasln
81e05fc1f6 fix: update system manager permissions 
(cherry picked from commit 501c8087cb)
 2026-06-16 20:42:53 +05:30
Mihir Kandoi
ebdb23bdda chore: resolve conflicts 2026-06-16 20:37:19 +05:30
Mihir Kandoi
75a8b9097c Merge pull request #55553 from aerele/fix/support-#69882 
fix(manufacturing): fetch raw materials from work order
 2026-06-16 20:35:15 +05:30
Sudharsanan11
1ffef19957 fix(stock): enable quality inspection for all Stock Entry purposes 
Backport of #55830 to version-15.

Allow creating a Quality Inspection from Stock Entries of any purpose
(not just Manufacture). check_item_quality_inspection now returns the
items for Stock Entry, and the inspection type is resolved as "Incoming"
for Manufacture / Material Receipt and "Outgoing" otherwise.

Ref: #70945
 2026-06-16 20:26:21 +05:30
rohitwaghchaure
8a59385b22 Merge pull request #55995 from frappe/mergify/bp/version-15-hotfix/pr-55986 
chore: removed redundant validation in SCR (backport #55986)
 2026-06-16 19:40:59 +05:30
rohitwaghchaure
b15b2e1b2a Merge pull request #55990 from rohitwaghchaure/fixed-recalculate-valuation-rate-in-pr-v15 
fix: provision to recalculate valuation rate during reposting
 2026-06-16 19:38:50 +05:30
Rohit Waghchaure
df0c8ee21e fix: provision to recalculate valuation rate during reposting 2026-06-16 19:09:07 +05:30
Rohit Waghchaure
71c7045b98 chore: removed redundant validation in SCR 
(cherry picked from commit 1b4487450c)
 2026-06-16 13:38:27 +00:00
Dharanidharan2813
7f30a2cfb6 fix(stock): show only batched items in batch item selector 
(cherry picked from commit 62f6d18143)

# Conflicts:
#	erpnext/stock/doctype/batch/batch.json
 2026-06-16 13:00:51 +00:00
Sudharsanan Ashok
ab8b74e3d8 Merge pull request #55975 from frappe/mergify/bp/version-15-hotfix/pr-55943 
refactor: ignore cancelled GLE's while looking for account (backport #55943)
 2026-06-16 16:59:18 +05:30
Sudharsanan11
b22096a640 test(manufacturing): add test to validate the transferred raw materials from work order 2026-06-16 16:55:31 +05:30
ervishnucs
9546ab72e0 refactor: ignore cancelled GLE's while looking for account 
(cherry picked from commit 40942401df)
 2026-06-16 11:08:16 +00:00
Diptanil Saha
8f23f1f180 Revert "fix(budget): add root_type filter on account field (backport #55934)" (#55966) 2026-06-16 15:30:51 +05:30
ruthra kumar
a3a945a12f Merge pull request #55961 from frappe/mergify/bp/version-15-hotfix/pr-53152 
fix: prevent exchange rate flow from transaction to payment (backport #53152)
 2026-06-16 14:38:29 +05:30
ruthra kumar
48bcfc78ea Merge pull request #55954 from frappe/mergify/bp/version-15-hotfix/pr-55934 
fix(budget): add root_type filter on account field (backport #55934)
 2026-06-16 14:10:04 +05:30
ervishnucs
df823432d1 test: resolve failed testcases for exchage rate 
(cherry picked from commit 3b5a203d61)
 2026-06-16 08:33:20 +00:00
ervishnucs
72c7b79933 fix: prevent exchange rate flow from transaction to payment 
(cherry picked from commit 934abe5c6d)
 2026-06-16 08:33:19 +00:00
Shllokkk
e1fbf78409 fix(budget): add root_type filter on account field (#55934) 
(cherry picked from commit 52b406f5f1)

# Conflicts:
#	erpnext/accounts/doctype/budget/budget.js
 2026-06-16 06:17:24 +00:00
Sudharsanan Ashok
2c2adffacf Merge pull request #55939 from frappe/mergify/bp/version-15-hotfix/pr-55928 
fix(stock): update stock value calculation in stock balance report (backport #55928)
 2026-06-15 19:27:28 +05:30
Sudharsanan11
18ad323828 fix(stock): update stock value calculation in stock balance report 
(cherry picked from commit 2492dfa558)
 2026-06-15 12:40:51 +00:00
rohitwaghchaure
4c6667ec30 Merge pull request #55932 from frappe/mergify/bp/version-15-hotfix/pr-55926 
fix: recalculate incoming rate in SLE for purchase documents during repost (backport #55926)
 2026-06-15 17:52:50 +05:30
Rohit Waghchaure
081887bec5 fix: recalculate incoming rate in SLE for purchase documents during repost 
(cherry picked from commit 867ee484b9)
 2026-06-15 11:34:14 +00:00
mergify[bot]
1f47b2417b fix: regression issues related to security fixes (backport #55902) (#55925) 
* fix: regression issues related to security fixes

(cherry picked from commit be1aa0e5eb)

# Conflicts:
#	erpnext/controllers/subcontracting_inward_controller.py
#	erpnext/selling/doctype/sales_order/sales_order.py
#	erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py

* refactor: consolidate duplicate get_party_bank_account into bank_account.py

(cherry picked from commit ede13cb3bd)

* chore: fix conflicts

Removed duplicate import of get_party_bank_account and consolidated imports.

* chore: fix conflicts

Removed the update_subcontracting_order_status method to address regression issues related to security fixes.

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2026-06-15 11:23:08 +00:00
Diptanil Saha
b4be0834f2 Merge pull request #55918 from frappe/mergify/bp/version-15-hotfix/pr-55755 
feat(currency exchange settings): frankfurter v2 support (backport #55755)
 2026-06-15 15:23:53 +05:30
Diptanil Saha
80741ceb67 chore: resolve conflicts 2026-06-15 14:39:29 +05:30
diptanilsaha
9405b49e93 fix(get_exchange_rate): using get_single_value to fetch disabled value from currency_exchange_settings 
(cherry picked from commit abb579e2db)
 2026-06-15 08:53:17 +00:00
diptanilsaha
7b6520664c fix: restricting currency_exchange_settings write permission only to system manager 
(cherry picked from commit 0c2d5488a6)

# Conflicts:
#	erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
 2026-06-15 08:53:17 +00:00
diptanilsaha
64fc3ac309 test: fixed currency exchange test for frankfurter v2 api 
(cherry picked from commit 138f683a68)
 2026-06-15 08:53:16 +00:00
diptanilsaha
d62985d9a7 fix: use frankfurter v2 by default for new install 
(cherry picked from commit 479f9f63c9)
 2026-06-15 08:53:16 +00:00
diptanilsaha
70628c06c9 feat(currency exchange settings): frankfurter v2 support 
(cherry picked from commit 56bfe6b6a6)

# Conflicts:
#	erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
 2026-06-15 08:53:16 +00:00
Mihir Kandoi
75d40651d1 Merge pull request #55907 from frappe/mergify/bp/version-15-hotfix/pr-55906 
fix: show company name in delete transactions confirmation dialog (backport #55906)
 2026-06-15 11:00:32 +05:30
Raghav Ruia
3356583865 fix: show company name in delete transactions confirmation dialog 
Display the actual company name in bold within the confirmation dialog
label so users immediately know which company they must type to confirm,
reducing the risk of accidental data loss.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 87d26a2d67)
 2026-06-15 04:20:25 +00:00
Sudharsanan11
7e9c1efab7 fix(manufacturing): fetch raw materials from work order 2026-06-15 01:03:00 +05:30
mergify[bot]
fe3f44f643 ci: set disabledLabels and context for greptile (backport #55883) (#55884) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-06-13 19:03:30 +00:00
mergify[bot]
8b3a0fe045 fix(Lead): stop storing Gravatar image URLs for Leads (backport #55880) (#55881) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Lead): stop storing Gravatar image URLs for Leads (#55880)
 2026-06-13 18:19:13 +00:00
Mihir Kandoi
3d6a4eebee Merge pull request #55864 from frappe/mergify/bp/version-15-hotfix/pr-55853 
fix: pass source cost center to target cost center (backport #55853)
 2026-06-13 23:43:10 +05:30
rohitwaghchaure
0a3c53b16d Merge pull request #55875 from frappe/mergify/bp/version-15-hotfix/pr-55874 
fix: permission in bom compare tool (backport #55874)
 2026-06-13 19:40:36 +05:30
Rohit Waghchaure
ef3046dca2 fix: permission in bom compare tool 
(cherry picked from commit e6fdb3702a)
 2026-06-13 13:41:00 +00:00
rohitwaghchaure
5addc66301 Merge pull request #55873 from frappe/mergify/bp/version-15-hotfix/pr-55872 
fix: pemission for whitelist functions (backport #55872)
 2026-06-13 19:03:18 +05:30
rohitwaghchaure
08d9b8275d fix: BOM Creator by removing redundant permissions 
Removed unnecessary permission checks for whitelist functions and cleaned up the code.
 2026-06-13 18:46:40 +05:30
rohitwaghchaure
46b3e0c385 fix: clearance date update with permission checks 
Refactor update_clearance_date to check permissions for payment documents before processing entries.
 2026-06-13 18:43:12 +05:30
Rohit Waghchaure
559c95c8a8 fix: pemission for whitelist functions 
(cherry picked from commit dd56e80512)

# Conflicts:
#	erpnext/accounts/doctype/bank_clearance/bank_clearance.py
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.py
#	erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py
 2026-06-13 12:45:31 +00:00
mergify[bot]
d4605771da fix: opportunity creation from contact us page (backport #55841) (#55866) 
* fix: opportunity creation from contact us page (#55841)

(cherry picked from commit c933e34914)

# Conflicts:
#	erpnext/crm/doctype/crm_settings/crm_settings.json
#	erpnext/templates/utils.py

* chore: resolve conflict (crm_settings.json)

* chore: resolve conflicts (send_message)

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-13 09:08:30 +00:00
SandraFrappe
209977f6a3 fix: pass source cost center to target cost center 
(cherry picked from commit 9ea766fc10)
 2026-06-12 15:27:54 +00:00