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 |
|
Frappe PR Bot
|
5ae9ec2657
|
chore(release): Bumped to Version 14.70.7
## [14.70.7](https://github.com/frappe/erpnext/compare/v14.70.6...v14.70.7) (2024-06-19)
### Bug Fixes
* add LCV flag to determine negative expenses ([20b8ee1](20b8ee1e90))
* allow Auditor to read a Fiscal Year ([b1a911a](b1a911aa9c))
* allow Auditor to select a company ([18b6d50](18b6d50a31))
* allow Employee role to select Department (backport [#41877](https://github.com/frappe/erpnext/issues/41877)) ([#41880](https://github.com/frappe/erpnext/issues/41880)) ([245c6d8](245c6d8672))
* migrate lead notes ([8f5278e](8f5278e3d4))
* only show user and date if available ([598c581](598c581623))
* parameters for PI references ([d484553](d48455393e))
* regional overide for updating item valution ([6441bc7](6441bc7862))
* reposting validation related PCV ([bcfc83d](bcfc83d8d5))
* reset perpetual inventory flag after test ([eae5f27](eae5f27ec8))
v14.70.7
|
2024-06-19 06:25:45 +00:00 |
|
ruthra kumar
|
890289563a
|
Merge pull request #41942 from frappe/version-14-hotfix
chore: release v14
|
2024-06-19 11:54:25 +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 |
|
mergify[bot]
|
e33416a4a7
|
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-41659
|
2024-06-12 12:13:11 +00:00 |
|
mergify[bot]
|
245c6d8672
|
fix: allow Employee role to select Department (backport #41877) (#41880)
* 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:16 +05:30 |
|
Frappe PR Bot
|
32fba94b2a
|
chore(release): Bumped to Version 14.70.6
## [14.70.6](https://github.com/frappe/erpnext/compare/v14.70.5...v14.70.6) (2024-06-11)
### Bug Fixes
* Add additional condition application ([e79e9e9](e79e9e94d0))
* fixing Item-wise sales register ([5d97c7c](5d97c7cff9))
* fixing Item-wise sales register [#41373](https://github.com/frappe/erpnext/issues/41373) ([ab90b81](ab90b815e3))
* fixing Item-wise sales register and purchase register [#41373](https://github.com/frappe/erpnext/issues/41373) ([ee47440](ee47440063))
* Item-wise Sales and Purchase register with no item codes [#41373](https://github.com/frappe/erpnext/issues/41373) ([bc24e75](bc24e75c24))
* terms and conditions for material request (backport [#41834](https://github.com/frappe/erpnext/issues/41834)) ([#41836](https://github.com/frappe/erpnext/issues/41836)) ([7234625](7234625d65))
v14.70.6
|
2024-06-11 13:07:24 +00:00 |
|
rohitwaghchaure
|
a6ed10b712
|
Merge pull request #41853 from frappe/version-14-hotfix
chore: release v14
|
2024-06-11 18:36:07 +05:30 |
|
mergify[bot]
|
7234625d65
|
fix: terms and conditions for material request (backport #41834) (#41836)
fix: terms and conditions for material request (#41834)
(cherry picked from commit 4b026d66dc)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-06-10 15:17:06 +05:30 |
|
Frappe PR Bot
|
0c4a2af9ab
|
chore(release): Bumped to Version 14.70.5
## [14.70.5](https://github.com/frappe/erpnext/compare/v14.70.4...v14.70.5) (2024-06-10)
### Bug Fixes
* Add additional condition application ([810378c](810378c899))
* fixing Item-wise sales register ([3823e0e](3823e0e494))
* fixing Item-wise sales register [#41373](https://github.com/frappe/erpnext/issues/41373) ([e8286d7](e8286d7b3c))
* fixing Item-wise sales register and purchase register [#41373](https://github.com/frappe/erpnext/issues/41373) ([fd73a8a](fd73a8a348))
* Item-wise Sales and Purchase register with no item codes [#41373](https://github.com/frappe/erpnext/issues/41373) ([91de469](91de46922d))
v14.70.5
|
2024-06-10 04:55:25 +00:00 |
|
Deepesh Garg
|
5ba0082bc7
|
Merge pull request #41832 from frappe/mergify/bp/version-14/pr-41829
fix: Item-wise Sales and Purchase register with no item codes (#41424)
|
2024-06-10 10:24:04 +05:30 |
|
Deepesh Garg
|
47b3e96a37
|
chore: resolve conflicts
(cherry picked from commit e9b7d00afb)
|
2024-06-10 04:53:29 +00:00 |
|
Deepesh Garg
|
810378c899
|
fix: Add additional condition application
(cherry picked from commit 8ec364df6f)
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
(cherry picked from commit e79e9e94d0)
|
2024-06-10 04:53:29 +00:00 |
|
Deepesh Garg
|
bdf198c94f
|
chore: update condition queries in qb
(cherry picked from commit d2af36e1eb)
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit e94e15259b)
|
2024-06-10 04:53:29 +00:00 |
|
Poorvi-R-Bhat
|
e8286d7b3c
|
fix: fixing Item-wise sales register #41373
(cherry picked from commit eafa88b8e9)
# Conflicts:
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit ab90b815e3)
|
2024-06-10 04:53:29 +00:00 |
|
Poorvi-R-Bhat
|
fd73a8a348
|
fix: fixing Item-wise sales register and purchase register #41373
(cherry picked from commit 76073ae228)
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
(cherry picked from commit ee47440063)
|
2024-06-10 04:53:29 +00:00 |
|
Poorvi-R-Bhat
|
91de46922d
|
fix: Item-wise Sales and Purchase register with no item codes #41373
(cherry picked from commit 1b45ecfcae)
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit bc24e75c24)
|
2024-06-10 04:53:29 +00:00 |
|
Poorvi
|
3823e0e494
|
fix: fixing Item-wise sales register
(cherry picked from commit c90185f533)
(cherry picked from commit 5d97c7cff9)
|
2024-06-10 04:53:28 +00:00 |
|
Deepesh Garg
|
625aa4ef6b
|
Merge pull request #41829 from frappe/mergify/bp/version-14-hotfix/pr-41424
fix: Item-wise Sales and Purchase register with no item codes (#41424)
|
2024-06-09 22:38:15 +05:30 |
|
Deepesh Garg
|
e9b7d00afb
|
chore: resolve conflicts
|
2024-06-09 22:17:30 +05:30 |
|
Deepesh Garg
|
e79e9e94d0
|
fix: Add additional condition application
(cherry picked from commit 8ec364df6f)
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
|
2024-06-09 14:13:27 +00:00 |
|
Deepesh Garg
|
e94e15259b
|
chore: update condition queries in qb
(cherry picked from commit d2af36e1eb)
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
|
2024-06-09 14:13:27 +00:00 |
|
Poorvi-R-Bhat
|
ab90b815e3
|
fix: fixing Item-wise sales register #41373
(cherry picked from commit eafa88b8e9)
# Conflicts:
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
|
2024-06-09 14:13:25 +00:00 |
|
Poorvi-R-Bhat
|
ee47440063
|
fix: fixing Item-wise sales register and purchase register #41373
(cherry picked from commit 76073ae228)
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
|
2024-06-09 14:13:24 +00:00 |
|
Poorvi-R-Bhat
|
bc24e75c24
|
fix: Item-wise Sales and Purchase register with no item codes #41373
(cherry picked from commit 1b45ecfcae)
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
|
2024-06-09 14:13:23 +00:00 |
|
Poorvi
|
5d97c7cff9
|
fix: fixing Item-wise sales register
(cherry picked from commit c90185f533)
|
2024-06-09 14:13:23 +00:00 |
|