Rohit Waghchaure
|
a83331bd2f
|
fix: optimize SQL query by adding index on batch
(cherry picked from commit 8756f91857)
|
2025-10-04 05:30:10 +00:00 |
|
Mihir Kandoi
|
fe0739aadf
|
Merge pull request #49868 from frappe/mergify/bp/version-15-hotfix/pr-49867
fix: failing patch (backport #49867)
|
2025-10-04 00:33:18 +05:30 |
|
Mihir Kandoi
|
0dad1957c8
|
fix: failing patch
(cherry picked from commit 41d1703e7c)
|
2025-10-03 10:02:09 +00:00 |
|
rohitwaghchaure
|
bf39ae6db0
|
Merge pull request #49856 from frappe/mergify/bp/version-15-hotfix/pr-49806
fix: validate transfer_qty based on overproduction wo percentage (backport #49806)
|
2025-10-02 22:43:52 +05:30 |
|
Khushi Rawat
|
09bcff13ad
|
Merge pull request #49522 from KerollesFathy/clear-custodian-when-asset-take-backed
fix: clear asset custodian when asset take back from employee without assign to another employee
|
2025-10-02 22:16:35 +05:30 |
|
rohitwaghchaure
|
b91fb6b280
|
Merge pull request #49855 from frappe/mergify/bp/version-15-hotfix/pr-49850
fix: add default scrap warehouse in wo (backport #49850)
|
2025-10-02 20:22:20 +05:30 |
|
Kavin
|
0fec34e886
|
test: test overproduction allowed qty in wo
(cherry picked from commit b527d38bfa)
|
2025-10-02 14:36:24 +00:00 |
|
Kavin
|
b6d57ff8a5
|
fix: set fg_completed_qty based upon fg item qty
(cherry picked from commit 526b850e61)
|
2025-10-02 14:36:24 +00:00 |
|
Kavin
|
7ce97ce0c2
|
fix: validate transfer_qty based on overproduction wo percentage
(cherry picked from commit 4024d8846b)
|
2025-10-02 14:36:23 +00:00 |
|
Kavin
|
a5ed9fdc67
|
fix: add default scrap warehouse in wo
(cherry picked from commit 7e51346946)
|
2025-10-02 14:35:22 +00:00 |
|
mergify[bot]
|
5e5850d89a
|
refactor(Supplier): custom buttons call make methods (backport #49840) (#49842)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2025-10-02 00:16:34 +02:00 |
|
Diptanil Saha
|
56aa86f77e
|
Merge pull request #49839 from diptanilsaha/backport_49496
fix(Accounts Payable Summary): add a missing translate function (backport #49496)
|
2025-10-02 00:24:42 +05:30 |
|
Diptanil Saha
|
f321725b49
|
Merge pull request #49496 from elshafei-developer/Add-a-missing-translate-function
fix(Accounts Payable Summary): add a missing translate function
|
2025-10-02 00:07:06 +05:30 |
|
Diptanil Saha
|
4e3697284e
|
Merge pull request #49838 from diptanilsaha/backport_49820
fix: financial ratios translation and pdf export error (backport #49820)
|
2025-10-01 23:57:09 +05:30 |
|
Mihir Kandoi
|
3f9fbb7b75
|
Merge pull request #49833 from frappe/mergify/bp/version-15-hotfix/pr-49832
|
2025-10-01 19:13:21 +05:30 |
|
Mihir Kandoi
|
e21baec246
|
fix: Add try-finally for setting buying price list
(cherry picked from commit 35a8d02866)
|
2025-10-01 13:27:40 +00:00 |
|
Mihir Kandoi
|
a2bf53ff0a
|
fix: too many writes on patch run
(cherry picked from commit 44ff6ed6a1)
|
2025-10-01 13:27:40 +00:00 |
|
ruthra kumar
|
06cd48feaa
|
Merge pull request #49823 from frappe/mergify/bp/version-15-hotfix/pr-49689
fix(accounting): ensure proper removal of advance references during u… (backport #49689)
|
2025-10-01 12:56:19 +05:30 |
|
Pandiyan P
|
825ccd3422
|
fix(accounting): ensure proper removal of advance references during unreconcillation
(cherry picked from commit a7ec01bf21)
|
2025-10-01 06:40:55 +00:00 |
|
rohitwaghchaure
|
c56da286f7
|
Merge pull request #49811 from frappe/mergify/bp/version-15-hotfix/pr-49750
fix: get unconsumed qty as per BOM required qty (backport #49750)
|
2025-09-30 22:19:55 +05:30 |
|
Khushi Rawat
|
a7577d428f
|
Merge pull request #49817 from khushi8112/backport-v15-pr-43093
feat: validating asset scrap date (backport #43093)
|
2025-09-30 21:23:26 +05:30 |
|
Khushi Rawat
|
e81b85b241
|
chore: resolve conflict
|
2025-09-30 21:02:39 +05:30 |
|
rahulgupta8848
|
0eb76f4d2c
|
feat: validating asset scrap date (#43093)
* feat: validating asset scrap date
* refactor: refactorization of scrap asset function
---------
Co-authored-by: “rahulgupta8848” <“rahul.gupta@8848digital.com”>
(cherry picked from commit e07bc5af41)
# Conflicts:
# erpnext/assets/doctype/asset/asset.js
|
2025-09-30 21:02:15 +05:30 |
|
rohitwaghchaure
|
0fb5f75e93
|
chore: fix conflicts
Removed the test for additional material transfer in work orders.
|
2025-09-30 18:43:38 +05:30 |
|
rohitwaghchaure
|
4847e24553
|
Merge branch 'version-15' into version-15-hotfix
|
2025-09-30 18:38:20 +05:30 |
|
Kavin
|
f548f0b231
|
test: required_qty clamping in manufacture entry
(cherry picked from commit 34d2c8d9c2)
# Conflicts:
# erpnext/manufacturing/doctype/work_order/test_work_order.py
|
2025-09-30 12:28:34 +00:00 |
|
Kavin
|
82386b18aa
|
fix: get unconsumed qty as per BOM qty
(cherry picked from commit cf4b395ee3)
|
2025-09-30 12:28:33 +00:00 |
|
rohitwaghchaure
|
bbbcb456ce
|
Merge pull request #49810 from frappe/mergify/bp/version-15-hotfix/pr-49803
fix: valuation rate for old batch (backport #49803)
|
2025-09-30 17:50:13 +05:30 |
|
rohitwaghchaure
|
4c78f9b9cb
|
Merge pull request #49807 from frappe/mergify/bp/version-15-hotfix/pr-49794
fix: don't recalculate stock_qty with conversion_factor (backport #49794)
|
2025-09-30 17:12:18 +05:30 |
|
Rohit Waghchaure
|
37a03f10ab
|
fix: valuation rate for old batch
(cherry picked from commit d864d166f9)
|
2025-09-30 11:42:15 +00:00 |
|
rohitwaghchaure
|
c2dd37a89e
|
Merge pull request #49808 from frappe/mergify/bp/version-15-hotfix/pr-49766
fix: use sales_order from data instead of doc (backport #49766)
|
2025-09-30 17:12:07 +05:30 |
|
rohitwaghchaure
|
f458faa819
|
Merge pull request #49809 from frappe/mergify/bp/version-15-hotfix/pr-49748
fix: update item details only in draft state (backport #49748)
|
2025-09-30 17:11:56 +05:30 |
|
Kavin
|
30f6b53240
|
fix: update item details only in draft state
(cherry picked from commit 689172ff22)
|
2025-09-30 11:08:59 +00:00 |
|
Kavin
|
7ee82813fd
|
fix: use sales_order from data instead of doc
(cherry picked from commit 9f9120451b)
|
2025-09-30 11:06:48 +00:00 |
|
Kavin
|
c88a277ad9
|
fix: don't recalculate stock_qty with conversion_factor
(cherry picked from commit fed8236919)
|
2025-09-30 11:03:47 +00:00 |
|
rohitwaghchaure
|
9e73d083b5
|
Merge pull request #49793 from frappe/mergify/bp/version-15-hotfix/pr-49790
fix: update subcontracted_quantity with set_value (backport #49790)
|
2025-09-30 16:32:13 +05:30 |
|
rohitwaghchaure
|
03c8d92796
|
Merge pull request #49792 from frappe/mergify/bp/version-15-hotfix/pr-49791
refactor: convert item warehouse based reposting (backport #49791)
|
2025-09-30 16:31:57 +05:30 |
|
ruthra kumar
|
31ad9a6346
|
Merge pull request #49805 from frappe/mergify/bp/version-15-hotfix/pr-49639
fix(Credit-limit): consider current voucher for credit limit validation (backport #49639)
|
2025-09-30 16:30:17 +05:30 |
|
PRASATHRAJA
|
fc40a3c376
|
Merge pull request #49639 from aerele/credit-limit-jv
fix(Credit-limit): consider current voucher for credit limit validation
(cherry picked from commit 4a01c53cca)
|
2025-09-30 10:39:35 +00:00 |
|
ruthra kumar
|
b8e3db0179
|
Merge pull request #49800 from frappe/mergify/bp/version-15-hotfix/pr-49799
fix: do not validate cost center in cancelled gl entry (backport #49799)
|
2025-09-30 15:14:11 +05:30 |
|
ljain112
|
366bb8269c
|
fix: do not validate cost center in cancelled gl entry
(cherry picked from commit 29cbddbc77)
|
2025-09-30 09:04:24 +00:00 |
|
venkat102
|
3975627b33
|
fix: convert with flt
(cherry picked from commit 81614939ab)
|
2025-09-29 16:20:27 +00:00 |
|
venkat102
|
f706811757
|
fix: use get_value instead of get_doc
(cherry picked from commit 89a603f20c)
|
2025-09-29 16:20:26 +00:00 |
|
venkat102
|
17e415d03a
|
fix: update subcontracted_quantity with set_value
(cherry picked from commit ea63bfc9af)
|
2025-09-29 16:20:26 +00:00 |
|
Rohit Waghchaure
|
8911bad792
|
refactor: convert item-wh based reposting
(cherry picked from commit 8411e4c5b2)
|
2025-09-29 16:20:25 +00:00 |
|
ruthra kumar
|
a30c481ca1
|
Merge pull request #49787 from frappe/mergify/bp/version-15-hotfix/pr-49773
fix(bank transaction): change reference number to small text (backport #49773)
|
2025-09-29 17:15:06 +05:30 |
|
ravibharathi656
|
5a0bf7a5e1
|
fix(bank transaction): change reference number to small text
(cherry picked from commit 90f399d0fc)
# Conflicts:
# erpnext/accounts/doctype/bank_transaction/bank_transaction.json
|
2025-09-29 16:59:31 +05:30 |
|
ruthra kumar
|
f135954944
|
Merge pull request #49784 from frappe/mergify/bp/version-15-hotfix/pr-49708
feat: add show zero value filter in profit and loss and balance sheet (backport #49708)
|
2025-09-29 16:47:54 +05:30 |
|
ravibharathi656
|
c32ad9711f
|
feat: add show zero value filter in profit and loss and balance sheet
(cherry picked from commit 33ab24943c)
# Conflicts:
# erpnext/accounts/report/balance_sheet/balance_sheet.js
# erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
|
2025-09-29 16:32:21 +05:30 |
|
ruthra kumar
|
f6842041c9
|
Merge pull request #49782 from frappe/mergify/bp/version-15-hotfix/pr-49718
fix: set cost center in taxes if not set (backport #49718)
|
2025-09-29 16:26:35 +05:30 |
|