Commit Graph

57988 Commits

Author SHA1 Message Date
Ejaaz Khan
74da0bebae Merge pull request #55891 from frappe/mergify/bp/version-16-hotfix/pr-53949
feat: sticky columns in reports (backport #53949)
2026-06-15 13:00:39 +05:30
Mihir Kandoi
03ba4821d2 Merge pull request #55908 from frappe/mergify/bp/version-16-hotfix/pr-55906
fix: show company name in delete transactions confirmation dialog (backport #55906)
2026-06-15 11:00:45 +05:30
Raghav Ruia
6a3c973b0f 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:40 +00:00
rohitwaghchaure
e59c0e5c33 Merge pull request #55902 from rohitwaghchaure/regression-security-fixes-v16-hotfix
fix: regression issues related to security fixes
2026-06-15 00:11:02 +05:30
Rohit Waghchaure
ede13cb3bd refactor: consolidate duplicate get_party_bank_account into bank_account.py 2026-06-14 23:52:06 +05:30
Rohit Waghchaure
be1aa0e5eb fix: regression issues related to security fixes 2026-06-14 23:41:59 +05:30
MochaMind
70bb23d65b chore: update POT file (#55893) 2026-06-14 13:09:56 +02:00
Ejaaz Khan
bcd38c17d6 fix: semgrep translation issue
(cherry picked from commit df753676c6)
2026-06-14 08:39:09 +00:00
Ejaaz Khan
331715815c feat: sticky columns in reports
Co-authored-by: diptanilsaha <diptanil@frappe.io>
(cherry picked from commit 03e4df7a1a)
2026-06-14 08:39:09 +00:00
rohitwaghchaure
5961020ef3 Merge pull request #55888 from frappe/mergify/bp/version-16-hotfix/pr-55877
feat: Allow to edit stock UOM qty for Stock Entry (backport #55877)
2026-06-14 10:12:50 +05:30
Rohit Waghchaure
ece43bd79b feat: Allow to edit stock UOM qty for Stock Entry
(cherry picked from commit b0e9ad198f)
2026-06-14 04:25:06 +00:00
mergify[bot]
d69464ebdf ci: set disabledLabels and context for greptile (backport #55883) (#55885)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2026-06-13 19:06:13 +00:00
mergify[bot]
0b03f18a39 fix(Lead): stop storing Gravatar image URLs for Leads (backport #55880) (#55882)
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:24:32 +00:00
Mihir Kandoi
b9e0c8ece8 Merge pull request #55879 from frappe/mergify/bp/version-16-hotfix/pr-55868
feat(invoices): add tooltip description to Update Stock checkbox (backport #55868)
2026-06-13 23:27:23 +05:30
Dipen Gala
12be63229a feat(invoices): add tooltip description to Update Stock checkbox (#55868)
* feat(invoices): add tooltip description to Update Stock checkbox

Adds a description below the Update Stock checkbox on both Sales Invoice
and Purchase Invoice so users understand when to use the field without
consulting documentation.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat(invoices): replace Update Stock description with hover info tooltip

Removes the inline description text and adds an ℹ icon next to the
Update Stock checkbox label on both Sales Invoice and Purchase Invoice.
Hovering the icon shows the contextual tooltip via Bootstrap tooltip.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(invoices): use Frappe native tooltip-content class for Update Stock icon

Replace Bootstrap .tooltip() (pure black bg) with Frappe's own
.tooltip-content CSS class so the hover tooltip matches the rest of
the ERPNext UI — uses var(--bg-dark-gray) and var(--text-dark).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(invoices): use frappe.ui.SidebarCard for Update Stock info tooltip

Replace custom CSS tooltip with the same SidebarCard + Popper approach
Frappe's InfoCard uses for field description tooltips — gives the native
ERPNext card appearance (white card, border, shadow) on hover.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* refactor(invoices): use built-in field description for Update Stock tooltip

Replace custom SidebarCard JS tooltip with Frappe's native
description + show_description_on_click field property on the
update_stock field in Sales Invoice and Purchase Invoice.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: remove duplicate description in purchase_invoice update_stock field

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* revert: restore custom tooltip in purchase_invoice.js

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* revert: remove all changes from purchase_invoice.js

Keep purchase_invoice.js identical to upstream develop.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit a9029f83c7)
2026-06-13 15:19:31 +00:00
rohitwaghchaure
957d69e57b Merge pull request #55876 from frappe/mergify/bp/version-16-hotfix/pr-55874
fix: permission in bom compare tool (backport #55874)
2026-06-13 19:40:22 +05:30
Rohit Waghchaure
c3b66bce1e fix: permission in bom compare tool
(cherry picked from commit e6fdb3702a)
2026-06-13 13:41:16 +00:00
rohitwaghchaure
c92cae8003 Merge pull request #55872 from rohitwaghchaure/fixed-permissions-for-whitelist-functions-v16
fix: pemission for whitelist functions
2026-06-13 18:14:36 +05:30
Rohit Waghchaure
dd56e80512 fix: pemission for whitelist functions 2026-06-13 17:54:59 +05:30
mergify[bot]
85e6b8d27b fix: opportunity creation from contact us page (backport #55841) (#55867)
* fix: opportunity creation from contact us page (#55841)

(cherry picked from commit c933e34914)

# Conflicts:
#	erpnext/templates/utils.py

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
2026-06-13 09:04:23 +00:00
Mihir Kandoi
afb94c0d0d Merge pull request #55865 from frappe/mergify/bp/version-16-hotfix/pr-55853
fix: pass source cost center to target cost center (backport #55853)
2026-06-12 21:16:54 +05:30
SandraFrappe
558415b1e7 fix: pass source cost center to target cost center
(cherry picked from commit 9ea766fc10)
2026-06-12 15:28:18 +00:00
rohitwaghchaure
1e78ed489c Merge pull request #55858 from frappe/mergify/bp/version-16-hotfix/pr-55844
fix: permissions in workstation file (backport #55844)
2026-06-12 17:58:42 +05:30
rohitwaghchaure
11c7a35eae chore: fix linters issue 2026-06-12 17:17:03 +05:30
rohitwaghchaure
d04965b6b2 chore: fix conflicts 2026-06-12 16:51:57 +05:30
Rohit Waghchaure
0fea93388d fix: permissions in workstation file
(cherry picked from commit cf127e8900)

# Conflicts:
#	erpnext/manufacturing/doctype/workstation/workstation.py
2026-06-12 10:36:17 +00:00
rohitwaghchaure
a7dfc55d02 Merge pull request #55831 from frappe/mergify/bp/version-16-hotfix/pr-55827
fix: multiple issues related to BOM Creator (backport #55827)
2026-06-12 08:36:55 +05:30
Rohit Waghchaure
b616206848 fix: converted whitelist non class methods to class methods 2026-06-12 08:19:09 +05:30
Mihir Kandoi
621561087e Merge pull request #55840 from frappe/mergify/bp/version-16-hotfix/pr-55838
fix(stock): make uom mandatory in item uom table (backport #55838)
2026-06-12 07:11:49 +05:30
pandiyan
7f8c7d2f44 fix(stock): make uom mandatory in item uom table
(cherry picked from commit a0177fdbe8)
2026-06-11 18:10:49 +00:00
Mihir Kandoi
f4b35cc28e Merge pull request #55834 from frappe/mergify/bp/version-16-hotfix/pr-55820
fix: show user disable audit log (backport #55820)
2026-06-11 21:49:54 +05:30
Mihir Kandoi
a83002aae6 fix: sync employee user status after save 2026-06-11 20:58:35 +05:30
rohitwaghchaure
cf5e6da0a6 chore: fix conflicts 2026-06-11 20:32:16 +05:30
pandiyan
ca61e5a214 fix: show user disable audit log
(cherry picked from commit 73d1852773)
2026-06-11 15:01:51 +00:00
Mihir Kandoi
53ebfc7dc8 Merge pull request #55815 from frappe/mergify/bp/version-16-hotfix/pr-55813
fix(bom): fetch routing operations when Routing is selected (backport #55813)
2026-06-11 20:31:21 +05:30
Rohit Waghchaure
c10a331a22 fix: multiple issues related to BOM Creator
(cherry picked from commit daf3f2e142)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.py
2026-06-11 14:16:15 +00:00
rohitwaghchaure
34cfc049fd Merge pull request #55821 from rohitwaghchaure/fixed-github-55757
fix: create_raw_materials_supplied method not found
2026-06-11 15:43:00 +05:30
Rohit Waghchaure
d51ad0d19f fix: create_raw_materials_supplied method not found 2026-06-11 14:54:45 +05:30
ruthra kumar
0850a53642 Merge pull request #55567 from frappe/mergify/bp/version-16-hotfix/pr-55491
fix: remove ignore_permissions from get_party_details signature (backport #55491)
2026-06-11 13:44:34 +05:30
ruthra kumar
7e3be8c8c0 chore: resolve conflict 2026-06-11 13:25:35 +05:30
mergify[bot]
c06046df8f fix: added doctype filter validation for sales person wise transaction summary report (backport #55812) (#55818)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix: added doctype filter validation for sales person wise transaction summary report (#55812)
2026-06-11 07:12:27 +00:00
Shllokkk
b2e7fd7957 fix: remove ignore_permissions from get_party_details signature (#55491)
(cherry picked from commit efb8336bf8)
2026-06-11 12:39:53 +05:30
ruthra kumar
75ee0ca2d2 Merge pull request #55696 from kaulith/fix/ar-report-user-permissions-v16
fix: apply user permissions to receivable/payable reports
2026-06-11 12:27:45 +05:30
ruthra kumar
9c987724d5 Merge pull request #55731 from frappe/mergify/bp/version-16-hotfix/pr-55487
fix: add validations in accounts whitelisted methods (backport #55487)
2026-06-11 12:25:19 +05:30
Mohammad Umair Sayed
f3caed378b fix(bom): fetch routing operations when Routing is selected (#55813)
fix(bom): fetch routing operations when routing is selected

frm.doc.operations is always an array in Frappe, so !frm.doc.operations
was always false (empty array [] is truthy in JS), causing get_routing()
to never fire when a Routing is selected on a BOM with no existing
operations.

Changed the guard to !frm.doc.operations.length so the fetch triggers
correctly when the operations table is empty.

Also wired the same fetch into the with_operations handler so that
enabling the checkbox after a Routing is already set will populate
operations without requiring the user to re-select the Routing.

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>
(cherry picked from commit 9249fa89aa)
2026-06-11 06:25:53 +00:00
Mihir Kandoi
07bb633c13 Merge pull request #55805 from mihir-kandoi/product-bundle-disabled-v16
feat(selling): surface and respect disabled Product Bundles (backport #55791)
2026-06-10 21:58:33 +05:30
Mihir Kandoi
dbc62276d6 refactor: drop redundant disabled filter on child query
`parent_items` already comes from the disabled-filtered parent query,
and on v16 an item has at most one bundle, so the child query cannot
reach a disabled bundle.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 21:38:27 +05:30
Mihir Kandoi
65ee57849a Merge pull request #55772 from frappe/mergify/bp/version-16-hotfix/pr-55769
fix: show inactive product bundles in item where used (backport #55769)
2026-06-10 19:48:56 +05:30
Mihir Kandoi
b1895e9a9a fix: adapt Product Bundle queries to v16 schema
On version-16-hotfix, Product Bundle has no `is_active` field and is not
submittable (docstatus is always 0), so the backported queries crashed
with "Unknown column 'is_active'" and would otherwise have matched no
rows. Keep v16's `docstatus: 0` and derive activity from `disabled`, as
the surrounding build_row calls already do.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 19:29:42 +05:30
Mihir Kandoi
0c1a5082bd feat(selling): surface and respect disabled Product Bundles (backport #55791)
Partial backport of frappe/erpnext#55791 to version-16-hotfix. On v16,
Product Bundle is neither submittable nor versioned and every resolution
path (packing, POS, item details, selling controller) already filters
`disabled: 0`, so only the user-facing gaps are backported:

- the "Get Items from Product Bundle" dialog no longer offers disabled
  bundles
- list view indicator: Disabled (grey) / Active (green)
- Product Bundle Balance report excludes disabled bundles
- `disabled` field gets a description, standard filter and no_copy (a
  copied bundle starts enabled)

The develop-only parts (un-deprecating the field, `is_active`/docstatus
handling, the version picker filter and the disabled-version validation
on transaction rows) have no v16 equivalent and are intentionally
dropped.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 19:28:29 +05:30