Raffael Meyer
|
c110a9f2ad
|
Merge pull request #41945 from frappe/mergify/bp/version-15-hotfix/pr-41421
fix: migrate lead notes (backport #41421)
|
2024-06-19 01:17:52 +02:00 |
|
barredterra
|
24ee765e6a
|
fix: only show user and date if available
(cherry picked from commit 895aede590)
|
2024-06-18 22:57:25 +00:00 |
|
barredterra
|
5663432bd8
|
fix: migrate lead notes
(cherry picked from commit 382d0ff453)
|
2024-06-18 22:57:24 +00:00 |
|
ruthra kumar
|
d64432c3f4
|
Merge pull request #41938 from frappe/mergify/bp/version-15-hotfix/pr-41900
refactor: ignore unreconcile doc for PO and SO on cancel/delete (backport #41900)
|
2024-06-18 10:54:51 +05:30 |
|
ljain112
|
7cc5579eca
|
refactor: ignore unreconcile doc for PO and SO on cancel/delete
(cherry picked from commit b618d685c6)
|
2024-06-18 04:58:09 +00:00 |
|
rohitwaghchaure
|
60b16a4b1e
|
Merge pull request #41935 from frappe/mergify/bp/version-15-hotfix/pr-41931
fix: reposting validation related PCV (backport #41931)
|
2024-06-18 09:41:43 +05:30 |
|
Rohit Waghchaure
|
794ade832f
|
fix: reposting validation related PCV
(cherry picked from commit 194f1dc674)
|
2024-06-17 12:21:59 +00:00 |
|
rohitwaghchaure
|
75edb7708f
|
Merge pull request #41932 from frappe/mergify/bp/version-15-hotfix/pr-41907
fix: add strings for translation in pos_item_cart.js (backport #41907)
|
2024-06-17 17:49:24 +05:30 |
|
mahsem
|
f4852d472a
|
fix: add strings for translation in pos_item_cart.js
fix: add strings for translation in pos_item_cart.js
(cherry picked from commit 2fb3e5da4a)
|
2024-06-17 11:40:49 +00:00 |
|
rohitwaghchaure
|
db7fb7d7b1
|
Merge pull request #41928 from frappe/mergify/bp/version-15-hotfix/pr-41927
fix: consistent query field name in item wise purchase register with item wise sales register (backport #41927)
|
2024-06-17 16:53:28 +05:30 |
|
rohitwaghchaure
|
ae0725d55a
|
Merge pull request #41929 from frappe/mergify/bp/version-15-hotfix/pr-41920
fix: handle NoneType error where customer details are not available in sales register (backport #41920)
|
2024-06-17 16:52:59 +05:30 |
|
ljain112
|
ceafa0ce28
|
fix: handle NoneType error where customer details are not available in sales register
(cherry picked from commit f876fec6f5)
|
2024-06-17 09:29:38 +00:00 |
|
ljain112
|
a43c181673
|
fix: consistent query field name in item wise purchase register with item wise sales register
(cherry picked from commit 6d539e0fc0)
|
2024-06-17 09:28:27 +00:00 |
|
rohitwaghchaure
|
ae83236b7c
|
Merge pull request #41926 from frappe/mergify/bp/version-15-hotfix/pr-41921
fix: item_code filter in item-wise sales-purchase register (backport #41921)
|
2024-06-17 14:56:21 +05:30 |
|
Nihantra Patel
|
98c8feded0
|
fix: item_code filter in item-wise sales-purchase register
(cherry picked from commit 757aef3972)
|
2024-06-17 08:32:26 +00:00 |
|
rohitwaghchaure
|
5a2005395b
|
Merge pull request #41918 from frappe/mergify/bp/version-15-hotfix/pr-41898
fix: update received qty in MR on purchase invoice submit with update stock (backport #41898)
|
2024-06-17 13:59:54 +05:30 |
|
rohitwaghchaure
|
ecb889707d
|
Merge pull request #41924 from frappe/mergify/bp/version-15-hotfix/pr-41922
fix: duplicate rows fetching in RFQ (backport #41922)
|
2024-06-17 13:58:15 +05:30 |
|
ruthra kumar
|
e3539ac2de
|
Merge pull request #41913 from frappe/mergify/bp/version-15-hotfix/pr-40187
fix: valuation tax entries on LCV after billing PR (backport #40187)
|
2024-06-17 13:53:17 +05:30 |
|
Rohit Waghchaure
|
c159e3b06f
|
fix: duplicate rows fetching in RFQ
(cherry picked from commit 555510c128)
|
2024-06-17 07:36:59 +00:00 |
|
Nihantra C. Patel
|
7e9f6aee58
|
fix: update received qty in MR on purchase invoice submit with update stock
|
2024-06-17 11:39:42 +05:30 |
|
Nihantra Patel
|
084658e8ff
|
fix: add test case for update received qty in MR - import sorter
(cherry picked from commit 77959596db)
|
2024-06-17 06:06:35 +00:00 |
|
Nihantra Patel
|
21596c6c23
|
fix: add test case for update received qty in MR - import sorter
(cherry picked from commit 73f22ba9a0)
|
2024-06-17 06:06:35 +00:00 |
|
Nihantra Patel
|
858058c9e1
|
fix: add test case for update received qty in MR
(cherry picked from commit 62e4e88f1d)
|
2024-06-17 06:06:34 +00:00 |
|
Nihantra Patel
|
aaee02835b
|
fix: add test case for update received qty in MR
(cherry picked from commit cff1050159)
|
2024-06-17 06:06:34 +00:00 |
|
Nihantra Patel
|
125d97a182
|
fix: add test case for update received qty in MR
(cherry picked from commit ebb0cef601)
|
2024-06-17 06:06:34 +00:00 |
|
Nihantra Patel
|
4551b4b638
|
fix: update received qty in MR on purchase invoice submit with update stock
(cherry picked from commit 13cb53fa89)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
|
2024-06-17 06:06:34 +00:00 |
|
rohitwaghchaure
|
9771bbdb75
|
Merge pull request #41917 from frappe/mergify/bp/version-15-hotfix/pr-41916
fix: incorrect batch return from sales return (backport #41916)
|
2024-06-17 11:35:24 +05:30 |
|
Rohit Waghchaure
|
b64b4330a3
|
fix: incorrect batch return from sales return
(cherry picked from commit 317047c808)
|
2024-06-17 05:47:25 +00:00 |
|
ruthra kumar
|
b577d95ecd
|
chore: resolve conflicts
|
2024-06-16 20:50:03 +05:30 |
|
Gursheen Anand
|
248e9cac71
|
chore: resolve conflicts
(cherry picked from commit 54a58e9205)
# Conflicts:
# erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
|
2024-06-15 15:12:22 +00:00 |
|
Gursheen Anand
|
4c11f2bff2
|
fix: reset perpetual inventory flag after test
(cherry picked from commit 0b36cbe307)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
|
2024-06-15 15:12:22 +00:00 |
|
Gursheen Anand
|
8618402829
|
fix: parameters for PI references
(cherry picked from commit 8b3d46610e)
# Conflicts:
# erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
|
2024-06-15 15:12:22 +00:00 |
|
Gursheen Anand
|
c7c9d33954
|
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:22 +00:00 |
|
Gursheen Anand
|
83ccb32be6
|
fix: add LCV flag to determine negative expenses
(cherry picked from commit baa3fee1bf)
# Conflicts:
# erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
|
2024-06-15 15:12:21 +00:00 |
|
Smit Vora
|
69de359728
|
Merge pull request #41890 from frappe/mergify/bp/version-15-hotfix/pr-41842
fix: regional overide for updating item valution (backport #41842)
|
2024-06-15 09:16:01 +05:30 |
|
ljain112
|
5ea2cdcaad
|
fix: regional overide for updating item valution
(cherry picked from commit 1a10f0bcbd)
|
2024-06-13 08:09:51 +00:00 |
|
rohitwaghchaure
|
ac2e760d81
|
Merge pull request #41888 from frappe/mergify/bp/version-15-hotfix/pr-41886
fix: download materials request plan in production plan (backport #41886)
|
2024-06-13 11:23:59 +05:30 |
|
Kishan0330
|
164973a42c
|
refactor: change warehousesData variable name
(cherry picked from commit f4e369977a)
|
2024-06-13 05:45:17 +00:00 |
|
Kishan0330
|
9cb7c279a4
|
fix: download materials request plan in production plan
(cherry picked from commit 6e55651795)
|
2024-06-13 05:45:17 +00:00 |
|
mergify[bot]
|
3bc5076dfc
|
fix: allow Employee role to select Department (backport #41877) (#41881)
* fix: allow Employee role to select Department (#41877)
(cherry picked from commit 56082f5a29)
# Conflicts:
# erpnext/setup/doctype/department/department.json
* chore: fix conflicts
---------
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2024-06-12 17:19:36 +05:30 |
|
ruthra kumar
|
2f5533c676
|
Merge pull request #41876 from frappe/mergify/bp/version-15-hotfix/pr-41817
fix: use invoice outstanding on Dunning (backport #41817)
|
2024-06-12 16:42:08 +05:30 |
|
ruthra kumar
|
04f0c96af7
|
fix: use invoice outstanding on Dunning (#41817)
(cherry picked from commit cf0a29b05f)
|
2024-06-12 10:54:57 +00:00 |
|
rohitwaghchaure
|
6e9ad4ddd2
|
Merge pull request #41874 from frappe/mergify/bp/version-15-hotfix/pr-41872
fix: return from accepted and rejected warehouse at a same time not working (backport #41872)
|
2024-06-12 16:20:15 +05:30 |
|
Rohit Waghchaure
|
6c57971abc
|
fix: return from accepted and rejected warehouse at a same time not working
(cherry picked from commit 17731f09ef)
|
2024-06-12 10:17:33 +00:00 |
|
rohitwaghchaure
|
c04ba3864e
|
Merge pull request #41868 from frappe/mergify/bp/version-15-hotfix/pr-41865
fix: batch qty in the dropdown field (backport #41865)
|
2024-06-12 15:46:06 +05:30 |
|
rohitwaghchaure
|
da15df1f28
|
Merge pull request #41869 from frappe/mergify/bp/version-15-hotfix/pr-41650
chore: typo in bom_operation.json (backport #41650)
|
2024-06-12 15:22:51 +05:30 |
|
rohitwaghchaure
|
94ef2eabb1
|
Merge pull request #41870 from frappe/mergify/bp/version-15-hotfix/pr-41867
fix: download materials request plan in PP (backport #41867)
|
2024-06-12 15:22:33 +05:30 |
|
Nihantra C. Patel
|
337082512e
|
fix: download materials request plan in PP -prettier
(cherry picked from commit a1c4e0e93c)
|
2024-06-12 07:33:12 +00:00 |
|
Himanshu Shivhare
|
764235b390
|
chore: typo in bom_operation.json (#41650)
chore: typo in bom_operation.json
(cherry picked from commit 7ee2a19f53)
|
2024-06-12 07:33:11 +00:00 |
|
Nihantra C. Patel
|
7193633773
|
fix: download materials request plan in PP
(cherry picked from commit cb52b76342)
|
2024-06-12 07:33:11 +00:00 |
|