nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-19 01:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,071 Commits 608 Branches 1,802 Tags
43b355eaf61f16ef7adf56d4dcb4bf90316d427d
Commit Graph

58071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vorasmit
43b355eaf6 fix: tax.base_tax_amount as none when payment entry created using API 
(cherry picked from commit b9b402f2ec)
 2026-06-19 03:17:58 +00:00
Mihir Kandoi
175aac4156 Merge pull request #56119 from frappe/mergify/bp/version-16-hotfix/pr-56065 
fix(stock): propagate renamed attribute values to variant items (backport #56065)
 2026-06-18 23:16:26 +05:30
Mihir Kandoi
30650f298b Merge pull request #56115 from frappe/mergify/bp/version-16-hotfix/pr-56055 
fix: disable is_debit_note while creating credit note (backport #56055)
 2026-06-18 22:54:51 +05:30
barredterra
3110ab1c57 fix(stock): update variant attributes on value rename 
(cherry picked from commit c7acd88742)
 2026-06-18 17:06:07 +00:00
barredterra
40110d83c9 test(stock): add cleanup for item attribute value changes in tests 
(cherry picked from commit 60f5de7ab8)
 2026-06-18 17:06:07 +00:00
barredterra
dbc831e008 fix(stock): propagate renamed attribute values to variant items 
(cherry picked from commit 27d574dad5)
 2026-06-18 17:06:07 +00:00
Mihir Kandoi
686437bd54 Merge pull request #56117 from frappe/mergify/bp/version-16-hotfix/pr-56098 
fix: apply docstatus filter to exclude cancelled Work Orders in Seria… (backport #56098)
 2026-06-18 22:32:47 +05:30
pandiyan
58d5f39e0a fix: apply docstatus filter to exclude cancelled Work Orders in Serial No 
(cherry picked from commit 3ba8f690a4)
 2026-06-18 16:56:46 +00:00
pandiyan
c7dbedbfdc fix: disable is_debit_note while creating credit note 
(cherry picked from commit 279c8dea06)
 2026-06-18 16:54:21 +00:00
Nikhil Kothari
8e21af0a63 fix: type def in get_linked_payments (#56100) 2026-06-18 14:11:11 +00:00
Shllokkk
87e498cd7d Merge pull request #56088 from Shllokkk/je-pcv-vaidation 
fix(journal entry): validate opening entry against pcv on save
 2026-06-18 18:04:51 +05:30
Shllokkk
f8aa4c730c fix(journal entry): validate opening entry against pcv on save 2026-06-18 16:56:17 +05:30
rohitwaghchaure
a335838691 Merge pull request #56091 from frappe/mergify/bp/version-16-hotfix/pr-56079 
feat: allow negative stock at batch level (backport #56079)
 2026-06-18 16:42:32 +05:30
Rohit Waghchaure
1f075d4bbf feat: add batch-level option to allow negative stock for batch 
(cherry picked from commit ca07982ee0)
 2026-06-18 10:49:45 +00:00
Khushi Rawat
7f441864d6 Merge pull request #56084 from frappe/mergify/bp/version-16-hotfix/pr-56030 
fix: lock budget distribution table and guard against null distributi… (backport #56030)
 2026-06-18 14:34:18 +05:30
Shllokkk
2b28b7e694 fix: lock budget distribution table and guard against null distribution rows 
(cherry picked from commit d37e5cd97d)
 2026-06-18 08:28:37 +00:00
Mihir Kandoi
56d9cbabbf Merge pull request #56049 from aerele/backport-56003 
fix(stock): update transfer status for mixed transfer flows
 2026-06-17 17:20:55 +05:30
pandiyan
4481efec17 test(stock): validate completed status for mixed transfer methods 2026-06-17 16:58:32 +05:30
pandiyan
84a1a51023 fix(stock): update transfer status for mixed transfer flows 2026-06-17 16:58:23 +05:30
Mihir Kandoi
98f45221e6 Merge pull request #56043 from mihir-kandoi/codex/fix-stock-ageing-reco-ageing-v16 
fix: preserve stock ageing on non-serial reconciliation
 2026-06-17 16:20:49 +05:30
Mihir Kandoi
846e0a9f06 fix: preserve stock ageing on non-serial reconciliation 2026-06-17 15:58:47 +05:30
ruthra kumar
6185507614 Merge pull request #56024 from frappe/mergify/bp/version-16-hotfix/pr-55988 
refactor(test): remove dependency on accounts test mixin (backport #55988)
 2026-06-17 07:59:00 +05:30
ruthra kumar
d051407126 refactor(test): remove redundant clear method and minor fixes 
(cherry picked from commit 004087097c)
 2026-06-17 02:11:27 +00:00
ruthra kumar
3d91e021a3 refactor(tests): replace AccountsTestMixin master data setup with direct attribute assignments 
All test classes inheriting AccountsTestMixin that called create_company(),
create_item(), create_customer(), create_supplier(), create_usd_receivable_account(),
and create_usd_payable_account() in setUp() now set instance attributes directly
using master data pre-created by BootStrapTestData, eliminating redundant DB
inserts on every test run.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 1fda0dfb9b)
 2026-06-17 02:11:26 +00:00
Ravibharathi
3586df8ed6 fix: set transaction currency on payment entry gl entries (#55989) 2026-06-17 02:19:56 +05:30
mergify[bot]
f4bf35aa31 fix(company): replaced "this company" with company name on delete transactions dialog (backport #56021) (#56023) 
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:41 +05:30
mergify[bot]
ab856d370a fix: update system manager permissions (backport #55978) (#56005) 
Co-authored-by: nareshkannasln <nareshkannashanmugam@gmail.com>
 2026-06-17 00:56:12 +05:30
mergify[bot]
2bfb5fe8b8 fix: check for bank account permission when updating balance (backport #56016) (#56017) 
fix: check for bank account permission when updating balance (backport #56016)
 2026-06-17 00:54:45 +05:30
rohitwaghchaure
b34373e5da Merge pull request #56009 from frappe/mergify/bp/version-16-hotfix/pr-55983 
fix: provision to recalculate valuation rate during reposting (backport #55983)
 2026-06-16 22:20:30 +05:30
mergify[bot]
7c99018b84 chore(deps): bump vite from 8.0.11 to 8.0.16 in /banking (backport #56007) (#56010) 2026-06-16 16:36:56 +00:00
Rohit Waghchaure
9fcb730090 fix: test case 
(cherry picked from commit e183e32619)
 2026-06-16 15:52:30 +00:00
Rohit Waghchaure
7877c2e2aa test: reset dont_execute_stock_reposts flag in tearDown 
The test_prevention_of_cancelled_transaction_riv test sets
frappe.flags.dont_execute_stock_reposts = True without resetting it,
which leaked into the recalculate_valuation_rate tests and made
repost() a no-op (incoming rate stayed unchanged). Reset the flag
in tearDown so reposts run for subsequent tests.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit 28992eb2f4)
 2026-06-16 15:52:29 +00:00
Rohit Waghchaure
5b61304046 fix: provision to recalculate valuation rate during reposting 
(cherry picked from commit 0ae61c4921)
 2026-06-16 15:52:29 +00:00
mergify[bot]
125bda95ed feat(banking): PDF statement importer and overriding column mapping (backport #55559) (#55993) 2026-06-16 21:08:43 +05:30
Mihir Kandoi
78b7da1a44 Merge pull request #55992 from frappe/mergify/bp/version-16-hotfix/pr-55985 
fix(stock): show only batched items in batch item selector (backport #55985)
 2026-06-16 20:36:34 +05:30
rohitwaghchaure
88717678d3 Merge pull request #55996 from frappe/mergify/bp/version-16-hotfix/pr-55986 
chore: removed redundant validation in SCR (backport #55986)
 2026-06-16 19:45:50 +05:30
rohitwaghchaure
f1e4e651be Merge pull request #55998 from frappe/mergify/bp/version-16-hotfix/pr-55971 
fix: exclude non-stock item's tax value from stock valuation (backport #55971)
 2026-06-16 19:42:23 +05:30
Rohit Waghchaure
3d6c7f4512 fix: exclude non-stock item's tax value from stock valuation 
(cherry picked from commit 13e1f84eb1)
 2026-06-16 13:41:27 +00:00
Rohit Waghchaure
5c14d56a83 chore: removed redundant validation in SCR 
(cherry picked from commit 1b4487450c)
 2026-06-16 13:38:48 +00:00
mergify[bot]
3243e4237a fix(banking): miscellaneous bug fixes (backport #55492) (#55979) 2026-06-16 18:43:19 +05:30
Dharanidharan2813
11b3841418 fix(stock): show only batched items in batch item selector 
(cherry picked from commit 62f6d18143)
 2026-06-16 13:01:19 +00:00
Mihir Kandoi
395e57171e Merge pull request #55967 from frappe/mergify/bp/version-16-hotfix/pr-55852 
fix(bom): allow zero qty for secondary items in BOM (backport #55852)
 2026-06-16 17:27:58 +05:30
Sudharsanan Ashok
ee40f70f37 Merge pull request #55976 from frappe/mergify/bp/version-16-hotfix/pr-55943 
refactor: ignore cancelled GLE's while looking for account (backport #55943)
 2026-06-16 17:26:50 +05:30
Mihir Kandoi
181233d3fe Merge pull request #55977 from frappe/mergify/bp/version-16-hotfix/pr-55851 
feat: add alternate UOM balance columns to Stock Balance report (backport #55851)
 2026-06-16 17:15:16 +05:30
Mihir Kandoi
4f96073d59 fix: bump BOM secondary item metadata timestamp 2026-06-16 16:49:48 +05:30
mergify[bot]
4ba5557a3f fix: remove wrapper for list items in error messages (backport #54848) (#55973) 2026-06-16 11:15:21 +00:00
Dipen Gala
96465a7936 fix: resolve pre-commit formatting and missing UOM in stock balance test 
- Reformat generator expression in add_alt_uom_columns to satisfy ruff
  line-length rule (pre-commit was auto-fixing this and failing CI)
- Create "Carton" UOM before use in test_alt_uom_balance_uses_first_alternate_uom
  to avoid LinkValidationError when "Carton" doesn't exist in test DB

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 987f606b4d)
 2026-06-16 11:13:37 +00:00
Dipen Gala
1349bcc535 refactor(stock-balance): reduce alt UOM to single column, fix i18n, add tests 
- Reduce from 2 alternate UOM columns to 1 (first alt UOM by idx)
- Fix broken translation strings: replace _(f"...{slot}") with
  _("...") — f-strings inside _() are never extracted by bench
  get-untranslated, breaking non-English installations
- Simplify fieldnames: alt_uom_1/alt_uom_1_bal_qty → alt_uom/alt_uom_bal_qty
- Add 4 test cases covering: single alt UOM, no alt UOM, disabled filter,
  and multiple alt UOMs (first-wins behaviour)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 021b807057)
 2026-06-16 11:13:36 +00:00
Dipen Gala
cd1f872912 feat: add alternate UOM balance columns to Stock Balance report 
Closes #52953

The Stock Balance report previously showed balance qty only in the item's
stock UOM. To view balance in an alternate UOM, users had to set the
"Include UOM" filter — which applies a single UOM to all items. This breaks
down when different items use different alternate UOMs (e.g., Pens in Box,
Ink in Milliliters).

This change adds a new "Show Alternate UOM Balance" checkbox filter. When
enabled, up to two alternate UOM columns are injected right after the
Balance Qty column:

  Balance Qty | Alt UOM 1 | Balance Qty (Alt UOM 1) | Alt UOM 2 | Balance Qty (Alt UOM 2)

Each row resolves its own alternate UOMs from `tabUOM Conversion Detail`
(ordered by idx, excluding the item's stock UOM). The converted balance
qty is computed as: stock qty / conversion_factor.

Items with fewer than 2 alternate UOMs leave the extra columns blank.
The existing "Include UOM" filter behaviour is unchanged.

(cherry picked from commit 2d93c5835a)
 2026-06-16 11:13:36 +00:00
ervishnucs
6475df89c9 refactor: ignore cancelled GLE's while looking for account 
(cherry picked from commit 40942401df)
 2026-06-16 11:08:44 +00:00