ruthra kumar
|
d92a042bf7
|
Merge pull request #42172 from frappe/mergify/bp/version-14-hotfix/pr-42143
refactor: validation to prevent recursion with mixed conditions (backport #42143)
|
2024-07-04 09:20:35 +05:30 |
|
ruthra kumar
|
d5fa968078
|
chore: resolve conflicts
|
2024-07-03 20:59:27 +05:30 |
|
ruthra kumar
|
71cbebd31b
|
test: validation on mixed condition and recursion on pricing rule
(cherry picked from commit eb4af58bf0)
# Conflicts:
# erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
|
2024-07-03 15:26:56 +00:00 |
|
ruthra kumar
|
99317768f6
|
test: validation on mixed condition with recursion
(cherry picked from commit 9bd4e7b709)
# Conflicts:
# erpnext/accounts/doctype/promotional_scheme/test_promotional_scheme.py
|
2024-07-03 15:26:56 +00:00 |
|
ruthra kumar
|
9fde7330e0
|
fix: use standard method to get _doc_before_save
(cherry picked from commit 9d7be293ae)
|
2024-07-03 15:26:56 +00:00 |
|
ruthra kumar
|
49fb6bec6a
|
refactor: validation to prevent recursion with mixed conditions
(cherry picked from commit 406dfd528f)
|
2024-07-03 15:26:55 +00:00 |
|
ruthra kumar
|
0f1f5b6f3d
|
Merge pull request #42169 from frappe/mergify/bp/version-14-hotfix/pr-42165
fix: multiple free items on same Item Group (backport #42165)
|
2024-07-03 20:55:34 +05:30 |
|
mergify[bot]
|
454e147592
|
fix: manual pick allow to pick more than available stock (backport #42155) (#42158)
* fix: manual pick allow to pick more than available stock (#42155)
(cherry picked from commit 938dd4b2aa)
# Conflicts:
# erpnext/stock/doctype/pick_list/test_pick_list.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-07-03 19:28:18 +05:30 |
|
ruthra kumar
|
701dd9e19b
|
fix: multiple free items on same Item Group
(cherry picked from commit c4ae0d283f)
|
2024-07-03 12:28:35 +00:00 |
|
ruthra kumar
|
26c99351fd
|
Merge pull request #42150 from frappe/mergify/bp/version-14-hotfix/pr-42073
fix: always post to tax account heads if LCV is booked (backport #42073)
|
2024-07-03 07:44:36 +05:30 |
|
ruthra kumar
|
4d99449aa8
|
chore: resolve conflict
|
2024-07-03 07:16:08 +05:30 |
|
ruthra kumar
|
72b93805fd
|
refactor(test): fix flaky test
(cherry picked from commit 0e256b8b29)
|
2024-07-03 01:34:50 +00:00 |
|
ruthra kumar
|
f31ed75578
|
refactor(test): cleanup test data
(cherry picked from commit 6ba6b5aa33)
|
2024-07-03 01:34:50 +00:00 |
|
ruthra kumar
|
003d7e9f3e
|
test: Repost should not merge expense accounts from LCV
(cherry picked from commit fa56555150)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
|
2024-07-03 01:34:49 +00:00 |
|
ruthra kumar
|
650b25fc23
|
fix: always post to tax account heads if LCV is booked
(cherry picked from commit 0fcd5d5130)
|
2024-07-03 01:34:49 +00:00 |
|
ruthra kumar
|
d5366c5873
|
Merge pull request #42131 from frappe/mergify/bp/version-14-hotfix/pr-42126
fix: Re-open allows SO's to be over credit limit (backport #42126)
|
2024-07-01 17:25:50 +05:30 |
|
ruthra kumar
|
bf36b4fa11
|
chore: resolve conflict
|
2024-07-01 17:05:56 +05:30 |
|
ruthra kumar
|
f4fc26b52e
|
test: credit check on Sales Order re-open
(cherry picked from commit 60694e09c4)
# Conflicts:
# erpnext/selling/doctype/sales_order/test_sales_order.py
|
2024-07-01 11:33:36 +00:00 |
|
ruthra kumar
|
952a7b46d5
|
fix: Re-open allows SO's to be over credit limit
(cherry picked from commit 5eed781263)
|
2024-07-01 11:33:35 +00:00 |
|
Smit Vora
|
cc9857affd
|
Merge pull request #42064 from frappe/mergify/bp/version-14-hotfix/pr-41979
fix: dynamic_link for party in customer and supplier dashboard (backport #41979)
|
2024-06-28 13:04:35 +05:30 |
|
ljain112
|
6de7a8de10
|
fix: dynamic_link for party in customer and supplier dashboard
(cherry picked from commit c0a8800832)
|
2024-06-28 06:35:17 +00:00 |
|
rohitwaghchaure
|
21bf7fd1f8
|
fix: timeout while cancelling LCV (#42030)
fix: timeout while canelling LCV
|
2024-06-25 17:38:03 +05:30 |
|
Khushi Rawat
|
a2ee4631cc
|
fix: asset value correction in fixed asset register (#41943)
|
2024-06-25 16:04:20 +05:30 |
|
ruthra kumar
|
92ca6c6538
|
Merge pull request #41983 from frappe/mergify/bp/version-14-hotfix/pr-41981
fix: incorrect against_account upon reposting (backport #41981)
|
2024-06-21 19:10:41 +05:30 |
|
ruthra kumar
|
6028a19e6b
|
fix: incorrect against_account upon reposting
(cherry picked from commit 20c4098399)
|
2024-06-21 12:30:39 +00:00 |
|
Raffael Meyer
|
87dc586543
|
Merge pull request #41440 from frappe/mergify/bp/version-14-hotfix/pr-41384
fix(SO, DN): only show permitted actions (backport #41384)
|
2024-06-20 15:51:18 +02:00 |
|
barredterra
|
22216b275c
|
refactor: remove use of can_create for Payment Request (#41647)
(cherry picked from commit 47bc5691a1)
|
2024-06-20 14:21:30 +02:00 |
|
barredterra
|
0e6edf763e
|
chore: resolve conflicts
|
2024-06-20 14:15:26 +02:00 |
|
barredterra
|
e77534ba2b
|
Merge remote-tracking branch 'upstream/version-14-hotfix' into mergify/bp/version-14-hotfix/pr-41384
|
2024-06-20 13:47:58 +02:00 |
|
rohitwaghchaure
|
ae14b86a8c
|
Merge pull request #41954 from ljain112/fix-41927
fix: consistent query field name in item wise purchase register with …
|
2024-06-20 14:03:12 +05:30 |
|
ljain112
|
9665212607
|
fix: consistent query field name in item wise purchase register with item wise sales register
|
2024-06-20 11:11:43 +05:30 |
|
Raffael Meyer
|
ee49e83020
|
Merge pull request #41944 from frappe/mergify/bp/version-14-hotfix/pr-41421
fix: migrate lead notes (backport #41421)
|
2024-06-19 01:17:48 +02:00 |
|
barredterra
|
598c581623
|
fix: only show user and date if available
(cherry picked from commit 895aede590)
|
2024-06-18 22:57:20 +00:00 |
|
barredterra
|
8f5278e3d4
|
fix: migrate lead notes
(cherry picked from commit 382d0ff453)
|
2024-06-18 22:57:19 +00:00 |
|
Raffael Meyer
|
aa38f69a67
|
Merge pull request #40543 from frappe/mergify/bp/version-14-hotfix/pr-40542
|
2024-06-18 12:51:55 +02:00 |
|
ruthra kumar
|
57a81c4012
|
Merge pull request #41937 from frappe/mergify/bp/version-14-hotfix/pr-41900
refactor: ignore unreconcile doc for PO and SO on cancel/delete (backport #41900)
|
2024-06-18 11:57:27 +05:30 |
|
ruthra kumar
|
2fabcb0c50
|
chore: resolve conflicts
|
2024-06-18 10:43:07 +05:30 |
|
ljain112
|
f833923f2f
|
refactor: ignore unreconcile doc for PO and SO on cancel/delete
(cherry picked from commit b618d685c6)
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.js
# erpnext/selling/doctype/sales_order/sales_order.js
|
2024-06-18 04:57:52 +00:00 |
|
rohitwaghchaure
|
077cb9e983
|
Merge pull request #41934 from frappe/mergify/bp/version-14-hotfix/pr-41931
fix: reposting validation related PCV (backport #41931)
|
2024-06-18 09:41:58 +05:30 |
|
Rohit Waghchaure
|
bcfc83d8d5
|
fix: reposting validation related PCV
(cherry picked from commit 194f1dc674)
|
2024-06-17 12:22:00 +00:00 |
|
ruthra kumar
|
a5d1feef02
|
Merge pull request #41912 from frappe/mergify/bp/version-14-hotfix/pr-40187
fix: valuation tax entries on LCV after billing PR (backport #40187)
|
2024-06-17 13:54:06 +05:30 |
|
ruthra kumar
|
b050110544
|
chore: resolve conflicts
|
2024-06-17 07:12:51 +05:30 |
|
Gursheen Anand
|
e8f5c45751
|
chore: resolve conflicts
(cherry picked from commit 54a58e9205)
|
2024-06-15 15:12:23 +00:00 |
|
Gursheen Anand
|
eae5f27ec8
|
fix: reset perpetual inventory flag after test
(cherry picked from commit 0b36cbe307)
|
2024-06-15 15:12:23 +00:00 |
|
Gursheen Anand
|
d48455393e
|
fix: parameters for PI references
(cherry picked from commit 8b3d46610e)
|
2024-06-15 15:12:23 +00:00 |
|
Gursheen Anand
|
7c699c8a38
|
test: LCV entries after billing
(cherry picked from commit 53642e7417)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
|
2024-06-15 15:12:23 +00:00 |
|
Gursheen Anand
|
20b8ee1e90
|
fix: add LCV flag to determine negative expenses
(cherry picked from commit baa3fee1bf)
# Conflicts:
# erpnext/controllers/stock_controller.py
|
2024-06-15 15:12:22 +00:00 |
|
Smit Vora
|
f9a7bb0544
|
Merge pull request #41889 from frappe/mergify/bp/version-14-hotfix/pr-41842
fix: regional overide for updating item valution (backport #41842)
|
2024-06-15 09:16:18 +05:30 |
|
ljain112
|
6441bc7862
|
fix: regional overide for updating item valution
(cherry picked from commit 1a10f0bcbd)
|
2024-06-13 08:09:01 +00:00 |
|
Raffael Meyer
|
a5df0f2c94
|
Merge pull request #41660 from frappe/mergify/bp/version-14-hotfix/pr-41659
fix: Auditor permissions (backport #41659)
|
2024-06-12 17:47:30 +02:00 |
|