Mihir Kandoi
|
ba8a316b06
|
fix: calculate discount percentage if discount amount is specified (#47806)
(cherry picked from commit bb474f4f42)
|
2025-05-31 15:23:21 +00:00 |
|
mergify[bot]
|
3879cbd86d
|
fix: improved indexing for SLE queries. (backport #47194) (#47822)
* fix: improved indexing for SLE queries. (#47194)
(cherry picked from commit b49a835b4c)
# Conflicts:
# erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2025-05-30 15:36:51 +05:30 |
|
mergify[bot]
|
9df3b9b059
|
fix: incorrect actual qty in product bundle balance report (backport #47791) (#47814)
fix: incorrect actual qty in product bundle balance report (#47791)
(cherry picked from commit c544c3e018)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2025-05-30 14:01:32 +05:30 |
|
ruthra kumar
|
0131800df2
|
Merge pull request #47808 from frappe/mergify/bp/version-15-hotfix/pr-47794
fix: use `query.walk() `for escaping special chars in receiable/payable report (backport #47794)
|
2025-05-29 14:07:34 +05:30 |
|
ljain112
|
2e3ebec53c
|
fix: use query.walk() for escaping special chars in receiable/payable report
(cherry picked from commit a0a51b5074)
|
2025-05-29 08:21:18 +00:00 |
|
mergify[bot]
|
ef9ccd7a57
|
chore: removed orphaned function (backport #47796) (#47804)
chore: removed orphaned function (#47796)
(cherry picked from commit cb9e6f6655)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2025-05-29 12:25:08 +05:30 |
|
Mihir Kandoi
|
903d9b50fe
|
Merge pull request #47798 from frappe/mergify/bp/version-15-hotfix/pr-47792
feat: show item name for raw materials in BOM creator (backport #47792)
|
2025-05-28 20:28:51 +05:30 |
|
Mihir Kandoi
|
0c612be6fe
|
feat: show item name for raw materials in BOM creator
(cherry picked from commit 90ba4ad1e1)
|
2025-05-28 14:23:24 +00:00 |
|
ruthra kumar
|
893a86e173
|
Merge pull request #47777 from frappe/mergify/bp/version-15-hotfix/pr-47041
fix: Check `return_against` and Await API Call (backport #47041)
|
2025-05-28 10:57:56 +05:30 |
|
Sanket322
|
5a23d7cdca
|
fix: ensure backend response is awaited before saving
(cherry picked from commit c48db0b7c0)
|
2025-05-28 03:56:00 +00:00 |
|
Sanket322
|
8623a5650b
|
fix: check return_against exists before api call
(cherry picked from commit 00b6b97197)
|
2025-05-28 03:56:00 +00:00 |
|
mergify[bot]
|
73bc57f53e
|
Revert "fix: translate_pos_buttons" (backport #47773) (#47774)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: translate_pos_buttons" (#47773)
|
2025-05-27 21:11:49 +02:00 |
|
mergify[bot]
|
9192913832
|
feat: add column "Item Name" to "BOM Stock Report" (backport #47116) (#47485)
Co-authored-by: Patrick Eißler <77415730+PatrickDEissler@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2025-05-27 19:21:41 +02:00 |
|
ruthra kumar
|
0f5c7d95a0
|
Merge pull request #47772 from frappe/mergify/bp/version-15-hotfix/pr-47766
fix: handle multiselect filters for tree doctypes in Customer Ledger Summary Report (backport #47766)
|
2025-05-27 20:09:05 +05:30 |
|
ljain112
|
f783bf60a4
|
fix: handle multiselect filters for tree doctypes in Customer Ledger Summary Report
(cherry picked from commit 536f7d5ff8)
|
2025-05-27 14:24:08 +00:00 |
|
ruthra kumar
|
4c49ab19d6
|
Merge pull request #47769 from frappe/mergify/bp/version-15-hotfix/pr-47765
fix: use pypika object `LiteralValue` for adding match conditions (backport #47765)
|
2025-05-27 19:52:20 +05:30 |
|
ruthra kumar
|
de1afee75a
|
Merge pull request #47770 from frappe/mergify/bp/version-15-hotfix/pr-47767
fix: add no_copy for lost reasons (backport #47767)
|
2025-05-27 19:52:04 +05:30 |
|
l0gesh29
|
db97dbd394
|
fix: add no_copy for lost reasons
(cherry picked from commit 98e889a516)
|
2025-05-27 12:33:50 +00:00 |
|
ljain112
|
fb2df77da2
|
fix: use pypika object LiteralValue for adding match conditions
(cherry picked from commit 9093e5e363)
|
2025-05-27 12:31:16 +00:00 |
|
ruthra kumar
|
260073f14a
|
Merge pull request #47764 from frappe/mergify/bp/version-15-hotfix/pr-47763
feat: add validation for Item Tax Template on rate change (backport #47763)
|
2025-05-27 17:14:54 +05:30 |
|
Karuppasamy923
|
92d5e91e1f
|
feat: add validation for Item Tax Template on rate change
(cherry picked from commit a9a957edc7)
|
2025-05-27 11:30:15 +00:00 |
|
mergify[bot]
|
4fd1af2118
|
fix: patch to set status cancelled for already cancelled pos invoices (backport #47725) (#47759)
* fix: patch to set status cancelled for already cancelled pos invoices (#47725)
(cherry picked from commit 4d1d66e579)
# Conflicts:
# erpnext/patches.txt
* chore: resolve conflict
---------
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-05-27 15:55:40 +05:30 |
|
Khushi Rawat
|
5997e37454
|
Merge pull request #47754 from khushi8112/asset-value-adjustment-of-zero-cost
fix: updated value after depreciation after value adjustment
|
2025-05-27 15:28:11 +05:30 |
|
Khushi Rawat
|
63ba27e359
|
fix: do not update same field twice
|
2025-05-27 15:10:51 +05:30 |
|
ruthra kumar
|
fd19f284c4
|
Merge pull request #47755 from frappe/mergify/bp/version-15-hotfix/pr-47679
fix: setting paid amount to 0 when is_paid is unchecked in purchase invoice (backport #47679)
|
2025-05-27 14:37:21 +05:30 |
|
Khushi Rawat
|
74e29f1218
|
fix: made changes specifically for value adjustment entry
|
2025-05-27 14:14:30 +05:30 |
|
ruthra kumar
|
5dee1d40ac
|
Merge pull request #47753 from frappe/mergify/bp/version-15-hotfix/pr-47736
fix: only include advances within the tcs period (backport #47736)
|
2025-05-27 14:11:01 +05:30 |
|
ljain112
|
895231a8a7
|
fix: setting paid amount to 0 when is_paid is unchecked in purchase invoice
(cherry picked from commit e358a9e53f)
|
2025-05-27 08:32:33 +00:00 |
|
Khushi Rawat
|
8ed6e98565
|
fix: updated value after depreciation after value adjustment
|
2025-05-27 13:34:03 +05:30 |
|
ruthra kumar
|
70f9c13f3c
|
Merge pull request #47751 from frappe/mergify/bp/version-15-hotfix/pr-47737
fix: party account based on party type's account type (backport #47737)
|
2025-05-27 13:31:39 +05:30 |
|
ljain112
|
a2f5975133
|
fix: only include advances within the tcs period
(cherry picked from commit 477ec9fdcc)
|
2025-05-27 07:49:19 +00:00 |
|
ljain112
|
d3d22f699e
|
fix: party account based on party type's account type
(cherry picked from commit 19b1650522)
|
2025-05-27 07:44:13 +00:00 |
|
mergify[bot]
|
60dfe36195
|
fix: create Quality Inspection button not showing (backport #47746) (#47750)
fix: create Quality Inspection button not showing (#47746)
(cherry picked from commit d8cb073eaf)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2025-05-27 13:06:32 +05:30 |
|
ruthra kumar
|
b9698366c3
|
Merge pull request #47747 from frappe/mergify/bp/version-15-hotfix/pr-47654
fix: show general ledger in doc currency in Process Statement Of Accounts (backport #47654)
|
2025-05-27 12:01:48 +05:30 |
|
ruthra kumar
|
1fb4ac44fe
|
Merge pull request #47748 from frappe/mergify/bp/version-15-hotfix/pr-47659
fix: translate_pos_buttons (backport #47659)
|
2025-05-27 11:52:27 +05:30 |
|
mahsem
|
0f2264658f
|
fix: prettier
(cherry picked from commit 2839fc9460)
|
2025-05-27 06:12:19 +00:00 |
|
mahsem
|
fe78bb60c4
|
fix: space
(cherry picked from commit 50a5b51909)
|
2025-05-27 06:12:19 +00:00 |
|
mahsem
|
194e41a2d9
|
fix: space
(cherry picked from commit a442ec4e80)
|
2025-05-27 06:12:19 +00:00 |
|
mahsem
|
2c8db092a0
|
fix: prettier
(cherry picked from commit 1953c8489c)
|
2025-05-27 06:12:19 +00:00 |
|
mahsem
|
c44493fd7e
|
fix: linter
(cherry picked from commit 4a6b5b9993)
|
2025-05-27 06:12:18 +00:00 |
|
mahsem
|
01b0d1057e
|
fix: translate_pos_buttons
(cherry picked from commit ce45d1664d)
|
2025-05-27 06:12:18 +00:00 |
|
ljain112
|
9d2f396d75
|
chore: update test case because currency is auto set to system currency
(cherry picked from commit 22a94d6817)
|
2025-05-27 06:11:09 +00:00 |
|
ljain112
|
b3cbbf2ce3
|
fix: show general ledger in doc currency in Process Statement Of Accounts
(cherry picked from commit 998f6a29a4)
|
2025-05-27 06:11:09 +00:00 |
|
ruthra kumar
|
0cbb7223be
|
Merge pull request #47742 from frappe/mergify/bp/version-15-hotfix/pr-47697
refactor: Fetch party name for contract (backport #47697)
|
2025-05-26 19:56:31 +05:30 |
|
ruthra kumar
|
c09b258d57
|
chore: resolve conflicts
|
2025-05-26 17:48:11 +05:30 |
|
ruthra kumar
|
d5d1a51b92
|
refactor: patch old contract with full party name
(cherry picked from commit 8e2221178b)
# Conflicts:
# erpnext/patches.txt
|
2025-05-26 12:11:31 +00:00 |
|
ruthra kumar
|
9abac4c6df
|
refactor: fetch party name on selection
(cherry picked from commit 752024e222)
|
2025-05-26 12:11:31 +00:00 |
|
ruthra kumar
|
48f786e493
|
refactor: full name field in contract
(cherry picked from commit 016924361a)
# Conflicts:
# erpnext/crm/doctype/contract/contract.json
|
2025-05-26 12:11:30 +00:00 |
|
mergify[bot]
|
a137944955
|
fix: patch to rename group_by filter in custom reports (backport #47709) (#47730)
* fix: patch to rename group_by filter in custom reports
(cherry picked from commit 0d19c18c06)
# Conflicts:
# erpnext/patches.txt
* fix: using python instead of sql query
(cherry picked from commit 48eccb1f73)
* chore: resolve conflict
---------
Co-authored-by: diptanilsaha <diptanil@frappe.io>
|
2025-05-26 13:29:41 +05:30 |
|
ruthra kumar
|
bb54bebe94
|
Merge pull request #47726 from frappe/mergify/bp/version-15-hotfix/pr-47253
fix: display stock value in currency format in chart warehouse wise stock value (backport #47253)
|
2025-05-26 11:35:46 +05:30 |
|