venkat102
|
431fa225e3
|
fix: include pos invoice in modifing key for returned item validation
(cherry picked from commit 2936139c79)
|
2025-01-21 11:06:02 +00:00 |
|
ruthra kumar
|
f27e35c8f4
|
Merge pull request #45351 from frappe/mergify/bp/version-14-hotfix/pr-44808
feat: Added difference_posting_date field in Sales Invoice Advance and Purchase Invoice Advance (backport #44808)
|
2025-01-21 14:48:27 +05:30 |
|
ruthra kumar
|
5fbffcbd7b
|
Merge pull request #45311 from frappe/mergify/bp/version-14-hotfix/pr-45175
fix(Project): re-phrase welcome email (backport #45175)
|
2025-01-21 13:56:30 +05:30 |
|
ruthra kumar
|
bb949da334
|
Merge pull request #45313 from frappe/mergify/bp/version-14-hotfix/pr-45271
fix: round off tax withholding amount (backport #45271)
|
2025-01-21 13:55:19 +05:30 |
|
ruthra kumar
|
8764a321c7
|
chore: resolve conflicts
|
2025-01-21 12:57:10 +05:30 |
|
rs-rethik
|
49e3865265
|
fix: update query
(cherry picked from commit 854e37c05c)
|
2025-01-21 06:54:23 +00:00 |
|
rs-rethik
|
33a1da8194
|
refactor: convert sql query to query builder
(cherry picked from commit 2d58e845e6)
|
2025-01-21 06:54:23 +00:00 |
|
rs-rethik
|
52309fe0b6
|
test: add unit test to validate journal entry posting date
(cherry picked from commit c14a2d73bf)
# Conflicts:
# erpnext/controllers/tests/test_accounts_controller.py
|
2025-01-21 06:54:23 +00:00 |
|
rs-rethik
|
0fdd6817a6
|
feat: use difference_posting_date for journal entry posting_date
(cherry picked from commit ff1d040a6e)
|
2025-01-21 06:54:22 +00:00 |
|
rs-rethik
|
17535095e2
|
feat: add difference_posting_date field
(cherry picked from commit 225e56cbca)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
# erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py
# erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
# erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py
|
2025-01-21 06:54:22 +00:00 |
|
ruthra kumar
|
4d74597f94
|
Merge pull request #45336 from frappe/mergify/bp/version-14-hotfix/pr-45167
fix: validate linked sales person (backport #45167)
|
2025-01-20 12:10:39 +05:30 |
|
Sudharsanan11
|
f9420db3ca
|
fix: validate linked sales person
(cherry picked from commit e614f07795)
|
2025-01-20 06:20:20 +00:00 |
|
rohitwaghchaure
|
8996685f44
|
Merge pull request #45326 from frappe/mergify/bp/version-14-hotfix/pr-44783
fix: do not reset picked items (backport #44783)
|
2025-01-19 15:07:00 +05:30 |
|
rohitwaghchaure
|
7046a01921
|
chore: fix test case
|
2025-01-19 14:22:52 +05:30 |
|
rohitwaghchaure
|
0b8cf3a369
|
chore: fix conflicts
|
2025-01-19 13:52:49 +05:30 |
|
Rohit Waghchaure
|
fe5de30256
|
fix: do not reset picked items
(cherry picked from commit 34a80bfcd3)
# Conflicts:
# erpnext/stock/doctype/pick_list/test_pick_list.py
|
2025-01-18 10:15:22 +00:00 |
|
barredterra
|
20bb15167d
|
revert: avoid change to translatable string
|
2025-01-17 14:38:27 +01:00 |
|
barredterra
|
1ccf30d97b
|
chore: resolve confilcts
|
2025-01-17 14:38:03 +01:00 |
|
mergify[bot]
|
524a8d77f7
|
fix: pos search by term items price (backport #45006) (#45102)
* fix: load price list rate for pos search term
(cherry picked from commit 4b6cae156e)
# Conflicts:
# erpnext/selling/page/point_of_sale/point_of_sale.py
* fix: load search term price with customer default price list
(cherry picked from commit 2beb485d77)
* chore: resolve conflict
---------
Co-authored-by: diptanilsaha <diptanil.dev@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
|
2025-01-17 17:02:34 +05:30 |
|
Lakshit Jain
|
667e659e3f
|
fix: round off tax withholding amount (#45271)
(cherry picked from commit ada272a29b)
|
2025-01-17 11:21:09 +00:00 |
|
Patrick Eißler
|
77e92b38eb
|
fix(Project): re-phrase welcome email (#45175)
(cherry picked from commit 8d66142865)
# Conflicts:
# erpnext/projects/doctype/project/project.py
|
2025-01-17 11:19:03 +00:00 |
|
ruthra kumar
|
a66d475b56
|
Merge pull request #45253 from frappe/mergify/bp/version-14-hotfix/pr-45001
fix: deduct tds on excess amount if checked (backport #45001)
|
2025-01-14 10:28:19 +05:30 |
|
ljain112
|
6a52f79cce
|
fix: deduct tds on excess amount if checked
(cherry picked from commit a203e3ffaf)
|
2025-01-14 04:33:09 +00:00 |
|
mergify[bot]
|
49ffeccafa
|
fix(Timesheet): ignore permissions when updating Task and Project (backport #45168) (#45171)
* fix(Timesheet): ignore permissions when updating Task and Project (#45168)
(cherry picked from commit 9e760e54a5)
# Conflicts:
# erpnext/projects/doctype/timesheet/timesheet.py
* chore: resolve conflicts
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2025-01-13 12:08:26 +05:30 |
|
Nabin Hait
|
6bc210d9f4
|
fix: typo (#45233)
|
2025-01-13 12:04:40 +05:30 |
|
mergify[bot]
|
f4b7fa8980
|
feat: validate discount date in payment schedule (backport #44646) (#44726)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
|
2025-01-09 18:51:27 +01:00 |
|
rohitwaghchaure
|
c331a4fa84
|
Merge pull request #45185 from frappe/mergify/bp/version-14-hotfix/pr-45180
fix: do not add ordered items from Quotation to new Sales Order (backport #45180)
|
2025-01-09 16:27:15 +05:30 |
|
Rohit Waghchaure
|
d42173beb5
|
fix: do not add ordered items from Quotation to new Sales Order
(cherry picked from commit 2e930eb97b)
|
2025-01-09 09:09:56 +00:00 |
|
ruthra kumar
|
b2d35fae10
|
Merge pull request #45156 from frappe/revert-45152-mergify/bp/version-14-hotfix/pr-45112
Revert "fix: Missing company filter breaks `get_account_balance` in Bank Reco (backport #45112)"
|
2025-01-08 09:01:37 +05:30 |
|
ruthra kumar
|
8d13ef050e
|
Revert "fix: Missing company filter breaks get_account_balance in Bank Reco (backport #45112)"
|
2025-01-08 09:00:21 +05:30 |
|
ruthra kumar
|
8ac40f07e3
|
Merge pull request #45152 from frappe/mergify/bp/version-14-hotfix/pr-45112
fix: Missing company filter breaks `get_account_balance` in Bank Reco (backport #45112)
|
2025-01-08 08:59:22 +05:30 |
|
marination
|
46894a5b86
|
fix: Override pre-commit behaviour due to conflicts with CI
(cherry picked from commit d7bf73cffa)
|
2025-01-08 02:46:51 +00:00 |
|
marination
|
821cfe2c39
|
fix: Missing company filter breaks get_account_balance in Bank Reco
(cherry picked from commit 8de0fe78ea)
|
2025-01-08 02:46:51 +00:00 |
|
ruthra kumar
|
b8b76a5b58
|
Merge pull request #45122 from frappe/mergify/bp/version-14-hotfix/pr-45121
fix: discount resetting on date change (backport #45121)
|
2025-01-07 11:26:24 +05:30 |
|
ruthra kumar
|
01d2794968
|
fix: discount resetting on date change
revert #44989
(cherry picked from commit 886281f81a)
|
2025-01-07 05:51:46 +00:00 |
|
ruthra kumar
|
02cfb589a2
|
Merge pull request #45108 from frappe/mergify/bp/version-14-hotfix/pr-45107
fix: Returned Qty in Work Order Consumed Materials report (backport #45107)
|
2025-01-07 10:12:56 +05:30 |
|
ruthra kumar
|
caf5faceda
|
Merge pull request #45119 from frappe/mergify/bp/version-14-hotfix/pr-45118
fix(Project): make status in confirmation dialog translatable (backport #45118)
|
2025-01-07 10:12:04 +05:30 |
|
Raffael Meyer
|
07653c54f3
|
fix(Project): make status in confirmation dialog translatable (#45118)
(cherry picked from commit 9eede907f8)
|
2025-01-06 22:13:47 +00:00 |
|
Rohit Waghchaure
|
affa67e74d
|
fix: Returned Qty in Work Order Consumed Materials report
(cherry picked from commit 30d68a31e0)
|
2025-01-06 10:37:28 +00:00 |
|
mergify[bot]
|
2d63fc98d0
|
fix: update customer contact details on pos (backport #45071) (#45105)
fix: update customer contact details on pos (#45071)
* fix: update customer contact details on pos
* refactor: removed console log statement
(cherry picked from commit d79e561248)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-01-06 14:58:36 +05:30 |
|
ruthra kumar
|
8bb4415f65
|
Merge pull request #45079 from frappe/mergify/bp/version-14-hotfix/pr-44983
fix: add monthly distributation and write query in qb (backport #44983)
|
2025-01-06 10:28:45 +05:30 |
|
ruthra kumar
|
90b2ec9aba
|
Merge pull request #42438 from trustedcomputer/version-14-hotfix
fix: header_img field schema (backport payments #83)
|
2025-01-04 05:20:58 +05:30 |
|
ruthra kumar
|
24ae74ebb3
|
refactor: store result in variable before enumeration
helps to inspect result while debugging
(cherry picked from commit b60bd17d1d)
|
2025-01-03 23:48:31 +00:00 |
|
Sanket322
|
7d1d0c8e0c
|
fix: add monthly distributation and write query in qb
(cherry picked from commit 27195c7c96)
|
2025-01-03 23:48:30 +00:00 |
|
ruthra kumar
|
b3d545f91a
|
Merge pull request #45057 from frappe/mergify/bp/version-14-hotfix/pr-45056
chore: partial revert #44989 (backport #45056)
|
2025-01-02 21:04:16 +05:30 |
|
ruthra kumar
|
7b0e19499b
|
chore: partial revert #44989
(cherry picked from commit 63d547fb4a)
|
2025-01-02 15:27:38 +00:00 |
|
rohitwaghchaure
|
34504a23ec
|
Merge pull request #45041 from frappe/mergify/bp/version-14-hotfix/pr-45039
fix: removed unused code (backport #45039)
|
2025-01-02 13:32:23 +05:30 |
|
rohitwaghchaure
|
b603adce5e
|
chore: fix conflicts
|
2025-01-02 12:21:03 +05:30 |
|
Rohit Waghchaure
|
9efc1de40e
|
fix: removed unused code
(cherry picked from commit dc5f2d35ac)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.py
|
2025-01-02 06:47:37 +00:00 |
|
rohitwaghchaure
|
ff622ef552
|
Merge pull request #45037 from frappe/mergify/bp/version-14-hotfix/pr-45036
fix: Auto BOM cost update issue (backport #45036)
|
2025-01-02 12:15:37 +05:30 |
|