Smit Vora
|
db9a319104
|
fix: typerror on TDS payable monthly report (backport #37707)
|
2024-12-20 11:02:33 +05:30 |
|
mergify[bot]
|
cdeec8d24c
|
fix: closing stock balance permissions (backport #44791) (#44793)
* fix: closing stock balance permissions (#44791)
(cherry picked from commit 3662a6a41d)
# Conflicts:
# erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-20 09:35:51 +05:30 |
|
mergify[bot]
|
b706a8274f
|
perf: SABB (backport #44764) (#44789)
perf: SABB (#44764)
(cherry picked from commit 90baa38f64)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-19 13:31:28 +05:30 |
|
mergify[bot]
|
20324224d3
|
fix: POS Closing entry issue (backport #44772) (#44781)
fix: POS Closing entry issue (#44772)
(cherry picked from commit 779dd2d798)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-18 20:38:56 +05:30 |
|
ruthra kumar
|
418ef81dbc
|
Merge pull request #44778 from frappe/mergify/bp/version-15-hotfix/pr-44776
fix: added docs.frappe.io in documentation_url (backport #44776)
|
2024-12-18 17:53:31 +05:30 |
|
Nabin Hait
|
0fd7792f49
|
fix: added docs.frappe.io in documentation_url (#44776)
(cherry picked from commit febdf4c61e)
|
2024-12-18 11:59:50 +00:00 |
|
Frappe PR Bot
|
9aed428939
|
chore(release): Bumped to Version 15.46.1
## [15.46.1](https://github.com/frappe/erpnext/compare/v15.46.0...v15.46.1) (2024-12-18)
### Bug Fixes
* 'str' object has no attribute 'get_sql' ([8eb8cc5](8eb8cc5d3c))
v15.46.1
|
2024-12-18 09:10:34 +00:00 |
|
ruthra kumar
|
cd497743f4
|
Merge pull request #44767 from frappe/mergify/bp/version-15/pr-44765
fix: 'str' object has no attribute 'get_sql' (backport #44765)
|
2024-12-18 14:39:16 +05:30 |
|
ruthra kumar
|
7350aa299e
|
Merge pull request #44770 from frappe/mergify/bp/version-15-hotfix/pr-44765
fix: 'str' object has no attribute 'get_sql' (backport #44765)
|
2024-12-18 14:34:09 +05:30 |
|
ljain112
|
8b810f5fb8
|
fix: 'str' object has no attribute 'get_sql'
(cherry picked from commit 9a43acb65c)
|
2024-12-18 08:44:27 +00:00 |
|
ljain112
|
8eb8cc5d3c
|
fix: 'str' object has no attribute 'get_sql'
(cherry picked from commit 9a43acb65c)
|
2024-12-18 08:43:16 +00:00 |
|
ruthra kumar
|
3ed7f761ba
|
Merge pull request #44760 from frappe/mergify/bp/version-15-hotfix/pr-44758
fix: use utility method to generate url (backport #44758)
|
2024-12-18 11:17:09 +05:30 |
|
ruthra kumar
|
75aee42635
|
fix: use utility method to generate url
(cherry picked from commit b970eb8b15)
|
2024-12-18 05:33:31 +00:00 |
|
Frappe PR Bot
|
375b48699f
|
chore(release): Bumped to Version 15.46.0
# [15.46.0](https://github.com/frappe/erpnext/compare/v15.45.5...v15.46.0) (2024-12-18)
### Bug Fixes
* add doc.status to translation from POS ([0ba6e60](0ba6e60608))
* allow all dispatch address for drop ship invoice ([db3a87c](db3a87c837))
* broken CI ([78d7d71](78d7d7148f))
* delink SABB from cancelled SLEs (backport [#44691](https://github.com/frappe/erpnext/issues/44691)) ([#44719](https://github.com/frappe/erpnext/issues/44719)) ([8940747](8940747161))
* duplicate Use Multi-Level BOM checkbox ([#44757](https://github.com/frappe/erpnext/issues/44757)) ([3ac801c](3ac801c884))
* handle zero salvage value case ([632a45d](632a45d82e))
* make rate of depreciation mandatory ([ed42ed0](ed42ed04d2))
* pos invoice return reference missing (backport [#44720](https://github.com/frappe/erpnext/issues/44720)) ([#44729](https://github.com/frappe/erpnext/issues/44729)) ([8aec131](8aec13115c))
* purchase return entry issue (backport [#44721](https://github.com/frappe/erpnext/issues/44721)) ([#44737](https://github.com/frappe/erpnext/issues/44737)) ([8ba7424](8ba7424996))
* remove invalid filter in Account Receivable report ([fdfbb57](fdfbb57779))
* set company bank account if default account not set in mode of payment ([a8f7393](a8f7393706))
* switched asset terminology from cost to value ([47c7356](47c7356b38))
* unsupported operand type (backport [#44722](https://github.com/frappe/erpnext/issues/44722)) ([#44723](https://github.com/frappe/erpnext/issues/44723)) ([158a480](158a4803ca))
* update cc_to multiselect in process statement of accounts ([df9bc33](df9bc33f34))
* update discount when pricing rule is changed ([f1a5000](f1a5000872))
* User permissions in financial statements ([83aeb2e](83aeb2e475))
* using query.walk() for escaping ([40a8ed8](40a8ed8571))
* Wrong allocated_amount for sales_team in gross_profit report ([#42989](https://github.com/frappe/erpnext/issues/42989)) ([328b9e7](328b9e7d9e))
### Features
* change type link to multiselect ([7665eac](7665eac277))
v15.46.0
|
2024-12-18 05:32:46 +00:00 |
|
ruthra kumar
|
bc601f36c9
|
Merge pull request #44741 from frappe/version-15-hotfix
chore: release v15
|
2024-12-18 11:01:28 +05:30 |
|
rohitwaghchaure
|
3ac801c884
|
fix: duplicate Use Multi-Level BOM checkbox (#44757)
|
2024-12-18 10:41:24 +05:30 |
|
ruthra kumar
|
2c0468e784
|
Merge pull request #44753 from frappe/mergify/bp/version-15-hotfix/pr-44695
fix: User permissions in financial statements (backport #44695)
|
2024-12-17 21:19:11 +05:30 |
|
ruthra kumar
|
cb03fed5d8
|
Merge pull request #44755 from frappe/mergify/bp/version-15-hotfix/pr-44708
fix: update discount when pricing rule is changed (backport #44708)
|
2024-12-17 21:10:27 +05:30 |
|
venkat102
|
f1a5000872
|
fix: update discount when pricing rule is changed
(cherry picked from commit 8338d1d5b4)
|
2024-12-17 15:13:22 +00:00 |
|
ljain112
|
40a8ed8571
|
fix: using query.walk() for escaping
(cherry picked from commit 5ea131c763)
|
2024-12-17 15:09:25 +00:00 |
|
ljain112
|
83aeb2e475
|
fix: User permissions in financial statements
(cherry picked from commit a626372d66)
|
2024-12-17 15:09:25 +00:00 |
|
ruthra kumar
|
2b27892fc2
|
Merge pull request #44750 from ruthra-kumar/backport_v15_pr_44581
fix: allow all dispatch address for drop ship invoice (backport #44581)
|
2024-12-17 17:52:14 +05:30 |
|
ruthra kumar
|
db3a87c837
|
fix: allow all dispatch address for drop ship invoice
|
2024-12-17 17:43:31 +05:30 |
|
ruthra kumar
|
09b28e89a9
|
Merge pull request #44748 from frappe/mergify/bp/version-15-hotfix/pr-44685
fix: set company bank account if default account not set in mode of p… (backport #44685)
|
2024-12-17 17:29:37 +05:30 |
|
ruthra kumar
|
96691bfdce
|
Merge pull request #44731 from frappe/mergify/bp/version-15-hotfix/pr-44650
feat: Multiselect cc in process statement of accounts (backport #44650)
|
2024-12-17 17:28:51 +05:30 |
|
venkat102
|
a8f7393706
|
fix: set company bank account if default account not set in mode of payment
(cherry picked from commit 91c7e3d5f3)
|
2024-12-17 11:50:10 +00:00 |
|
mergify[bot]
|
8ba7424996
|
fix: purchase return entry issue (backport #44721) (#44737)
fix: purchase return entry issue (#44721)
(cherry picked from commit 1f5d7072e7)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-17 14:48:18 +05:30 |
|
mergify[bot]
|
8aec13115c
|
fix: pos invoice return reference missing (backport #44720) (#44729)
fix: pos invoice return reference missing (#44720)
(cherry picked from commit 852596dbe6)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-17 12:29:42 +05:30 |
|
Khushi Rawat
|
6176411bcf
|
Merge pull request #44732 from khushi8112/bp-version-15-hotfix-pr-44690
fix: handle zero salvage value case backport-pr-44690
|
2024-12-17 12:27:53 +05:30 |
|
Smit Vora
|
218e777423
|
fix: better indicator base amount for Tax Witholding in Journal Entry
(cherry picked from commit 56a0a0db18)
|
2024-12-17 06:20:31 +00:00 |
|
Khushi Rawat
|
96dac012b6
|
Merge pull request #44710 from khushi8112/backport-pr-44647
fix: switched asset terminology from cost to value backport
|
2024-12-17 11:44:30 +05:30 |
|
Khushi Rawat
|
ed42ed04d2
|
fix: make rate of depreciation mandatory
|
2024-12-17 11:39:36 +05:30 |
|
ruthra kumar
|
f9a904c584
|
chore: resolve conflict
|
2024-12-17 11:38:45 +05:30 |
|
Khushi Rawat
|
632a45d82e
|
fix: handle zero salvage value case
|
2024-12-17 11:37:05 +05:30 |
|
rs-rethik
|
5b4eb5ea9a
|
chore: remove irrelevant import
(cherry picked from commit 5401cf9647)
|
2024-12-17 06:06:30 +00:00 |
|
rs-rethik
|
082fd27938
|
refactor: convert sql query to query builder
(cherry picked from commit 494ac04f8e)
|
2024-12-17 06:06:30 +00:00 |
|
rs-rethik
|
df9bc33f34
|
fix: update cc_to multiselect in process statement of accounts
(cherry picked from commit 2a6be127ef)
# Conflicts:
# erpnext/patches.txt
|
2024-12-17 06:06:30 +00:00 |
|
rs-rethik
|
7665eac277
|
feat: change type link to multiselect
(cherry picked from commit 4de180feee)
|
2024-12-17 06:06:29 +00:00 |
|
Khushi Rawat
|
02c5f7e9d1
|
chore: Merge branch 'version-15-hotfix'
|
2024-12-17 11:20:39 +05:30 |
|
mergify[bot]
|
8940747161
|
fix: delink SABB from cancelled SLEs (backport #44691) (#44719)
fix: delink SABB from cancelled SLEs (#44691)
(cherry picked from commit 5f539619bc)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-17 11:04:54 +05:30 |
|
mergify[bot]
|
158a4803ca
|
fix: unsupported operand type (backport #44722) (#44723)
fix: unsupported operand type (#44722)
(cherry picked from commit 95da0913f6)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-17 11:04:40 +05:30 |
|
ruthra kumar
|
06c3eaecc5
|
Merge pull request #44724 from frappe/mergify/bp/version-15-hotfix/pr-44713
fix: broken CI (backport #44713)
|
2024-12-17 10:02:45 +05:30 |
|
ruthra kumar
|
78d7d7148f
|
fix: broken CI
- always install wkhtmltopdf
- remove specific version on mariadb-client
(cherry picked from commit eb1e36ca22)
|
2024-12-17 04:12:58 +00:00 |
|
Khushi Rawat
|
47c7356b38
|
fix: switched asset terminology from cost to value
|
2024-12-16 11:58:38 +05:30 |
|
ruthra kumar
|
440e0aa521
|
Merge pull request #44698 from ruthra-kumar/backport_v15_pr_44676
fix: remove invalid filter in Account Receivable report (backport #44676)
|
2024-12-13 17:45:19 +05:30 |
|
ljain112
|
fdfbb57779
|
fix: remove invalid filter in Account Receivable report
|
2024-12-13 17:27:14 +05:30 |
|
ruthra kumar
|
1c5178f202
|
Merge pull request #44686 from ruthra-kumar/backport_v15_pr_42989
fix: Wrong allocated_amount for sales_team in gross_profit report (backport 42989)
|
2024-12-13 12:39:38 +05:30 |
|
Diógenes Souza
|
328b9e7d9e
|
fix: Wrong allocated_amount for sales_team in gross_profit report (#42989)
* fix: Wrong allocated_amount for sales_team in gross_profit report
* style: Removes whitespaces
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
|
2024-12-13 11:58:37 +05:30 |
|
ruthra kumar
|
eebb1a24bc
|
Merge pull request #44684 from frappe/backport_v15_pr_44621
fix: add doc.status to translation from POS (backport #44621)
|
2024-12-13 10:33:49 +05:30 |
|
mahsem
|
0ba6e60608
|
fix: add doc.status to translation from POS
|
2024-12-13 10:31:47 +05:30 |
|