Commit Graph

57963 Commits

Author SHA1 Message Date
Dipen Gala
6949f23c7f fix: remove unnecessary expense head warning for purchase invoices with update stock
When a Purchase Invoice is created with `update_stock = 1`, the system
automatically replaces the item's expense account with the correct
inventory account for perpetual inventory. This is expected behaviour,
but a `frappe.msgprint` warning was being shown to the user:

  "Expense Head changed to Stock In Hand because account Cost of Goods
   Sold is not linked to warehouse Stores or it is not the default
   inventory account."

The message is purely informational, provides no actionable guidance,
and confuses users who deliberately enable Update Stock. The underlying
account substitution logic is unchanged; only the popup is suppressed.

The two other `msgprint` calls (for the Purchase-Receipt-linked and
no-Purchase-Receipt flows) are intentionally preserved — those surface
a genuine change in behaviour that users may not expect.

Fixes: https://github.com/frappe/erpnext/issues/...
(cherry picked from commit 224dff32df)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/services/expense_account.py
2026-06-12 08:02:54 +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
Nabin Hait
9c8fff648f Merge pull request #55795 from frappe/mergify/bp/version-16-hotfix/pr-55789
fix: prefetch batchwise valuations before streaming SLEs in stock ageing (backport #55789)
2026-06-10 12:14:33 +05:30
Nabin Hait
1bfb0c8e5a Merge pull request #55676 from frappe/mergify/bp/version-16-hotfix/pr-55674
fix: updated role based permission for terms and conditions doctype (backport #55674)
2026-06-10 12:13:45 +05:30
Nabin Hait
9dd0a9fd90 Merge pull request #55680 from frappe/mergify/bp/version-16-hotfix/pr-55679
fix: set options Email for customer_email field in appointment (backport #55679)
2026-06-10 11:44:49 +05:30
Mihir Kandoi
018f06d8d1 fix: prefetch batchwise valuations before streaming SLEs in stock ageing
Stock Ageing iterates stock ledger entries through an unbuffered
(streaming) cursor. _get_batchwise_valuation() lazily queried
Batch.use_batchwise_valuation from inside that loop whenever a row
carried the legacy batch_no field, and the nested query invalidated
the active streaming result set — crashing the report (or silently
dropping the remaining rows, depending on the driver version).

Resolve the valuation flags in a single query before entering the
unbuffered cursor block; the lazy lookup now only serves callers that
pass stock ledger entries in directly, where no streaming is active.

Fixes https://github.com/frappe/erpnext/issues/55786

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
(cherry picked from commit 060a5c4eeb)
2026-06-10 06:08:03 +00:00
Nabin Hait
4fe7e958bf Merge pull request #55721 from frappe/mergify/bp/version-16-hotfix/pr-55627
fix(inactive_customers): add allowlist for doctype filter and migrate… (backport #55627)
2026-06-10 11:27:24 +05:30
Mihir Kandoi
8e25189d7d chore: resolve conflicts 2026-06-10 10:14:23 +05:30
mergify[bot]
e15879acd1 fix(process statement of accounts): validate pdf_name and validate permission before triggering send_auto_email (backport #55781) (#55783)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(process statement of accounts): validate pdf_name and validate permission before triggering send_auto_email (#55781)
2026-06-09 19:11:44 +00:00
rohitwaghchaure
01e90830f1 Merge pull request #55766 from rohitwaghchaure/fixed-github-55621-v16
fix: Stock Reservation blocks Subcontracting operation within the same work order
2026-06-09 20:00:20 +05:30
Rohit Waghchaure
1c0dace3d6 fix: Stock Reservation blocks Subcontracting operation within the same Work Order 2026-06-09 19:40:45 +05:30
Mihir Kandoi
e48ffe6ef0 fix: handle multi-select stock ageing filters (#55775) 2026-06-09 13:52:32 +00:00
MochaMind
8ff6fc5fea chore: sync translations to version-16-hotfix (#55739) 2026-06-09 13:19:55 +00:00
Pandiyan P
e90a6ecf1c fix: restrict already invoiced qty in intercompany purchase invoice (#55768) 2026-06-09 13:16:22 +00:00
mergify[bot]
9a6fae9fdd fix(taxes): add category and add_deduct_tax fields to tax entries (backport #55753) (#55773)
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
fix(taxes): add category and add_deduct_tax fields to tax entries (#55753)
2026-06-09 12:59:13 +00:00
mergify[bot]
7904385b90 fix: prevent leakage of party-derived fields in cross doctype transactions (backport #55336) (#55579)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
fix: prevent leakage of party-derived fields in cross doctype transactions (#55336)
2026-06-09 18:03:26 +05:30
Mihir Kandoi
2bea9ae2a5 fix: show inactive product bundles in item where used (#55769)
(cherry picked from commit 6201fefdfb)

# Conflicts:
#	erpnext/stock/report/item_where_used/item_where_used.py
2026-06-09 12:29:19 +00:00
rohitwaghchaure
f0e51b35a6 Merge pull request #55762 from frappe/mergify/bp/version-16-hotfix/pr-55760
fix: don't allow to submit job card with hold status (backport #55760)
2026-06-09 15:15:39 +05:30
rohitwaghchaure
60a270acd4 chore: fix conflicts
Removed validation for completed quantity matching in job card.
2026-06-09 14:56:39 +05:30
Rohit Waghchaure
b4c850da1c fix: don't allow to submit job card with hold status
(cherry picked from commit 9c23229cbf)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
2026-06-09 09:01:09 +00:00
ruthra kumar
9b1cdd0e8f Merge pull request #55729 from frappe/mergify/bp/version-16-hotfix/pr-55486
Validations in CRM-api endpoints (backport #55486)
2026-06-09 10:31:49 +05:30
rohitwaghchaure
26a19bf372 Merge pull request #55752 from frappe/mergify/bp/version-16-hotfix/pr-55748
fix: sql injection (backport #55748)
2026-06-09 09:49:00 +05:30
rohitwaghchaure
10cfac865e chore: fix conflicts 2026-06-09 09:48:38 +05:30
Rohit Waghchaure
02a29a85a7 fix: sql injection
(cherry picked from commit bd0acf4413)
2026-06-09 03:58:34 +00:00
rohitwaghchaure
6e7a96eae9 Merge pull request #55744 from frappe/mergify/bp/version-16-hotfix/pr-55737
fix: allow specific methods to run (backport #55737)
2026-06-09 09:27:46 +05:30
Rohit Waghchaure
dd837052ef fix: linter issue 2026-06-08 23:17:29 +05:30
rohitwaghchaure
95818ec71d chore: fix conflicts
Removed redundant quantity assignments and completion time logging from job card processing.
2026-06-08 20:08:16 +05:30