rohitwaghchaure
|
8591a151de
|
Merge pull request #41143 from frappe/mergify/bp/version-15-hotfix/pr-41098
fix: stock reconciliation negative qty validation (backport #41098)
|
2024-04-23 13:43:08 +05:30 |
|
rohitwaghchaure
|
b2a0e4b810
|
chore: fix conflicts
|
2024-04-23 13:17:23 +05:30 |
|
Rohit Waghchaure
|
aee03fe2ef
|
fix: stock reco negative qty validation
(cherry picked from commit 289495c308)
# Conflicts:
# erpnext/stock/stock_ledger.py
|
2024-04-23 07:44:47 +00:00 |
|
Deepesh Garg
|
62702b8bd6
|
Merge pull request #41134 from frappe/mergify/bp/version-15-hotfix/pr-41104
fix: Payment entry against employee (#41104)
|
2024-04-23 12:04:13 +05:30 |
|
Deepesh Garg
|
cfb36cc9a8
|
Merge pull request #41131 from frappe/mergify/bp/version-15-hotfix/pr-40797
fix: Party type in Payment Order (#40797)
|
2024-04-23 12:03:47 +05:30 |
|
Nabin Hait
|
3b4575af3d
|
fix: Missing args while fetching items from delivery note
(cherry picked from commit bbe323fbb4)
|
2024-04-23 04:55:06 +00:00 |
|
ruthra kumar
|
dd67b0ee61
|
fix: advance account validation in company master
(cherry picked from commit 1ad065fc54)
|
2024-04-23 01:45:45 +00:00 |
|
ruthra kumar
|
fb4a75c5aa
|
fix: validation to prevent foreign currency advance accounts in PE
(cherry picked from commit e3fc5990ee)
|
2024-04-23 01:45:45 +00:00 |
|
Deepesh Garg
|
060d46af42
|
fix: Payment entry against employee
(cherry picked from commit 93e6c6ccab)
|
2024-04-22 06:08:47 +00:00 |
|
Deepesh Garg
|
83931e872b
|
fix: Party type in Payment Order
(cherry picked from commit 91fa41c9ec)
|
2024-04-22 06:05:12 +00:00 |
|
Gursheen Kaur Anand
|
a8866b61a1
|
Merge pull request #41124 from frappe/mergify/bp/version-15-hotfix/pr-40769
fix: budget validation for purchase orders (backport #40769)
|
2024-04-21 18:57:15 +05:30 |
|
rohitwaghchaure
|
f733eddf0b
|
Merge pull request #41122 from frappe/mergify/bp/version-15-hotfix/pr-41120
fix: search not working for so in the Production Plan (backport #36459) (backport #41120)
|
2024-04-21 17:24:42 +05:30 |
|
Gursheen Anand
|
ba99bc5fff
|
refactor: show list for expense breakup
(cherry picked from commit 9a12376e29)
|
2024-04-21 11:26:31 +00:00 |
|
Gursheen Anand
|
e047e1eb15
|
feat: show expense breakup
(cherry picked from commit 59292a09c4)
|
2024-04-21 11:26:31 +00:00 |
|
Gursheen Anand
|
c72478c74d
|
fix: do not add actual expense twice for validating budget
(cherry picked from commit af26ac96e9)
|
2024-04-21 11:26:30 +00:00 |
|
rohitwaghchaure
|
544e56a71c
|
fix: search not working for so in the Production Plan (#36459)
fix: search not working for so
(cherry picked from commit 8c57d56240)
(cherry picked from commit 9a6e762b8b)
|
2024-04-21 11:21:04 +00:00 |
|
rohitwaghchaure
|
bb5096075f
|
Merge pull request #41114 from frappe/mergify/bp/version-15-hotfix/pr-41099
fix: not able to update default supplier from Supplier Quotation Comparison report (backport #41099)
|
2024-04-20 19:47:01 +05:30 |
|
Rohit Waghchaure
|
80891daaed
|
fix: not able to update default supplier from Supplier Quotation Comparison report
(cherry picked from commit ad8e189c26)
|
2024-04-20 05:51:36 +00:00 |
|
rohitwaghchaure
|
77a764e5bd
|
Merge pull request #41107 from frappe/mergify/bp/version-15-hotfix/pr-41102
fix: balance qty for stock ledger report (backport #41102)
|
2024-04-20 11:16:06 +05:30 |
|
Rohit Waghchaure
|
74ed656bb9
|
fix: balance qty for stock ledger report
(cherry picked from commit f00ae0b92b)
|
2024-04-19 16:22:16 +00:00 |
|
rohitwaghchaure
|
82ce228433
|
Merge pull request #41097 from frappe/mergify/bp/version-15-hotfix/pr-41067
fix: validation for zero qty in SABB (backport #41067)
|
2024-04-19 21:49:55 +05:30 |
|
Deepesh Garg
|
d7ddb00e86
|
fix: Permission for lower dedcution certificate
(cherry picked from commit f6f118855b)
# Conflicts:
# erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
|
2024-04-19 10:11:47 +00:00 |
|
Rohit Waghchaure
|
85796b3534
|
fix: validation for zero qty in SABB
(cherry picked from commit 497f560b4b)
|
2024-04-19 09:41:27 +00:00 |
|
Frappe PR Bot
|
b582570022
|
chore(release): Bumped to Version 15.20.6
## [15.20.6](https://github.com/frappe/erpnext/compare/v15.20.5...v15.20.6) (2024-04-19)
### Bug Fixes
* account and stock manager read perm ([6cc7c08](6cc7c08ccf))
v15.20.6
|
2024-04-19 08:40:13 +00:00 |
|
Gursheen Kaur Anand
|
8914bce3d8
|
Merge pull request #41095 from frappe/mergify/bp/version-15/pr-41093
fix: accounts manager perm for FY (backport #41093)
|
2024-04-19 14:08:59 +05:30 |
|
Gursheen Anand
|
6cc7c08ccf
|
fix: account and stock manager read perm
(cherry picked from commit 572e844a91)
|
2024-04-19 08:05:05 +00:00 |
|
Gursheen Kaur Anand
|
a1fb289290
|
Merge pull request #41093 from GursheenK/fy-accounts-manager-perm
fix: accounts manager perm for FY
|
2024-04-19 13:28:32 +05:30 |
|
Gursheen Anand
|
572e844a91
|
fix: account and stock manager read perm
|
2024-04-19 13:05:25 +05:30 |
|
rohitwaghchaure
|
906b9562de
|
Merge pull request #41084 from frappe/mergify/bp/version-15-hotfix/pr-41083
fix: validation for fraction number in Work Order (backport #41083)
|
2024-04-18 15:56:07 +05:30 |
|
Rohit Waghchaure
|
ef2553edf9
|
fix: validation for fraction number in Work Order
(cherry picked from commit f8305c2fc0)
|
2024-04-18 09:15:49 +00:00 |
|
mergify[bot]
|
93242ca883
|
fix: validate uom is integer for PR item (backport #41074) (#41077)
fix: validate uom is integer for PR item
(cherry picked from commit 9a290fdfc9)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
|
2024-04-18 07:53:20 +05:30 |
|
mergify[bot]
|
ee7aaf0ea4
|
fix: don't attempt to set gender from salutation (backport #40997) (#41073)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: don't attempt to set gender from salutation (#40997)
|
2024-04-17 17:53:43 +02:00 |
|
mergify[bot]
|
1ae447e4fc
|
fix: do not add qty to supplied items (backport #41061) (#41066)
fix: do not add qty to supplied items
(cherry picked from commit 8233c392fb)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
|
2024-04-17 17:30:43 +05:30 |
|
Frappe PR Bot
|
5ecb022abc
|
chore(release): Bumped to Version 15.20.5
## [15.20.5](https://github.com/frappe/erpnext/compare/v15.20.4...v15.20.5) (2024-04-17)
### Bug Fixes
* duplicate serial and batch bundle in stock entry and stock reco ([a1db5f0](a1db5f0f0a))
v15.20.5
|
2024-04-17 09:25:54 +00:00 |
|
rohitwaghchaure
|
12ab3972de
|
Merge pull request #41058 from frappe/mergify/bp/version-15/pr-41056
fix: duplicate serial and batch bundle in stock entry and stock reco (backport #41053) (backport #41056)
|
2024-04-17 14:54:34 +05:30 |
|
Rohit Waghchaure
|
a1db5f0f0a
|
fix: duplicate serial and batch bundle in stock entry and stock reco
(cherry picked from commit 732b6e1417)
(cherry picked from commit c10c21157d)
|
2024-04-17 09:00:05 +00:00 |
|
rohitwaghchaure
|
5195d8a765
|
Merge pull request #41056 from frappe/mergify/bp/version-15-hotfix/pr-41053
fix: duplicate serial and batch bundle in stock entry and stock reco (backport #41053)
|
2024-04-17 14:29:14 +05:30 |
|
Rohit Waghchaure
|
c10c21157d
|
fix: duplicate serial and batch bundle in stock entry and stock reco
(cherry picked from commit 732b6e1417)
|
2024-04-17 07:50:06 +00:00 |
|
Deepesh Garg
|
116a429c45
|
chore: resolve conflicts
|
2024-04-17 12:09:05 +05:30 |
|
Deepesh Garg
|
6c10783823
|
chore: resolve conflicts
|
2024-04-17 11:47:52 +05:30 |
|
Frappe PR Bot
|
00d45c34ba
|
chore(release): Bumped to Version 15.20.4
## [15.20.4](https://github.com/frappe/erpnext/compare/v15.20.3...v15.20.4) (2024-04-17)
### Bug Fixes
* Delayed Order Report not working (backport [#41037](https://github.com/frappe/erpnext/issues/41037)) ([#41039](https://github.com/frappe/erpnext/issues/41039)) ([40d059c](40d059c7c1))
* do not validate batch qty for LCV ([5de9b6a](5de9b6ac75))
* Don't set delivery date as today while making SO from Quotation ([fea906b](fea906b883))
* expense account set as COGS for stock entry Material Issue (backport [#41026](https://github.com/frappe/erpnext/issues/41026)) ([#41029](https://github.com/frappe/erpnext/issues/41029)) ([f59e433](f59e43320b))
* get address if multiple companies ([dcfc768](dcfc768d33))
* get address if multiple companies ([ccdbad9](ccdbad9f90))
* **gp:** SLEs not fetched for correct warehouse ([881dc02](881dc02349))
* incorrect exc gain/loss for PE against JE for payable accounts ([361d7f1](361d7f1ba5))
* landed cost voucher for legacy pr with batch ([4e215c6](4e215c6b7b))
* Link Validation Error on Dunning cancellation ([0053d57](0053d57ec4))
* Multiple partial payment requests against Purchase Invoice ([e287376](e287376cc8))
* not able to submit subcontracting receipt (backport [#41041](https://github.com/frappe/erpnext/issues/41041)) ([#41045](https://github.com/frappe/erpnext/issues/41045)) ([b27ad76](b27ad76557))
* Subcontracting Receipt GL Entries (backport [#40773](https://github.com/frappe/erpnext/issues/40773)) ([#40979](https://github.com/frappe/erpnext/issues/40979)) ([9abc71f](9abc71f9c8))
* Test case ([641b2a4](641b2a4705))
* test cases ([0ee91a2](0ee91a2e54))
* type of transaction validation for the stock entry (backport [#40986](https://github.com/frappe/erpnext/issues/40986)) ([#40992](https://github.com/frappe/erpnext/issues/40992)) ([4342b89](4342b891eb))
* **ux:** Sales Order Stock Reservation Dialog (backport [#40707](https://github.com/frappe/erpnext/issues/40707)) ([#40980](https://github.com/frappe/erpnext/issues/40980)) ([14a1a18](14a1a18243))
* voucher no. is link field for non english user interface ([1c28ed4](1c28ed4d5b))
* zero division error ([e9c6c5a](e9c6c5a8eb))
v15.20.4
|
2024-04-17 06:13:12 +00:00 |
|
rohitwaghchaure
|
44610621ab
|
Merge pull request #41031 from frappe/version-15-hotfix
chore: release v15
|
2024-04-17 11:41:42 +05:30 |
|
Deepesh Garg
|
5f41036f4a
|
chore: resolve conflicts
|
2024-04-17 11:38:13 +05:30 |
|
Deepesh Garg
|
e278688a4b
|
fix: Allow updating cost center and project for repostable doctypes
(cherry picked from commit c3845ac0f1)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
|
2024-04-17 05:55:02 +00:00 |
|
ruthra kumar
|
088aa94fa1
|
Merge pull request #40789 from frappe/mergify/bp/version-15-hotfix/pr-40786
fix(gp): SLEs not fetched for correct warehouse (backport #40786)
|
2024-04-17 10:35:09 +05:30 |
|
ruthra kumar
|
c34b814c16
|
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40786
|
2024-04-17 10:19:08 +05:30 |
|
Dany Robert
|
881dc02349
|
fix(gp): SLEs not fetched for correct warehouse
(cherry picked from commit f958e8be06)
|
2024-04-17 10:17:40 +05:30 |
|
mergify[bot]
|
b27ad76557
|
fix: not able to submit subcontracting receipt (backport #41041) (#41045)
fix: not able to submit subcontracting receipt (#41041)
(cherry picked from commit 5b1493b56c)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-04-17 06:37:38 +05:30 |
|
mergify[bot]
|
40d059c7c1
|
fix: Delayed Order Report not working (backport #41037) (#41039)
fix: Delayed Order Report not working (#41037)
(cherry picked from commit d69a18b826)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-04-16 18:24:38 +05:30 |
|
ruthra kumar
|
52b42dfc14
|
Merge pull request #41035 from frappe/mergify/bp/version-15-hotfix/pr-40373
fix: get address if multiple companies (backport #40373)
|
2024-04-16 16:39:39 +05:30 |
|