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 |
|
ravibharathi656
|
4dcd502b76
|
fix: set cost center in taxes if not set
(cherry picked from commit b75940bf0e)
# Conflicts:
# erpnext/public/js/controllers/transaction.js
|
2025-09-29 15:53:19 +05:30 |
|
ruthra kumar
|
19f81c9204
|
Merge pull request #49777 from frappe/mergify/bp/version-15-hotfix/pr-49735
fix(payment entry): trigger currency on account set (backport #49735)
|
2025-09-29 14:56:14 +05:30 |
|
ruthra kumar
|
67b6b3779d
|
Merge pull request #49775 from frappe/mergify/bp/version-15-hotfix/pr-49618
fix: add date filter for getting return invoice items (backport #49618)
|
2025-09-29 14:31:45 +05:30 |
|
ruthra kumar
|
c836016358
|
Merge pull request #49774 from frappe/mergify/bp/version-15-hotfix/pr-49640
fix: include precision in validation (backport #49640)
|
2025-09-29 14:29:45 +05:30 |
|
ravibharathi656
|
84a2596ce5
|
fix(payment entry): trigger currency on account set
(cherry picked from commit 096e74b1ee)
|
2025-09-29 08:58:03 +00:00 |
|
Navin-S-R
|
98bc7b41fc
|
test: validate profit values for later period returns
(cherry picked from commit d5c457b8c5)
# Conflicts:
# erpnext/accounts/report/gross_profit/test_gross_profit.py
|
2025-09-29 14:16:52 +05:30 |
|
l0gesh29
|
abffbcad99
|
fix: include precision in validation
(cherry picked from commit 1de0c46c51)
|
2025-09-29 08:44:29 +00:00 |
|
Navin-S-R
|
bc77704462
|
fix: add date filter for getting return invoice items
(cherry picked from commit 2abb011816)
|
2025-09-29 08:44:28 +00:00 |
|
rohitwaghchaure
|
5abb2d510d
|
Merge pull request #49772 from frappe/mergify/bp/version-15-hotfix/pr-49770
chore: removed print statement (backport #49770)
|
2025-09-29 13:06:44 +05:30 |
|
Rohit Waghchaure
|
ae040024af
|
chore: removed print statement
(cherry picked from commit 324bdcb177)
|
2025-09-29 06:32:32 +00:00 |
|
rohitwaghchaure
|
fe1247dd4b
|
Merge pull request #49758 from frappe/mergify/bp/version-15-hotfix/pr-49757
feat: service expense account in the subcontracting receipt (backport #49757)
|
2025-09-27 10:20:23 +05:30 |
|
rohitwaghchaure
|
84789daf59
|
Merge pull request #49756 from frappe/mergify/bp/version-15-hotfix/pr-49741
fix(stock entry): set expense account from company for manufacture (backport #49741)
|
2025-09-27 10:04:06 +05:30 |
|
rohitwaghchaure
|
cecd177286
|
chore: fix conflicts
Removed fields related to job card and landed cost voucher amount from subcontracting receipt item.
|
2025-09-27 10:03:27 +05:30 |
|
rohitwaghchaure
|
c26ed80d67
|
chore: fix conflicts
|
2025-09-27 10:02:40 +05:30 |
|
rohitwaghchaure
|
15f0c28cda
|
chore: fix conflicts
|
2025-09-27 10:01:53 +05:30 |
|
Rohit Waghchaure
|
ba9b63af49
|
feat: service expense account in the subcontracting receipt
(cherry picked from commit 6e597b9c42)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
# erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
# erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
|
2025-09-26 15:44:26 +00:00 |
|
ravibharathi656
|
9c81f448c8
|
fix: use stock adjustment account if no expense account
(cherry picked from commit b2e109318f)
|
2025-09-26 13:28:43 +00:00 |
|
ravibharathi656
|
50f9521feb
|
fix(stock entry): set expense account from company for manufacture
(cherry picked from commit 06177ffaff)
|
2025-09-26 13:28:43 +00:00 |
|
ruthra kumar
|
0ff32ac554
|
Merge pull request #49738 from frappe/mergify/bp/version-15-hotfix/pr-49717
refactor: improve trial balance performance (backport #49717)
|
2025-09-26 11:58:26 +05:30 |
|
rohitwaghchaure
|
fe72ea6d6b
|
Merge pull request #49739 from frappe/mergify/bp/version-15-hotfix/pr-49734
fix: auto batch not set for raw materials in subcontracting receipt (backport #49734)
|
2025-09-26 11:43:04 +05:30 |
|
rohitwaghchaure
|
62959e5a70
|
chore: fix conflicts
|
2025-09-26 11:21:16 +05:30 |
|
Rohit Waghchaure
|
6c8e8384d5
|
fix: auto batch not set for raw materials in subcontracting receipt
(cherry picked from commit 23f9d4c600)
# Conflicts:
# erpnext/controllers/subcontracting_controller.py
|
2025-09-26 05:07:12 +00:00 |
|
ruthra kumar
|
0c8004530a
|
refactor: improve trial balance performance
(cherry picked from commit cee3813ced)
|
2025-09-26 04:46:00 +00:00 |
|
Raffael Meyer
|
b18afa8bdd
|
chore(Bank Guarante): move to leaner doctype definition (#49737)
|
2025-09-25 22:05:59 +00:00 |
|
rohitwaghchaure
|
6b3bb45900
|
Merge pull request #49728 from frappe/mergify/bp/version-15-hotfix/pr-49725
fix: remove item name in get_item_details (backport #49725)
|
2025-09-25 19:52:28 +05:30 |
|
Kavin
|
d0e511fd2f
|
fix: remove item name to avoid overriding item row name
(cherry picked from commit 47055901c0)
|
2025-09-25 13:23:29 +00:00 |
|
rohitwaghchaure
|
d50538dbf7
|
Merge pull request #49724 from frappe/mergify/bp/version-15-hotfix/pr-49720
perf: reposting for backdated transactions (backport #49720)
|
2025-09-25 18:52:32 +05:30 |
|