ruthra kumar
|
ba45ea42f8
|
Merge pull request #41246 from frappe/mergify/bp/version-14-hotfix/pr-41194
fix: TDS incorrectly applied when Advance is in previous FY (backport #41194)
|
2024-04-30 07:42:23 +05:30 |
|
ruthra kumar
|
4d56c46446
|
test: TDS deduction across fiscal year
(cherry picked from commit 2f9a144023)
|
2024-04-30 07:04:21 +05:30 |
|
ruthra kumar
|
eb22fb9326
|
fix: incorrectly applying TDS when Advance is in previous FY
(cherry picked from commit b195f519e2)
|
2024-04-30 01:27:56 +00:00 |
|
rohitwaghchaure
|
54313b5db9
|
fix: multiple pricing rules with discount amount and discount percentage not working (#41211)
|
2024-04-29 20:53:10 +05:30 |
|
mergify[bot]
|
866b0c6ac7
|
chore: delete invalid translations (backport #41227) (#41228)
chore: delete invalid translations (#41227)
(cherry picked from commit 067419b7cd)
Co-authored-by: Ankush Menat <ankush@frappe.io>
|
2024-04-29 10:41:54 +05:30 |
|
mergify[bot]
|
1e1319351d
|
feat: allow to do reposting for all stock transactions (audit) (backport #41165) (#41205)
* 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
# erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
|
2024-04-26 14:25:51 +05:30 |
|
rohitwaghchaure
|
6b2874694e
|
Merge pull request #41204 from rohitwaghchaure/fixed-unbuffered_cursor
fix: 'NoneType' object has no attribute '_read_rowdata_packet_unbuffe…
|
2024-04-26 13:50:07 +05:30 |
|
rohitwaghchaure
|
ff37706bef
|
Merge pull request #41200 from frappe/mergify/bp/version-14-hotfix/pr-41185
fix: args when get the delivery note in delivery trip (backport #41185)
|
2024-04-26 13:36:14 +05:30 |
|
Rohit Waghchaure
|
949aa9346c
|
fix: 'NoneType' object has no attribute '_read_rowdata_packet_unbuffered'
|
2024-04-26 13:25:46 +05:30 |
|
rohitwaghchaure
|
2f6fee9877
|
chore: fix conflicts
|
2024-04-26 13:15:32 +05:30 |
|
Nihantra Patel
|
abe64aa1ab
|
fix: args when get the delivery note in delivery trip
(cherry picked from commit ca577f7aaa)
|
2024-04-26 07:40:32 +00:00 |
|
Nihantra Patel
|
1a7b3c437d
|
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:31 +00:00 |
|
rohitwaghchaure
|
da69b1e71b
|
Merge pull request #41196 from frappe/mergify/bp/version-14-hotfix/pr-41192
fix: duplicate column in the stock ledger report (backport #41192)
|
2024-04-26 12:49:35 +05:30 |
|
Rohit Waghchaure
|
3fcdcef178
|
fix: duplicate column in the stock ledger report
(cherry picked from commit be7fd6bfb4)
|
2024-04-26 06:53:08 +00:00 |
|
rohitwaghchaure
|
7656fe4bfc
|
Merge pull request #41174 from rohitwaghchaure/fixed-performance-issue-for-serial-no-creation
perf: timeout issue while submitting purchase receipt (v14)
|
2024-04-26 10:56:28 +05:30 |
|
mergify[bot]
|
59010c9a61
|
fix: handle stock balance unbuffered_cursor error (backport #41186) (#41187)
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:29 +05:30 |
|
Rohit Waghchaure
|
113351e850
|
perf: timeout issue while submitting purchase receipt (v14)
|
2024-04-25 12:10:29 +05:30 |
|
ruthra kumar
|
b9d28fc1ad
|
Merge pull request #41178 from frappe/mergify/bp/version-14-hotfix/pr-41142
fix: mode of payment has precedance in Payment Entry (backport #41142)
|
2024-04-25 09:02:37 +05:30 |
|
ruthra kumar
|
33d38ba3a7
|
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 08:58:01 +05:30 |
|
Deepesh Garg
|
3e81f0f578
|
Merge pull request #41100 from frappe/mergify/bp/version-14-hotfix/pr-41085
fix: Permission for lower deduction certificate (#41085)
|
2024-04-24 12:00:13 +05:30 |
|
mergify[bot]
|
bb48440591
|
fix: allow Employee role to select cost center & project (accounting dimensions) (backport #41160) (#41161)
* 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:33 +05:30 |
|
Deepesh Garg
|
35230a9692
|
chore: Resolve conflicts
|
2024-04-24 11:33:34 +05:30 |
|
Nabin Hait
|
df3ff1097c
|
Merge pull request #41140 from frappe/mergify/bp/version-14-hotfix/pr-41136
fix: Missing args while fetching items from delivery note in Installation Note (backport #41136)
|
2024-04-24 10:59:16 +05:30 |
|
rohitwaghchaure
|
521bf31fe3
|
Merge pull request #41154 from rohitwaghchaure/feat-new-batch-report-v14
feat: Available batches report as on specific date
|
2024-04-23 17:17:26 +05:30 |
|
Rohit Waghchaure
|
8868cb147d
|
feat: Available batches report as on specific date
|
2024-04-23 17:10:05 +05:30 |
|
Deepesh Garg
|
0dfae12f14
|
Merge pull request #41130 from frappe/mergify/bp/version-14-hotfix/pr-40797
fix: Party type in Payment Order (#40797)
|
2024-04-23 12:05:25 +05:30 |
|
Nabin Hait
|
0df80ad923
|
fix: Missing args while fetching items from delivery note
(cherry picked from commit bbe323fbb4)
|
2024-04-23 04:55:02 +00:00 |
|
rohitwaghchaure
|
c71d1118a9
|
Merge pull request #41138 from rohitwaghchaure/fixed-performance-for-stock-reports
perf: stock ageing and batch-wise balance history report
|
2024-04-23 10:12:19 +05:30 |
|
Rohit Waghchaure
|
6017e7ac3e
|
perf: stock ageing and batch-wise balance history report
|
2024-04-23 06:56:41 +05:30 |
|
Deepesh Garg
|
d5784cc629
|
Merge pull request #41126 from frappe/mergify/bp/version-14-hotfix/pr-40812
fix: Multiple partial payment requests against Purchase Invoice (#40812)
|
2024-04-22 11:36:30 +05:30 |
|
Deepesh Garg
|
a2e1d132df
|
fix: Party type in Payment Order
(cherry picked from commit 91fa41c9ec)
|
2024-04-22 06:05:12 +00:00 |
|
Gursheen Kaur Anand
|
3e912993e1
|
Merge pull request #41123 from frappe/mergify/bp/version-14-hotfix/pr-40769
fix: budget validation for purchase orders (backport #40769)
|
2024-04-21 18:57:52 +05:30 |
|
Deepesh Garg
|
5aef9d2ef2
|
fix: Test case
(cherry picked from commit 071e5ed648)
|
2024-04-21 11:50:38 +00:00 |
|
Deepesh Garg
|
f1b75e8c54
|
fix: Multiple partial payment requests against Purchase Invoice
(cherry picked from commit 45d5f6e00a)
|
2024-04-21 11:50:38 +00:00 |
|
Gursheen Anand
|
5b1c5e3fea
|
refactor: show list for expense breakup
(cherry picked from commit 9a12376e29)
|
2024-04-21 11:26:19 +00:00 |
|
Gursheen Anand
|
f087ec8df5
|
feat: show expense breakup
(cherry picked from commit 59292a09c4)
|
2024-04-21 11:26:19 +00:00 |
|
Gursheen Anand
|
ec4f07fd60
|
fix: do not add actual expense twice for validating budget
(cherry picked from commit af26ac96e9)
|
2024-04-21 11:26:19 +00:00 |
|
Deepesh Garg
|
a22be6f9b9
|
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:41 +00:00 |
|
Gursheen Kaur Anand
|
e8accd0256
|
Merge pull request #41094 from frappe/mergify/bp/version-14-hotfix/pr-41093
fix: accounts manager perm for FY (backport #41093)
|
2024-04-19 14:08:19 +05:30 |
|
Gursheen Kaur Anand
|
de3a423618
|
chore: resolve conflicts
|
2024-04-19 13:32:39 +05:30 |
|
Gursheen Anand
|
03ce9ee321
|
fix: account and stock manager read perm
(cherry picked from commit 572e844a91)
# Conflicts:
# erpnext/accounts/doctype/fiscal_year/fiscal_year.json
|
2024-04-19 08:00:48 +00:00 |
|
mergify[bot]
|
9d0c1dc46f
|
fix: validate uom is integer for PR item (backport #41074) (#41076)
* fix: validate uom is integer for PR item
(cherry picked from commit 9a290fdfc9)
# Conflicts:
# erpnext/controllers/subcontracting_controller.py
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
|
2024-04-18 07:53:33 +05:30 |
|
mergify[bot]
|
5d05bf8d4e
|
fix: don't attempt to set gender from salutation (backport #40997) (#41072)
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:54:03 +02:00 |
|
ruthra kumar
|
4cc0a5851b
|
Merge pull request #40854 from frappe/mergify/bp/version-14-hotfix/pr-40786
fix(gp): SLEs not fetched for correct warehouse (backport #40786)
|
2024-04-17 10:36:52 +05:30 |
|
ruthra kumar
|
6e9da0a729
|
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-40786
|
2024-04-17 10:16:55 +05:30 |
|
Dany Robert
|
97e7b3f3d3
|
fix(gp): SLEs not fetched for correct warehouse
(cherry picked from commit f958e8be06)
|
2024-04-17 10:15:29 +05:30 |
|
mergify[bot]
|
e956dbbf68
|
fix: Delayed Order Report not working (backport #41037) (#41038)
fix: Delayed Order Report not working (#41037)
(cherry picked from commit d69a18b826)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-04-16 18:24:45 +05:30 |
|
rohitwaghchaure
|
ebf5f13447
|
Merge branch 'version-14' into version-14-hotfix
|
2024-04-16 17:59:35 +05:30 |
|
ruthra kumar
|
9404dea97e
|
Merge pull request #41034 from frappe/mergify/bp/version-14-hotfix/pr-40373
fix: get address if multiple companies (backport #40373)
|
2024-04-16 16:41:26 +05:30 |
|
ruthra kumar
|
ee06448f0d
|
chore: resolve conflict
|
2024-04-16 16:38:32 +05:30 |
|