ruthra kumar
|
8d70a0e0bc
|
fix: permission issue when user permission restricts on company
|
2024-04-30 12:20:10 +05:30 |
|
Deepesh Garg
|
69c05e5843
|
Merge pull request #41251 from frappe/mergify/bp/version-15-hotfix/pr-41173
fix: paid amount in bank reconciliation tool (#41173)
|
2024-04-30 11:15:39 +05:30 |
|
Deepesh Garg
|
6ab91a5c88
|
Merge pull request #41250 from frappe/mergify/bp/version-15-hotfix/pr-41219
fix: Ignore user perm in Bank Reco Tool for company (#41219)
|
2024-04-30 11:15:19 +05:30 |
|
Deepesh Garg
|
759c7f5490
|
fix: paid amount in bank reconciliation tool
(cherry picked from commit a48966f08c)
|
2024-04-30 04:55:51 +00:00 |
|
Deepesh Garg
|
03b4a85825
|
chore: resolve conflicts
|
2024-04-30 10:25:51 +05:30 |
|
Deepesh Garg
|
737c4809e3
|
fix: Ignore user perm in Bank Reco Tool for company
(cherry picked from commit 9f346e7ba0)
# Conflicts:
# erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
|
2024-04-30 04:53:24 +00:00 |
|
Deepesh Garg
|
3657badb31
|
Merge pull request #41239 from frappe/mergify/bp/version-15-hotfix/pr-41237
fix: party and party type label on accounting preview (#41237)
|
2024-04-30 10:23:17 +05:30 |
|
ruthra kumar
|
ef69a46e6a
|
Merge pull request #41249 from frappe/mergify/bp/version-15-hotfix/pr-41240
fix: display term name for single term invoices in AR/AP (backport #41240)
|
2024-04-30 07:42:41 +05:30 |
|
ruthra kumar
|
78106836be
|
Merge pull request #41247 from frappe/mergify/bp/version-15-hotfix/pr-41194
fix: TDS incorrectly applied when Advance is in previous FY (backport #41194)
|
2024-04-30 07:18:04 +05:30 |
|
ruthra kumar
|
a7d1a88519
|
fix: display term name for single term invoices
(cherry picked from commit 5fa4cfee04)
|
2024-04-30 01:40:17 +00:00 |
|
ruthra kumar
|
15ac3d8b0b
|
test: TDS deduction across fiscal year
(cherry picked from commit 2f9a144023)
|
2024-04-30 01:27:55 +00:00 |
|
ruthra kumar
|
08f888a326
|
fix: incorrectly applying TDS when Advance is in previous FY
(cherry picked from commit b195f519e2)
|
2024-04-30 01:27:54 +00:00 |
|
Nikhil Kothari
|
ee9822fd42
|
fix: party and party type label on accounting preview
(cherry picked from commit f7f3b22786)
|
2024-04-29 13:24:48 +00:00 |
|
Deepesh Garg
|
17eb2f02f4
|
Merge pull request #41226 from frappe/mergify/bp/version-15-hotfix/pr-40865
fix: missing def expense if no exp in first month (#40865)
|
2024-04-29 17:25:15 +05:30 |
|
Ankush Menat
|
067419b7cd
|
chore: delete invalid translations (#41227)
|
2024-04-29 10:31:22 +05:30 |
|
Dany Robert
|
acfee42735
|
fix: expense causing p&l test case to fail
(cherry picked from commit 01888c98bc)
|
2024-04-29 04:55:32 +00:00 |
|
Dany Robert
|
62966ac550
|
chore: semgrep
(cherry picked from commit 581af4eced)
|
2024-04-29 04:55:32 +00:00 |
|
Dany Robert
|
23c3c3cc0c
|
fix: test case for zero deferred expense
(cherry picked from commit 7ef4dbcaf6)
|
2024-04-29 04:55:32 +00:00 |
|
Dany Robert
|
0a65a37eed
|
fix: missing def expense if no exp in first month
(cherry picked from commit 5c9ce575f6)
|
2024-04-29 04:55:31 +00:00 |
|
ruthra kumar
|
0df1005cb2
|
Merge pull request #41209 from frappe/mergify/bp/version-15-hotfix/pr-41208
fix: set receivable account based on response type (backport #41208)
|
2024-04-26 20:30:55 +05:30 |
|
rohitwaghchaure
|
807b2d5c0a
|
Merge pull request #41206 from frappe/mergify/bp/version-15-hotfix/pr-41165
feat: allow to do reposting for all stock transactions (audit) (backport #41165)
|
2024-04-26 14:25:40 +05:30 |
|
ruthra kumar
|
f65b28a189
|
fix: handle and receivable accounts based on response type
(cherry picked from commit 066859cca0)
|
2024-04-26 08:43:23 +00:00 |
|
rohitwaghchaure
|
a292e52b34
|
chore: fix conflicts
|
2024-04-26 13:47:03 +05:30 |
|
Rohit Waghchaure
|
4555f8a9a6
|
feat: allow to do reposting for all transactions (audit)
(cherry picked from commit aefbe21b46)
# Conflicts:
# erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
|
2024-04-26 08:15:11 +00:00 |
|
rohitwaghchaure
|
0fea5564b6
|
Merge pull request #41201 from frappe/mergify/bp/version-15-hotfix/pr-41185
fix: args when get the delivery note in delivery trip (backport #41185)
|
2024-04-26 13:34:44 +05:30 |
|
rohitwaghchaure
|
476b7f43a2
|
Merge pull request #41202 from frappe/mergify/bp/version-15-hotfix/pr-41182
fix: rendering the email template when user HTML (backport #41182)
|
2024-04-26 13:34:27 +05:30 |
|
rohitwaghchaure
|
d5d846f481
|
Merge pull request #41203 from frappe/mergify/bp/version-15-hotfix/pr-41167
fix: warehouse type filter for stock reports (backport #41167)
|
2024-04-26 13:34:00 +05:30 |
|
rohitwaghchaure
|
6fd356b654
|
chore: fix conflicts
|
2024-04-26 13:13:55 +05:30 |
|
Rohit Waghchaure
|
48351d6da8
|
fix: warehouse type filter for stock reports
(cherry picked from commit 4250ac821f)
|
2024-04-26 07:41:48 +00:00 |
|
Nihantra C. Patel
|
3068dad410
|
fix: rendering the email template when user HTML
(cherry picked from commit 7cb66f7fd3)
|
2024-04-26 07:41:37 +00:00 |
|
Nihantra Patel
|
61d6838b2c
|
fix: args when get the delivery note in delivery trip
(cherry picked from commit ca577f7aaa)
|
2024-04-26 07:40:36 +00:00 |
|
Nihantra Patel
|
e9acacdd5d
|
fix: args when get the delivery note in delivery trip
(cherry picked from commit 2f359e201d)
# Conflicts:
# erpnext/stock/doctype/delivery_note/delivery_note.py
|
2024-04-26 07:40:36 +00:00 |
|
rohitwaghchaure
|
3bb26fde2b
|
Merge pull request #41199 from frappe/mergify/bp/version-15-hotfix/pr-41195
fix: basic rate for SABB (backport #41195)
|
2024-04-26 12:54:46 +05:30 |
|
Rohit Waghchaure
|
7b7987363f
|
fix: basic rate for SABB
(cherry picked from commit 7fa94843aa)
|
2024-04-26 07:21:46 +00:00 |
|
rohitwaghchaure
|
3193ef0a89
|
Merge pull request #41197 from frappe/mergify/bp/version-15-hotfix/pr-41192
fix: duplicate column in the stock ledger report (backport #41192)
|
2024-04-26 12:49:25 +05:30 |
|
Rohit Waghchaure
|
a62298a635
|
fix: duplicate column in the stock ledger report
(cherry picked from commit be7fd6bfb4)
|
2024-04-26 06:53:14 +00:00 |
|
ruthra kumar
|
e6c7832485
|
Merge pull request #41189 from frappe/mergify/bp/version-15-hotfix/pr-41183
fix: restrict Advance in separate party to customer and supplier (backport #41183)
|
2024-04-25 20:35:50 +05:30 |
|
ruthra kumar
|
c3073d6e74
|
fix: enable advance in separate acc only for customer and Supplier
(cherry picked from commit 3c1af2acf0)
|
2024-04-25 14:30:58 +00:00 |
|
mergify[bot]
|
b34582e6ba
|
fix: handle stock balance unbuffered_cursor error (backport #41186) (#41188)
fix: handle stock balance unbuffered_cursor error (#41186)
(cherry picked from commit 341fb6d8f3)
Co-authored-by: Ankush Menat <ankush@frappe.io>
|
2024-04-25 17:26:26 +05:30 |
|
ruthra kumar
|
5136ffd10d
|
Merge pull request #41139 from frappe/mergify/bp/version-15-hotfix/pr-41086
fix: prevent foreign currency accounts as advance accounts. (backport #41086)
|
2024-04-25 09:37:49 +05:30 |
|
ruthra kumar
|
5988941032
|
Merge pull request #41177 from frappe/mergify/bp/version-15-hotfix/pr-41142
fix: mode of payment has precedance in Payment Entry (backport #41142)
|
2024-04-25 08:55:20 +05:30 |
|
ruthra kumar
|
c6145a1101
|
fix: mode of payment has precedance
Mode of Payment is given precedence over company/party bank account
(cherry picked from commit 4aef969879)
|
2024-04-25 03:13:13 +00:00 |
|
Deepesh Garg
|
15bb41d3c2
|
Merge pull request #41164 from frappe/mergify/bp/version-15-hotfix/pr-41106
chore: Remove heatmap from party dashboards (#41106)
|
2024-04-24 13:00:50 +05:30 |
|
Deepesh Garg
|
410990b2a3
|
chore: Remove heatmap from party dashboards
(cherry picked from commit a8f03e8baa)
|
2024-04-24 06:32:03 +00:00 |
|
Deepesh Garg
|
51a2b74db9
|
Merge pull request #41101 from frappe/mergify/bp/version-15-hotfix/pr-41085
fix: Permission for lower deduction certificate (#41085)
|
2024-04-24 12:00:50 +05:30 |
|
Deepesh Garg
|
bfc34939f2
|
Merge pull request #41048 from frappe/mergify/bp/version-15-hotfix/pr-40962
fix: Allow updating cost center and project for repostable doctypes (#40962)
|
2024-04-24 12:00:28 +05:30 |
|
mergify[bot]
|
90d6e550aa
|
fix: allow Employee role to select cost center & project (accounting dimensions) (backport #41160) (#41162)
* fix: allow Employee role to select cost center & project (accounting dimensions)
(cherry picked from commit d0d496a515)
# Conflicts:
# erpnext/accounts/doctype/cost_center/cost_center.json
# erpnext/projects/doctype/project/project.json
* chore: fix conflicts
---------
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2024-04-24 11:43:46 +05:30 |
|
Deepesh Garg
|
4f5af0ff9f
|
chore: Resolve conflicts
|
2024-04-24 11:32:26 +05:30 |
|
rohitwaghchaure
|
ab21b518e1
|
Merge pull request #41156 from frappe/mergify/bp/version-15-hotfix/pr-41135
feat: Available batches as on specific date report (backport #41135)
|
2024-04-24 11:14:16 +05:30 |
|
Nabin Hait
|
d4e2adbdb2
|
Merge pull request #41141 from frappe/mergify/bp/version-15-hotfix/pr-41136
fix: Missing args while fetching items from delivery note in Installation Note (backport #41136)
|
2024-04-24 10:58:34 +05:30 |
|