ruthra kumar
|
19dc9975dd
|
Merge pull request #45157 from frappe/mergify/bp/version-15-hotfix/pr-45154
fix: possible deadlock while using auto reconciliation (backport #45154)
|
2025-01-08 10:05:34 +05:30 |
|
ruthra kumar
|
36dbb867ed
|
chore: resolve conflict
|
2025-01-08 09:19:53 +05:30 |
|
ruthra kumar
|
c45f22c776
|
Merge pull request #45139 from frappe/mergify/bp/version-15-hotfix/pr-45130
refactor: change sales invoice button position (backport #45130)
|
2025-01-08 09:01:59 +05:30 |
|
ruthra kumar
|
acd66fa00c
|
chore: remove 'Experimental' tag
(cherry picked from commit 4620025dcd)
# Conflicts:
# erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
|
2025-01-08 03:31:35 +00:00 |
|
ruthra kumar
|
04384c47f8
|
Merge pull request #45153 from frappe/mergify/bp/version-15-hotfix/pr-45112
fix: Missing company filter breaks `get_account_balance` in Bank Reco (backport #45112)
|
2025-01-08 09:00:01 +05:30 |
|
marination
|
754845a935
|
fix: Override pre-commit behaviour due to conflicts with CI
(cherry picked from commit d7bf73cffa)
|
2025-01-08 02:47:22 +00:00 |
|
marination
|
931b5166a8
|
fix: Missing company filter breaks get_account_balance in Bank Reco
(cherry picked from commit 8de0fe78ea)
|
2025-01-08 02:47:21 +00:00 |
|
rohitwaghchaure
|
807d591e7e
|
Merge pull request #45145 from frappe/mergify/bp/version-15-hotfix/pr-45144
fix: issue in returning components against the SCO (backport #45144)
|
2025-01-07 23:41:03 +05:30 |
|
Rohit Waghchaure
|
87405f0753
|
fix: issue in returning components against the SCO
(cherry picked from commit 729ce1dc50)
|
2025-01-07 13:02:09 +00:00 |
|
rohitwaghchaure
|
e36bd5fe26
|
Merge pull request #45143 from frappe/mergify/bp/version-15-hotfix/pr-45048
fix: serial and batch no. buttons on pos (backport #45048)
|
2025-01-07 18:32:05 +05:30 |
|
Diptanil Saha
|
54e3a74936
|
fix: serial and batch no. buttons on pos (#45048)
(cherry picked from commit 31dd32dcdf)
|
2025-01-07 12:36:46 +00:00 |
|
Ejaaz Khan
|
f654c2d156
|
refactor: change sales invoice button position (#45130)
(cherry picked from commit a0f17f8e73)
|
2025-01-07 11:49:24 +00:00 |
|
ruthra kumar
|
cac35246f1
|
Merge pull request #45123 from frappe/mergify/bp/version-15-hotfix/pr-45121
fix: discount resetting on date change (backport #45121)
|
2025-01-07 11:32:09 +05:30 |
|
ruthra kumar
|
af53381163
|
fix: discount resetting on date change
revert #44989
(cherry picked from commit 886281f81a)
|
2025-01-07 05:51:48 +00:00 |
|
ruthra kumar
|
1c06831b11
|
Merge pull request #45109 from frappe/mergify/bp/version-15-hotfix/pr-45107
fix: Returned Qty in Work Order Consumed Materials report (backport #45107)
|
2025-01-07 10:12:43 +05:30 |
|
ruthra kumar
|
616a2b7675
|
Merge pull request #45120 from frappe/mergify/bp/version-15-hotfix/pr-45118
fix(Project): make status in confirmation dialog translatable (backport #45118)
|
2025-01-07 10:11:56 +05:30 |
|
Raffael Meyer
|
0001d868c7
|
fix(Project): make status in confirmation dialog translatable (#45118)
(cherry picked from commit 9eede907f8)
|
2025-01-06 22:13:47 +00:00 |
|
mergify[bot]
|
0abace7911
|
refactor(Project): extract custom button function (backport #45116) (#45117)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2025-01-06 23:04:30 +01:00 |
|
Rohit Waghchaure
|
f7b501b29b
|
fix: Returned Qty in Work Order Consumed Materials report
(cherry picked from commit 30d68a31e0)
|
2025-01-06 10:37:32 +00:00 |
|
mergify[bot]
|
01254da4e0
|
fix: update customer contact details on pos (backport #45071) (#45106)
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 15:01:23 +05:30 |
|
rohitwaghchaure
|
dadc8266dc
|
Merge pull request #45098 from frappe/mergify/bp/version-15-hotfix/pr-45084
fix: Alternative Items button in Work Order (backport #45084)
|
2025-01-06 14:48:02 +05:30 |
|
ruthra kumar
|
100b4e9274
|
Merge pull request #45103 from frappe/mergify/bp/version-15-hotfix/pr-45006
fix: pos search by term items price (backport #45006)
|
2025-01-06 14:43:56 +05:30 |
|
diptanilsaha
|
59af144e29
|
fix: load search term price with customer default price list
(cherry picked from commit 2beb485d77)
|
2025-01-06 08:39:58 +00:00 |
|
diptanilsaha
|
452dffab48
|
fix: load price list rate for pos search term
(cherry picked from commit 4b6cae156e)
|
2025-01-06 08:39:57 +00:00 |
|
ruthra kumar
|
eff12cbfbe
|
Merge pull request #45101 from frappe/mergify/bp/version-15-hotfix/pr-45099
fix: show new button in coa if create access (backport #45099)
|
2025-01-06 13:56:43 +05:30 |
|
sokumon
|
89155f529e
|
fix: show new button in coa if create access
(cherry picked from commit 3125bc8a16)
|
2025-01-06 08:20:01 +00:00 |
|
Mihir Kandoi
|
642b89782d
|
fix: Alternative Item button dissapearing on Save event
(cherry picked from commit b8838bd9b9)
|
2025-01-06 06:52:16 +00:00 |
|
Mihir Kandoi
|
3194807a41
|
fix: Alternative Items button in Work Order
(cherry picked from commit e28382afc1)
|
2025-01-06 06:52:16 +00:00 |
|
ruthra kumar
|
2333d33362
|
Merge pull request #45095 from frappe/mergify/bp/version-15-hotfix/pr-44943
fix: Bank Reconciliation Statement Report Company Filter (backport #44943)
|
2025-01-06 10:51:48 +05:30 |
|
creative-paramu
|
622bfa6633
|
fix: Bank Reconciliation Statement Report Company Filter
(cherry picked from commit 50c92034ba)
|
2025-01-06 10:30:24 +05:30 |
|
ruthra kumar
|
e22771c729
|
Merge pull request #45080 from frappe/mergify/bp/version-15-hotfix/pr-44983
fix: add monthly distributation and write query in qb (backport #44983)
|
2025-01-06 10:28:18 +05:30 |
|
ruthra kumar
|
5b066f4a59
|
Merge pull request #45096 from frappe/mergify/bp/version-15-hotfix/pr-44952
fix: Hold_to_On_Hold (backport #44952)
|
2025-01-06 10:09:35 +05:30 |
|
mahsem
|
9ecafdc680
|
fix: Hold_to_On_Hold
(cherry picked from commit 92b1f314ef)
|
2025-01-06 03:15:30 +00:00 |
|
ruthra kumar
|
05763d226a
|
Merge pull request #45093 from frappe/mergify/bp/version-15-hotfix/pr-45051
fix: ignore currency validation while canceling the voucher (backport #45051)
|
2025-01-06 08:44:46 +05:30 |
|
venkat102
|
0f1c6ff1c9
|
fix: ignore party account validation while canceling the voucher
(cherry picked from commit 49885f8eae)
|
2025-01-06 02:55:50 +00:00 |
|
venkat102
|
8874f4a9e4
|
fix: ignore currency validation while canceling the voucher
(cherry picked from commit 15d488b9aa)
|
2025-01-06 02:55:49 +00:00 |
|
rohitwaghchaure
|
21a83c508a
|
Merge pull request #45089 from frappe/mergify/bp/version-15-hotfix/pr-45087
fix: invoice against purchase receipt with returned quantity (backport #45087)
|
2025-01-05 19:02:07 +05:30 |
|
rohitwaghchaure
|
90b8860a40
|
chore: fix conflicts
|
2025-01-05 16:24:15 +05:30 |
|
Rohit Waghchaure
|
9daabfca8a
|
fix: invoice against purchase receipt with returned quantity
(cherry picked from commit d5babf4237)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
|
2025-01-04 15:08:10 +00:00 |
|
rohitwaghchaure
|
10a4b54a67
|
Merge pull request #45086 from frappe/mergify/bp/version-15-hotfix/pr-45083
fix: consider expired batches in stock reco (backport #45083)
|
2025-01-04 20:37:16 +05:30 |
|
Rohit Waghchaure
|
c924feb0d0
|
fix: consider expired batches in stock reco
(cherry picked from commit f51c9f578c)
|
2025-01-04 13:57:04 +00:00 |
|
Joseph Mania
|
cfa062df86
|
refactor: phone number field when channel is phone on Payment Request (#44949)
Co-authored-by: maniamartial <martialamania19@gmail.com>
|
2025-01-04 05:23:41 +05:30 |
|
ruthra kumar
|
2e67a33412
|
refactor: store result in variable before enumeration
helps to inspect result while debugging
(cherry picked from commit b60bd17d1d)
|
2025-01-03 23:48:40 +00:00 |
|
Sanket322
|
03b06fc3ff
|
fix: add monthly distributation and write query in qb
(cherry picked from commit 27195c7c96)
|
2025-01-03 23:48:40 +00:00 |
|
mergify[bot]
|
500deff3e9
|
feat: validate discount date in payment schedule (backport #44646) (#44727)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
|
2025-01-03 13:19:34 +01:00 |
|
ruthra kumar
|
2c487af2df
|
Merge pull request #45058 from frappe/mergify/bp/version-15-hotfix/pr-45056
chore: partial revert #44989 (backport #45056)
|
2025-01-02 21:04:22 +05:30 |
|
ruthra kumar
|
4dfc5a664a
|
chore: partial revert #44989
(cherry picked from commit 63d547fb4a)
|
2025-01-02 15:27:40 +00:00 |
|
rohitwaghchaure
|
d3ea8b8e77
|
Merge pull request #45054 from frappe/mergify/bp/version-15-hotfix/pr-45053
fix(style): set image width in BOM (backport #45053)
|
2025-01-02 19:07:29 +05:30 |
|
sokumon
|
6247d5aadb
|
fix(style): set image width in BOM
(cherry picked from commit b634ba7f54)
|
2025-01-02 13:31:21 +00:00 |
|
rohitwaghchaure
|
85167bf934
|
Merge pull request #45044 from frappe/mergify/bp/version-15-hotfix/pr-45043
fix: validate components and their qty as per BOM in the stock entry (backport #45043)
|
2025-01-02 14:19:38 +05:30 |
|