mergify[bot]
|
177ca6f431
|
fix: Warehouse wise Stock Value chart roles (backport #44865) (#44866)
fix: Warehouse wise Stock Value chart roles (#44865)
(cherry picked from commit 7d41805d0e)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-23 22:30:45 +05:30 |
|
ruthra kumar
|
8915c804c1
|
Merge pull request #44848 from frappe/mergify/bp/version-14-hotfix/pr-44797
fix(ux): purchase invoice link in error message (backport #44797)
|
2024-12-23 15:17:58 +05:30 |
|
ruthra kumar
|
d506589d10
|
Merge pull request #44846 from frappe/mergify/bp/version-14-hotfix/pr-44738
fix: fetch tax withholding category from the voucher (backport #44738)
|
2024-12-23 15:03:12 +05:30 |
|
ruthra kumar
|
7ef15ec082
|
Merge pull request #44842 from frappe/mergify/bp/version-14-hotfix/pr-44813
fix: update correct cost center in Accounts Receivable Report (backport #44813)
|
2024-12-23 14:55:56 +05:30 |
|
Nijith anil
|
c9d43f4c88
|
fix(ux): purchase invoice link in error message (#44797)
* fix(ux): purchase invoice link in error message
* chore: fix linter
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 6f00a87a9c)
|
2024-12-23 09:19:26 +00:00 |
|
venkat102
|
1093c227f1
|
fix: fetch tax withholding category from the voucher
(cherry picked from commit 09e64594db)
|
2024-12-23 09:06:02 +00:00 |
|
venkat102
|
d0c60343cd
|
chore: use get function
(cherry picked from commit 1663c7983e)
|
2024-12-23 09:06:01 +00:00 |
|
vishakhdesai
|
97d5d18041
|
fix: do not set cost_center update_voucher_balance as it is set in init_voucher_balance
(cherry picked from commit 3b36ce560c)
|
2024-12-23 08:51:37 +00:00 |
|
vishakhdesai
|
197b13eb87
|
fix: update correct cost center in Accounts Receivable Report
(cherry picked from commit 09776e9a5a)
|
2024-12-23 08:51:37 +00:00 |
|
ruthra kumar
|
0986434871
|
Merge pull request #44837 from frappe/mergify/bp/version-14-hotfix/pr-44751
fix: buying rate for service item in gross profit report (backport #44751)
|
2024-12-23 12:08:12 +05:30 |
|
ljain112
|
7fa3a789b1
|
fix: buying rate for service item in gross profit report
(cherry picked from commit 8d6e79a16f)
|
2024-12-23 06:16:21 +00:00 |
|
ruthra kumar
|
647f039598
|
Merge pull request #44833 from frappe/mergify/bp/version-14-hotfix/pr-44644
fix: permissions for marking Quotation as lost (backport #44644)
|
2024-12-23 11:41:55 +05:30 |
|
ruthra kumar
|
00baa6a07f
|
Merge pull request #44829 from frappe/mergify/bp/version-14-hotfix/pr-44826
fix: Remove typo from `Bank Account` on trash (backport #44826)
|
2024-12-23 11:26:29 +05:30 |
|
ruthra kumar
|
67ba639ae1
|
chore: resolve conflicts
|
2024-12-23 11:16:04 +05:30 |
|
barredterra
|
0179358f07
|
fix: permissions for marking Quotation as lost
(cherry picked from commit 4d5241486f)
# Conflicts:
# erpnext/crm/doctype/competitor/competitor.json
# erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
|
2024-12-23 05:41:57 +00:00 |
|
mergify[bot]
|
4cb27b97b4
|
fix: closing stock balance permissions (backport #44791) (#44792)
* 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-23 10:54:34 +05:30 |
|
Abdeali Chharchhoda
|
422ada2726
|
fix: Remove typo
(cherry picked from commit ba28f6bf73)
|
2024-12-23 04:52:05 +00:00 |
|
mergify[bot]
|
d2ede713e4
|
fix: slow posting datetime update (backport #44799) (#44804)
fix: slow posting datetime update
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
|
2024-12-20 13:37:00 +05:30 |
|
ruthra kumar
|
e48022f2fe
|
Merge pull request #44777 from frappe/mergify/bp/version-14-hotfix/pr-44776
fix: added docs.frappe.io in documentation_url (backport #44776)
|
2024-12-18 17:53:22 +05:30 |
|
Nabin Hait
|
82a3fd13f2
|
fix: added docs.frappe.io in documentation_url (#44776)
(cherry picked from commit febdf4c61e)
|
2024-12-18 11:59:32 +00:00 |
|
ruthra kumar
|
becd64fccb
|
Merge pull request #44769 from frappe/mergify/bp/version-14-hotfix/pr-44765
fix: 'str' object has no attribute 'get_sql' (backport #44765)
|
2024-12-18 14:34:21 +05:30 |
|
ljain112
|
510e3cebc9
|
fix: 'str' object has no attribute 'get_sql'
(cherry picked from commit 9a43acb65c)
|
2024-12-18 08:43:18 +00:00 |
|
ruthra kumar
|
b4faee24da
|
Merge pull request #44759 from frappe/mergify/bp/version-14-hotfix/pr-44758
fix: use utility method to generate url (backport #44758)
|
2024-12-18 11:17:18 +05:30 |
|
ruthra kumar
|
d042330c30
|
fix: use utility method to generate url
(cherry picked from commit b970eb8b15)
|
2024-12-18 05:33:03 +00:00 |
|
ruthra kumar
|
caea52c280
|
Merge pull request #44752 from frappe/mergify/bp/version-14-hotfix/pr-44695
fix: User permissions in financial statements (backport #44695)
|
2024-12-17 21:18:53 +05:30 |
|
ruthra kumar
|
4473b74e1b
|
Merge pull request #44754 from frappe/mergify/bp/version-14-hotfix/pr-44708
fix: update discount when pricing rule is changed (backport #44708)
|
2024-12-17 21:10:41 +05:30 |
|
venkat102
|
0a7832d8d3
|
fix: update discount when pricing rule is changed
(cherry picked from commit 8338d1d5b4)
|
2024-12-17 15:13:03 +00:00 |
|
ljain112
|
3a7e335d4b
|
fix: using query.walk() for escaping
(cherry picked from commit 5ea131c763)
|
2024-12-17 15:09:08 +00:00 |
|
ljain112
|
8a9c457d37
|
fix: User permissions in financial statements
(cherry picked from commit a626372d66)
|
2024-12-17 15:09:08 +00:00 |
|
ruthra kumar
|
13be763105
|
Merge pull request #44749 from ruthra-kumar/backport_v14_pr_44581
fix: allow all dispatch address for drop ship invoice (backport #44581)
|
2024-12-17 20:39:05 +05:30 |
|
ruthra kumar
|
0688c0ab6b
|
fix: allow all dispatch address for drop ship invoice
|
2024-12-17 20:34:10 +05:30 |
|
ruthra kumar
|
7e00e55d18
|
Merge pull request #44734 from frappe/mergify/bp/version-14-hotfix/pr-44660
fix: better indicator base amount for Tax Witholding in Journal Entry (backport #44660)
|
2024-12-17 17:45:43 +05:30 |
|
ruthra kumar
|
ecca59c8a8
|
Merge pull request #44747 from frappe/mergify/bp/version-14-hotfix/pr-44685
fix: set company bank account if default account not set in mode of p… (backport #44685)
|
2024-12-17 17:29:15 +05:30 |
|
venkat102
|
2d12f2cebd
|
fix: set company bank account if default account not set in mode of payment
(cherry picked from commit 91c7e3d5f3)
|
2024-12-17 11:50:04 +00:00 |
|
ruthra kumar
|
c86174d0f2
|
fix: broken CI
- pin ubuntu-22.04
|
2024-12-17 16:28:15 +05:30 |
|
mergify[bot]
|
744f3457de
|
fix: purchase return entry issue (backport #44721) (#44736)
fix: purchase return entry issue (#44721)
(cherry picked from commit 1f5d7072e7)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-17 14:48:59 +05:30 |
|
Smit Vora
|
4a261b5cef
|
fix: better indicator base amount for Tax Witholding in Journal Entry
(cherry picked from commit 56a0a0db18)
|
2024-12-17 06:20:32 +00:00 |
|
ruthra kumar
|
bad744194f
|
Merge pull request #44699 from ruthra-kumar/backport_v14_pr_44676
fix: remove invalid filter in Account Receivable report (backport #44676)
|
2024-12-13 17:53:28 +05:30 |
|
ljain112
|
b571c7af87
|
fix: remove invalid filter in Account Receivable report
|
2024-12-13 17:29:17 +05:30 |
|
rohitwaghchaure
|
4b4d5dfa63
|
fix: incorrect status of the purchase receipt (#44689)
|
2024-12-13 12:44:03 +05:30 |
|
ruthra kumar
|
4c8b4419b6
|
Merge pull request #44687 from ruthra-kumar/backport_v14_pr_42989
fix: Wrong allocated_amount for sales_team in gross_profit report (backport #43989)
|
2024-12-13 12:39:28 +05:30 |
|
Diógenes Souza
|
d83cc57e58
|
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 12:01:04 +05:30 |
|
Nicolas Pereira
|
00898be8e4
|
fix: Stock Entry uses incorrect company when generated from Pick List (#44679)
|
2024-12-13 10:21:30 +05:30 |
|
mergify[bot]
|
a460bf9433
|
fix: description overwrite on qty change (backport #44606) (#44608)
* fix: description overwrite on qty change (#44606)
(cherry picked from commit 9ad79625e0)
# Conflicts:
# erpnext/stock/doctype/material_request/material_request.js
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-12-09 19:12:09 +05:30 |
|
ruthra kumar
|
30151da57c
|
Merge pull request #44611 from ruthra-kumar/backport_v14_44495
fix: prevent set_payment_schedule on return documents
|
2024-12-09 13:34:15 +05:30 |
|
ruthra kumar
|
3c8b637a8b
|
fix: prevent set_payment_schedule on return documents
|
2024-12-09 13:00:56 +05:30 |
|
ruthra kumar
|
6fa338bfb7
|
Merge pull request #44602 from frappe/mergify/bp/version-14-hotfix/pr-44582
fix: add doc.status for translation (backport #44582)
|
2024-12-09 12:56:05 +05:30 |
|
ruthra kumar
|
9664790272
|
chore: fix linter
|
2024-12-09 12:08:54 +05:30 |
|
mahsem
|
0a4090a771
|
fix: add docstatus for translation
(cherry picked from commit dda272220b)
|
2024-12-09 05:51:35 +00:00 |
|
mergify[bot]
|
ebc8bede7f
|
fix(Bank Transaction): error in party matching should not block submitting (backport #44416) (#44573)
fix(Bank Transaction): error in party matching should not block submitting (#44416)
(cherry picked from commit 72256565bb)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2024-12-06 11:57:52 +01:00 |
|