mergify[bot]
|
e607795bae
|
fix: do not validate stock during inward (backport #44417) (#44427)
fix: do not validate stock during inward (#44417)
(cherry picked from commit d37d7b9811)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-11-29 15:49:18 +05:30 |
|
ruthra kumar
|
821f39203c
|
Merge pull request #44391 from frappe/mergify/bp/version-15-hotfix/pr-44386
fix: Add translation for showing mandatory fields in error msg (backport #44386)
|
2024-11-29 15:38:35 +05:30 |
|
ruthra kumar
|
35e365c263
|
Merge pull request #44425 from frappe/mergify/bp/version-15-hotfix/pr-44302
fix: Minor Updates in `Payment Request` and `Payment Entry` (backport #44302)
|
2024-11-29 15:38:01 +05:30 |
|
ruthra kumar
|
1c50111371
|
chore: resolve conflict
|
2024-11-29 14:50:41 +05:30 |
|
Abdeali Chharchhoda
|
5999a8e24f
|
fix: Add filter for outstanding_amount to fetch open PRs
(cherry picked from commit 214dfab269)
|
2024-11-29 09:11:11 +00:00 |
|
Abdeali Chharchhoda
|
4b046160f8
|
refactor: Move PR link filters to client side
(cherry picked from commit 2db2c8bce1)
|
2024-11-29 09:11:11 +00:00 |
|
Abdeali Chharchhoda
|
9c4b5814a6
|
revert: remove default Payment Request indicator color
(cherry picked from commit 37ceb09955)
# Conflicts:
# erpnext/accounts/doctype/payment_request/payment_request_list.js
|
2024-11-29 09:11:11 +00:00 |
|
Abdeali Chharchhoda
|
0d67c62f43
|
fix: Dashboard for Payment Request
(cherry picked from commit 91955e27c3)
|
2024-11-29 09:11:10 +00:00 |
|
Abdeali Chharchhoda
|
5f785ede16
|
refactor: Used object to get payment request status indicator
(cherry picked from commit e1c4d6e1e6)
# Conflicts:
# erpnext/accounts/doctype/payment_request/payment_request_list.js
|
2024-11-29 09:11:10 +00:00 |
|
ruthra kumar
|
5b2fce2df7
|
Merge pull request #44419 from frappe/mergify/bp/version-15-hotfix/pr-42524
fix: link cash flow rows and fix summary linking (backport #42524)
|
2024-11-29 12:22:51 +05:30 |
|
ruthra kumar
|
ae81bb3c1b
|
chore: revert 'stub'
|
2024-11-29 10:52:38 +05:30 |
|
ruthra kumar
|
48d6fcaab8
|
chore: resolve conflict
|
2024-11-29 10:43:36 +05:30 |
|
David
|
633be8d06b
|
fix: link cash flow rows and fix summary linking
(cherry picked from commit b94af28587)
# Conflicts:
# erpnext/public/js/financial_statements.js
|
2024-11-29 05:00:48 +00:00 |
|
Khushi Rawat
|
651d7e4cfc
|
Merge pull request #44402 from frappe/mergify/bp/version-15-hotfix/pr-44400
fix: IndexError in Asset Depreciation Ledger when query result is empty (backport #44400)
|
2024-11-28 18:59:11 +05:30 |
|
Smit Vora
|
0084f45629
|
Merge pull request #44410 from frappe/mergify/bp/version-15-hotfix/pr-44195
fix: Data Should be Computed in Backend to Maintain Consistent Behaviour (backport #44195)
|
2024-11-28 16:27:05 +05:30 |
|
Ninad Parikh
|
8ab9fc7f55
|
fix: Data Should be Computed in Backend to Maintain Consistent Behaviour (#44195)
(cherry picked from commit 69bd90b038)
|
2024-11-28 10:31:27 +00:00 |
|
ruthra kumar
|
11c54d27f2
|
Merge pull request #44407 from frappe/mergify/bp/version-15-hotfix/pr-44405
fix: typeerror on transaction.js (backport #44405)
|
2024-11-28 15:02:04 +05:30 |
|
ruthra kumar
|
173d60fb7d
|
fix: typeerror on transaction.js
(cherry picked from commit 46ce8780f2)
|
2024-11-28 09:20:38 +00:00 |
|
Khushi Rawat
|
5bbef90f08
|
chore: removed print statement
(cherry picked from commit 1737de7c10)
|
2024-11-28 07:27:42 +00:00 |
|
Khushi Rawat
|
c3bc724523
|
fix: IndexError in Asset Depreciation Ledger when query result is empty
(cherry picked from commit 7c393e5aa0)
|
2024-11-28 07:27:42 +00:00 |
|
mergify[bot]
|
0fbc60a20e
|
fix: show "Send SMS" only when enabled (backport #43941) (#43970)
fix: show "Send SMS" only when enabled (#43941)
(cherry picked from commit 65088cbb1b)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2024-11-27 23:52:16 +01:00 |
|
mergify[bot]
|
70b5b08d58
|
feat: add Company Contact Person in selling transactions (backport #44362) (#44398)
* feat: add Company Contact Person in selling transactions (#44362)
(cherry picked from commit f6776c7d6b)
* chore: resolve merge conflicts
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2024-11-27 18:55:43 +01:00 |
|
ruthra kumar
|
1f683afa43
|
Merge pull request #44396 from frappe/mergify/bp/version-15-hotfix/pr-44346
fix: reduce paid amount from grand total (backport #44346)
|
2024-11-27 21:12:51 +05:30 |
|
ruthra kumar
|
0ab0b4f716
|
chore: resolve conflict
|
2024-11-27 20:52:14 +05:30 |
|
ruthra kumar
|
4be6a78691
|
Merge pull request #44394 from frappe/mergify/bp/version-15-hotfix/pr-44392
chore: Fix typo "Purchase Reecipt" (backport #44392)
|
2024-11-27 20:24:46 +05:30 |
|
Sugesh393
|
d0d97c26a0
|
fix: reduce paid amount from grand total
(cherry picked from commit 82907672d9)
|
2024-11-27 14:41:46 +00:00 |
|
Sugesh393
|
81b9832917
|
test: add unit test to validate outstanding amount in payment request
(cherry picked from commit bbe3bc95d0)
# Conflicts:
# erpnext/accounts/doctype/payment_request/test_payment_request.py
|
2024-11-27 14:41:46 +00:00 |
|
Sugesh393
|
8d8027d423
|
fix: set outstanding amount while creating payment request for invoices
(cherry picked from commit 38e7d0a41e)
|
2024-11-27 14:41:44 +00:00 |
|
ruthra kumar
|
9a374ddbd4
|
Merge pull request #44395 from frappe/mergify/bp/version-15-hotfix/pr-44316
fix: Initially Closing Amount Should be Equal to Expected Amount (backport #44316)
|
2024-11-27 20:08:33 +05:30 |
|
Ninad1306
|
3f577779be
|
fix: initially closing amt should be equal to expected amt
(cherry picked from commit af9524920b)
|
2024-11-27 14:28:47 +00:00 |
|
vimalraj27
|
fd1cbf4b6f
|
chore: Fix typo "Purchase Reecipt"
(cherry picked from commit 21049bae91)
|
2024-11-27 14:28:00 +00:00 |
|
ruthra kumar
|
5e7cfeb514
|
Merge pull request #44388 from frappe/mergify/bp/version-15-hotfix/pr-44378
fix: filter item with search fields (backport #44378)
|
2024-11-27 17:53:51 +05:30 |
|
ruthra kumar
|
223d30ecd8
|
Merge pull request #44389 from frappe/mergify/bp/version-15-hotfix/pr-44327
fix: set debit transaction currency in gl entry (backport #44327)
|
2024-11-27 17:53:37 +05:30 |
|
Abdeali Chharchhoda
|
0e1f5ff391
|
fix: Add translation for showing mandatory fields in error msg
(cherry picked from commit f42ec6a124)
|
2024-11-27 12:01:10 +00:00 |
|
venkat102
|
a2612d5f36
|
fix: set debit transaction currency in gl entry
(cherry picked from commit 6e19c06e58)
|
2024-11-27 11:59:09 +00:00 |
|
ruthra kumar
|
632412bd72
|
Merge pull request #44383 from frappe/mergify/bp/version-15-hotfix/pr-44376
fix: remove field precision in Sales and Purchase Order for percentage fields (backport #44376)
|
2024-11-27 17:27:06 +05:30 |
|
ruthra kumar
|
09c28760e4
|
Merge pull request #44385 from frappe/mergify/bp/version-15-hotfix/pr-44323
fix: update gross profit for returned invoices (backport #44323)
|
2024-11-27 17:21:26 +05:30 |
|
ruthra kumar
|
7c85e4056f
|
Merge pull request #44387 from frappe/mergify/bp/version-15-hotfix/pr-44359
fix: check difference with company currency (backport #44359)
|
2024-11-27 17:21:00 +05:30 |
|
venkat102
|
d073b005a8
|
fix: filter item with search fields
(cherry picked from commit ebfbee3da5)
|
2024-11-27 11:50:51 +00:00 |
|
ruthra kumar
|
45e41827c7
|
chore: resolve conflict
|
2024-11-27 17:20:36 +05:30 |
|
venkat102
|
d6ef43858c
|
fix: check difference with company currency
(cherry picked from commit e2bae4cf07)
|
2024-11-27 11:26:58 +00:00 |
|
ljain112
|
66af7f4a14
|
fix: test case
(cherry picked from commit af5a3e5a48)
|
2024-11-27 11:20:34 +00:00 |
|
ljain112
|
f4518cac9a
|
fix: gp for return invoice
(cherry picked from commit 00403515a8)
|
2024-11-27 11:20:34 +00:00 |
|
ljain112
|
ca56709295
|
fix: update gross profit for returned invoices
(cherry picked from commit 8a42601e99)
|
2024-11-27 11:20:34 +00:00 |
|
vishakhdesai
|
860350a5b3
|
fix: remove field precision in SO and PO for percentage fields
(cherry picked from commit eff9cd10cd)
# Conflicts:
# erpnext/selling/doctype/sales_order/sales_order_list.js
|
2024-11-27 11:19:13 +00:00 |
|
ruthra kumar
|
6a34abefba
|
Merge pull request #44379 from frappe/mergify/bp/version-15-hotfix/pr-44377
fix: correct placeholder index in message (backport #44377)
|
2024-11-27 15:38:48 +05:30 |
|
ljain112
|
a523c14fd5
|
fix: correct placeholder index in message
(cherry picked from commit d61cb9a4bf)
|
2024-11-27 09:26:09 +00:00 |
|
ruthra kumar
|
6f798ab288
|
Merge pull request #44372 from frappe/mergify/bp/version-15-hotfix/pr-44343
fix: show cc on the process statement of accounts email (backport #44343)
|
2024-11-27 10:47:15 +05:30 |
|
mergify[bot]
|
ef882de509
|
feat: provision to disable item attribute (backport #44358) (#44370)
* feat: provision to disable item attribute (#44358)
(cherry picked from commit 123e3ef263)
# Conflicts:
# erpnext/stock/doctype/item_attribute/item_attribute.json
# erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-11-27 10:31:30 +05:30 |
|
venkat102
|
67809c781a
|
fix: show cc on the email
(cherry picked from commit 2dd5699f6d)
|
2024-11-27 04:53:16 +00:00 |
|