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 |
|
ruthra kumar
|
85e0e8110a
|
Merge pull request #41149 from frappe/mergify/bp/version-15-hotfix/pr-41147
refactor: better description and pop up on Advance accounts (backport #41147)
|
2024-04-24 07:19:19 +05:30 |
|
Rohit Waghchaure
|
791e4269d2
|
feat: Available batches report as on specific date
(cherry picked from commit b8f7979794)
|
2024-04-23 16:48:56 +00:00 |
|
rohitwaghchaure
|
3df5aa04b5
|
Merge pull request #41153 from frappe/mergify/bp/version-15-hotfix/pr-41145
fix: incorrect stock posting for current qty (backport #41145)
|
2024-04-23 17:12:03 +05:30 |
|
Rohit Waghchaure
|
05d5c48d29
|
fix: incorrect stock posting for current qty
(cherry picked from commit d4fe313de2)
|
2024-04-23 11:21:47 +00:00 |
|
ruthra kumar
|
2b736b52d6
|
chore: resolve conflicts
|
2024-04-23 15:35:02 +05:30 |
|
ruthra kumar
|
24954b909b
|
refactor: popup to inform on limited support for Advance accounts
(cherry picked from commit 9dbd321133)
|
2024-04-23 09:17:00 +00:00 |
|
ruthra kumar
|
ed5affe25a
|
refactor: better description for advance account
(cherry picked from commit de9c8fc9d6)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
# erpnext/setup/doctype/company/company.json
|
2024-04-23 09:17:00 +00:00 |
|
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 |
|