ruthra kumar
187ebaaecd
Merge pull request #46582 from frappe/version-15-hotfix
...
chore: release v15
2025-03-19 16:46:43 +05:30
rohitwaghchaure
a2cb9c1791
Merge pull request #46615 from frappe/mergify/bp/version-15-hotfix/pr-46608
...
fix: fetch bom_no when updating items in sales order (backport #46608 )
2025-03-19 16:31:38 +05:30
rohitwaghchaure
0d8842e387
Merge pull request #46614 from frappe/mergify/bp/version-15-hotfix/pr-46573
...
Fix set landed cost based on pi (backport #46573 )
2025-03-19 16:31:09 +05:30
rohitwaghchaure
38213b31da
chore: fix conflicts
2025-03-19 15:47:43 +05:30
Mihir Kandoi
e5b2801830
fix: remove duplicate
...
(cherry picked from commit 386df968c2 )
# Conflicts:
# erpnext/public/js/utils.js
2025-03-19 10:15:18 +00:00
Mihir Kandoi
41d8b26dd2
fix: fetch bom_no when updating items in sales order
...
(cherry picked from commit 508727a57a )
# Conflicts:
# erpnext/public/js/utils.js
2025-03-19 10:15:18 +00:00
rohitwaghchaure
5b802ae527
chore: fix conflicts
2025-03-19 15:35:26 +05:30
rohitwaghchaure
1b8e8e92ae
Merge pull request #46611 from frappe/mergify/bp/version-15-hotfix/pr-46595
...
fix: not able to make PR against stand alone Debit Note (backport #46595 )
2025-03-19 15:28:57 +05:30
Mihir Kandoi
ec1a3a1e6b
fix: take function call outside loop
...
(cherry picked from commit b3c400f998 )
2025-03-19 09:52:28 +00:00
Mihir Kandoi
36ffc2ee67
fix: patch
...
(cherry picked from commit 7e669c0728 )
2025-03-19 09:52:28 +00:00
Mihir Kandoi
56bc26aecc
fix: set landed cost based on purchase invoice rate
...
(cherry picked from commit 75ab5f2bd0 )
# Conflicts:
# erpnext/patches.txt
2025-03-19 09:52:27 +00:00
Rohit Waghchaure
d62960e925
fix: not able to make PR against stand alone Debit Note
...
(cherry picked from commit 6a52c30591 )
2025-03-19 08:05:33 +00:00
ruthra kumar
c6de50b2a5
Merge pull request #46606 from frappe/mergify/bp/version-15-hotfix/pr-46596
...
fix: debit in transaction currency (backport #46596 )
2025-03-19 12:11:09 +05:30
Rohit Waghchaure
8e19b46bd9
fix: debit in transaction currency
...
(cherry picked from commit e4acf20a62 )
2025-03-19 06:26:26 +00:00
rohitwaghchaure
f6a4855e7f
Merge pull request #46594 from frappe/mergify/bp/version-15-hotfix/pr-46593
...
test: test case for FIFO batch valuation (backport #46593 )
2025-03-18 21:23:03 +05:30
Rohit Waghchaure
95718acc9a
test: test case for FIFO batch valuation
...
(cherry picked from commit ad9ac1f058 )
2025-03-18 13:50:36 +00:00
rohitwaghchaure
2528acd803
Merge pull request #46592 from frappe/mergify/bp/version-15-hotfix/pr-46588
...
fix: SABB validation for packed items (backport #46588 )
2025-03-18 18:38:50 +05:30
Rohit Waghchaure
2d6626e906
fix: SABB validation for packed items
...
(cherry picked from commit 3756bf231b )
2025-03-18 12:03:18 +00:00
rohitwaghchaure
a07eb556cf
Merge pull request #46584 from frappe/mergify/bp/version-15-hotfix/pr-46575
...
fix: fetch quality inspection parameter group (backport #46575 )
2025-03-18 17:28:33 +05:30
rohitwaghchaure
48edc86845
Merge pull request #46587 from frappe/mergify/bp/version-15-hotfix/pr-46576
...
fix: repost future sle and gle after capitalization (backport #46576 )
2025-03-18 17:27:56 +05:30
rohitwaghchaure
7f5ce4f29d
Merge pull request #46585 from frappe/mergify/bp/version-15-hotfix/pr-46554
...
fix: add validation to rename_subcontracting_fields patch (backport #46554 )
2025-03-18 17:27:20 +05:30
rohitwaghchaure
cd7056842d
Merge pull request #46589 from frappe/mergify/bp/version-15-hotfix/pr-46579
...
fix: valuation for moving average with batches (backport #46579 )
2025-03-18 17:26:41 +05:30
Rohit Waghchaure
5f1bb1f1ba
fix: valuation for moving average with batches
...
(cherry picked from commit cdfbc73f4c )
2025-03-18 11:05:06 +00:00
rohitwaghchaure
79dacfdef8
Merge pull request #46560 from frappe/mergify/bp/version-15-hotfix/pr-46555
...
fix: performance issue for item list view (backport #46555 )
2025-03-18 16:34:00 +05:30
Khushi Rawat
2144f89624
fix: repost future sle and gle after capitalization ( #46576 )
...
(cherry picked from commit 29d77aa19f )
2025-03-18 10:31:47 +00:00
Mihir Kandoi
bc408d979a
fix: add validation to rename_subcontracting_fields patch
...
(cherry picked from commit 6c3117dc0d )
2025-03-18 10:30:41 +00:00
rohitwaghchaure
496f43e7e9
Merge pull request #46556 from frappe/st33974
...
fix: incorrect production item and bom no in job card
2025-03-18 15:58:26 +05:30
Mihir Kandoi
cd0abbae51
fix: fetch quality inspection parameter group
...
(cherry picked from commit 0a482c7ea8 )
2025-03-18 10:27:30 +00:00
Smit Vora
004ecc53e5
Merge pull request #46578 from frappe/mergify/bp/version-15-hotfix/pr-46515
...
fix: ensure qty conversion when creating production plan from SO (backport #46515 )
2025-03-18 15:00:34 +05:30
Smit Vora
8162fb3e5d
fix: ensure qty conversion when creating production plan from SO
...
(cherry picked from commit 75882cc81c )
2025-03-18 08:56:21 +00:00
rohitwaghchaure
e8047ab2ca
chore: fix conflicts
2025-03-18 12:01:11 +05:30
rohitwaghchaure
8dc371dac2
Merge pull request #46558 from frappe/mergify/bp/version-15-hotfix/pr-46553
...
fix: not able to select the item in the BOM (backport #46553 )
2025-03-18 11:59:56 +05:30
rohitwaghchaure
0351faa8c0
Merge pull request #46559 from frappe/mergify/bp/version-15-hotfix/pr-46552
...
fix: Debit and Credit not equal for Purchase Invoice (backport #46552 )
2025-03-18 11:59:38 +05:30
ruthra kumar
7e46845fea
Merge pull request #46572 from frappe/mergify/bp/version-15-hotfix/pr-46566
...
fix: set correct currency for offset account gl entries (backport #46566 )
2025-03-18 11:32:05 +05:30
ruthra kumar
e84333e5f2
Merge pull request #46571 from frappe/mergify/bp/version-15-hotfix/pr-46508
...
fix: use base currency total for UAE VAT 201 report (backport #46508 )
2025-03-18 11:24:29 +05:30
ruthra kumar
e6dd3f3e64
fix: set correct currency for offset account gl entries
...
(cherry picked from commit c32e11e69d )
2025-03-18 05:45:13 +00:00
ruthra kumar
ec43ca97cb
test: report ouput on foreign currency PI
...
(cherry picked from commit e80129627a )
2025-03-18 05:30:10 +00:00
ruthra kumar
3e2749d6d5
fix: use base currency total
...
(cherry picked from commit 46f4babcd0 )
2025-03-18 05:30:09 +00:00
mergify[bot]
01bab8f22b
perf: faster count estimation (backport #46550 ) ( #46551 )
...
perf: faster count estimation (#46550 )
These count queries themselves take quite a long time. `estimate_count`
uses info_schema stats to guess the time.
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
(cherry picked from commit e47a87839b )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2025-03-17 21:23:30 +05:30
Ejaaz Khan
972c96b682
Merge pull request #46565 from frappe/mergify/bp/version-15-hotfix/pr-46564
...
refactor: remove default print format from sales invoice (backport #46564 )
2025-03-17 20:52:46 +05:30
Ejaaz Khan
7cfd7e6539
refactor: remove default print format from sales invoice
...
(cherry picked from commit f10d1f2b1f )
2025-03-17 14:38:43 +00:00
ruthra kumar
bcd9fd090d
Merge pull request #46562 from frappe/mergify/bp/version-15-hotfix/pr-46557
...
fix(Transaction Deletion Record): sql syntax error while deleting lead address (backport #46557 )
2025-03-17 17:00:37 +05:30
venkat102
ea68caec7d
fix(Transaction Deletion Record): sql syntax error while fetching lead address
...
(cherry picked from commit af0d6eeae8 )
2025-03-17 11:09:38 +00:00
Rohit Waghchaure
34d6e4bdaa
fix: performance issue for item list view
...
(cherry picked from commit d758fde881 )
# Conflicts:
# erpnext/stock/doctype/item_default/item_default.json
2025-03-17 11:08:38 +00:00
rohitwaghchaure
c7b8514c24
Merge pull request #46549 from frappe/mergify/bp/version-15-hotfix/pr-46504
...
fix: dashboard link for QC from PR (backport #46504 )
2025-03-17 16:37:21 +05:30
Rohit Waghchaure
46b6e621c2
fix: Debit and Credit not equal for Purchase Invoice
...
(cherry picked from commit ecb31b7c9f )
2025-03-17 11:07:17 +00:00
Rohit Waghchaure
59c653ef3f
fix: not able to select the item in the BOM
...
(cherry picked from commit 96d0cd23f1 )
2025-03-17 11:07:16 +00:00
Mihir Kandoi
d071a6c900
fix: incorrect production item and bom no in job card
2025-03-17 16:06:54 +05:30
ruthra kumar
61e126901e
Merge pull request #46523 from frappe/revert-46475-mergify/bp/version-15-hotfix/pr-46417
...
Revert "fix: error when creating delivery note from pick list (backport #46417 )"
2025-03-17 15:15:10 +05:30
Rohit Waghchaure
426222d8e0
fix: dashboard link for QC from PR
...
(cherry picked from commit 551f89f14b )
2025-03-17 04:36:59 +00:00