ruthra kumar
|
2d94ea074c
|
chore: patch to setup exiting dimensions in Payment Request
(cherry picked from commit 3f8d785f02)
|
2024-04-13 04:52:23 +00:00 |
|
ruthra kumar
|
4dbeabc8ef
|
refactor: add payment request to dimension list
(cherry picked from commit e93b4a1f2c)
|
2024-04-13 04:52:23 +00:00 |
|
mergify[bot]
|
9abc71f9c8
|
fix: Subcontracting Receipt GL Entries (backport #40773) (#40979)
* fix: Subcontracting Receipt GL Entries
(cherry picked from commit 9808ae92a4)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
|
2024-04-12 15:15:11 +05:30 |
|
rohitwaghchaure
|
52ee6dcaed
|
Merge pull request #40981 from frappe/mergify/bp/version-15-hotfix/pr-40975
fix: do not validate batch qty for LCV (backport #40975)
|
2024-04-12 14:52:54 +05:30 |
|
Rohit Waghchaure
|
5de9b6ac75
|
fix: do not validate batch qty for LCV
(cherry picked from commit baf0c83cc5)
|
2024-04-12 08:36:12 +00:00 |
|
mergify[bot]
|
14a1a18243
|
fix(ux): Sales Order Stock Reservation Dialog (backport #40707) (#40980)
fix(ux): Sales Order Stock Reservation Dialog
(cherry picked from commit 5daf19da40)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
|
2024-04-12 13:28:17 +05:30 |
|
ruthra kumar
|
3762259d3d
|
Merge pull request #40974 from frappe/mergify/bp/version-15-hotfix/pr-40973
fix: Link Validation Error on Dunning cancellation (backport #40973)
|
2024-04-12 10:44:18 +05:30 |
|
ruthra kumar
|
0053d57ec4
|
fix: Link Validation Error on Dunning cancellation
(cherry picked from commit 205fd9888c)
|
2024-04-12 04:57:40 +00:00 |
|
rohitwaghchaure
|
ea8c57263b
|
Merge pull request #40969 from frappe/mergify/bp/version-15-hotfix/pr-40967
fix: zero division error (backport #40967)
|
2024-04-11 18:15:36 +05:30 |
|
rohitwaghchaure
|
af0679076b
|
Merge pull request #40968 from frappe/mergify/bp/version-15-hotfix/pr-40966
fix: landed cost voucher for legacy pr with batch (backport #40966)
|
2024-04-11 17:59:36 +05:30 |
|
Rohit Waghchaure
|
e9c6c5a8eb
|
fix: zero division error
(cherry picked from commit f9e230e758)
|
2024-04-11 12:25:39 +00:00 |
|
Rohit Waghchaure
|
4e215c6b7b
|
fix: landed cost voucher for legacy pr with batch
(cherry picked from commit fa91cda46c)
|
2024-04-11 12:12:52 +00:00 |
|
Nabin Hait
|
3b166ea249
|
Merge pull request #40891 from frappe/mergify/bp/version-15-hotfix/pr-40698
fix: Get pro-rata amount based on correct days (backport #40698)
|
2024-04-11 11:56:32 +05:30 |
|
Nabin Hait
|
694187b853
|
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40698
|
2024-04-11 11:53:20 +05:30 |
|
Nabin Hait
|
91fe25356e
|
Merge pull request #40960 from nabinhait/itemised-tds-breakup-v15-hotfix
fix: Show itemised TDS breakup based on Apply TDS checkbox on item level
|
2024-04-11 11:49:34 +05:30 |
|
Nabin Hait
|
2e35065070
|
Merge pull request #40961 from nabinhait/permission-issue-v15
fix: Ignore permissions while fetching module settings properties
|
2024-04-11 11:49:21 +05:30 |
|
Nabin Hait
|
cca7f17b19
|
Merge pull request #40963 from frappe/revert-40630-mergify/bp/version-15-hotfix/pr-40514
Revert "fix: pass empty string email content of pos invoice (backport #40514)"
|
2024-04-11 11:48:49 +05:30 |
|
Nabin Hait
|
4591ba063c
|
Revert "fix: pass empty string email content of pos invoice (backport #40514)"
|
2024-04-11 11:43:59 +05:30 |
|
Nabin Hait
|
5ba9fbcbdb
|
Merge pull request #40953 from frappe/mergify/bp/version-15-hotfix/pr-40916
fix: check if there is any existing depreciation schedule (backport #40916)
|
2024-04-11 11:32:44 +05:30 |
|
Nabin Hait
|
23d4b01137
|
Merge pull request #40825 from frappe/mergify/bp/version-15-hotfix/pr-40584
fix: show currency symbol in base currency in fixed asset register report (backport #40584)
|
2024-04-11 11:30:51 +05:30 |
|
Nabin Hait
|
a93a9122bb
|
Merge pull request #40955 from frappe/mergify/bp/version-15-hotfix/pr-40861
fix: Get default party bank account and company bank account for a party (backport #40861)
|
2024-04-11 11:29:30 +05:30 |
|
Nabin Hait
|
ac99d8543d
|
Merge pull request #40958 from frappe/mergify/bp/version-15-hotfix/pr-40920
fix: Fetch correct outstanding and total amount for reference journal entry (backport #40920)
|
2024-04-11 11:28:53 +05:30 |
|
Nabin Hait
|
5e9f31cf21
|
fix: Ignore permissions while fetching module settings properties
|
2024-04-11 11:23:19 +05:30 |
|
Nabin Hait
|
4e3c885808
|
fix: Show itemised TDS breakup based on Apply TDS checkbox on item level
|
2024-04-11 11:20:38 +05:30 |
|
Nabin Hait
|
711bc3ff1c
|
Merge pull request #40951 from frappe/mergify/bp/version-15-hotfix/pr-40833
fix: wrong value for total amount in payments (backport #40833)
|
2024-04-11 11:12:07 +05:30 |
|
Nabin Hait
|
c72f61ef2f
|
fix: Fetch outstanding and total amount for reference journal entry
(cherry picked from commit f331f9b15c)
|
2024-04-11 05:35:43 +00:00 |
|
Nabin Hait
|
174567350e
|
fix: Get default party bank account and company bank account for a party
(cherry picked from commit f87be1d96e)
|
2024-04-11 05:25:34 +00:00 |
|
Nabin Hait
|
dcb7e27a5e
|
fix: check if there is any existing depreciation schedule
(cherry picked from commit 433c8c450c)
|
2024-04-11 05:24:08 +00:00 |
|
Nabin Hait
|
959d9c5fda
|
Merge branch 'version-15' into version-15-hotfix
|
2024-04-11 10:51:32 +05:30 |
|
Deepesh Garg
|
955ffce775
|
Merge pull request #40630 from frappe/mergify/bp/version-15-hotfix/pr-40514
fix: pass empty string email content of pos invoice (#40514)
|
2024-04-10 21:36:57 +05:30 |
|
Deepesh Garg
|
6f3a70d35f
|
Merge pull request #40697 from frappe/mergify/bp/version-15-hotfix/pr-40641
chore: Reduce usage of cur_frm (#40641)
|
2024-04-10 21:35:08 +05:30 |
|
mergify[bot]
|
0ec1f01b00
|
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40584
|
2024-04-10 15:57:49 +00:00 |
|
HarryPaulo
|
807def0f04
|
fix: wrong value for total amount in payments
(cherry picked from commit bf88b8eb65)
|
2024-04-10 15:57:11 +00:00 |
|
Deepesh Garg
|
87e30a2981
|
Merge pull request #40950 from frappe/mergify/bp/version-15-hotfix/pr-40863
fix: Show amount in transaction currency in general ledger report (#40863)
|
2024-04-10 21:24:39 +05:30 |
|
Deepesh Garg
|
0e1c7e8788
|
Merge pull request #40946 from frappe/mergify/bp/version-15-hotfix/pr-40844
fix: notify update when update outstanding amount (#40844)
|
2024-04-10 21:22:42 +05:30 |
|
Deepesh Garg
|
21454e4dfb
|
Merge pull request #40948 from frappe/mergify/bp/version-15-hotfix/pr-40931
fix: Don't call get_fiscal_year if setup is not done yet (backport #40931)
|
2024-04-10 21:22:22 +05:30 |
|
Deepesh Garg
|
18700c26f9
|
Merge pull request #40945 from frappe/mergify/bp/version-15-hotfix/pr-40849
fix: Values in transaction currency (backport #40849)
|
2024-04-10 21:22:06 +05:30 |
|
Nabin Hait
|
67bac41df4
|
fix: Show amount in transaction currency in general ledger report
(cherry picked from commit d868122f12)
|
2024-04-10 15:26:25 +00:00 |
|
Corentin Flr
|
9beaf65d19
|
fix: Don't call get_fiscal_year if setup is not done yet
(cherry picked from commit c203fafb1b)
|
2024-04-10 15:18:26 +00:00 |
|
HarryPaulo
|
f51481983d
|
fix: notify update when update outstanding amount - Linters
(cherry picked from commit 198b90eb01)
|
2024-04-10 15:17:17 +00:00 |
|
HarryPaulo
|
b10d3c4da2
|
fix: notify update when update outstanding amount
(cherry picked from commit f67f163e7d)
|
2024-04-10 15:17:16 +00:00 |
|
Deepesh Garg
|
3b179bad89
|
fix: Values in transaciton currency
(cherry picked from commit a3c9fd6567)
|
2024-04-10 15:16:39 +00:00 |
|
Akhil Narang
|
29e3a400f9
|
Merge pull request #40935 from akhilnarang/v15-ruff
chore: backport ruff linting/formatting
|
2024-04-10 16:36:13 +05:30 |
|
Akhil Narang
|
3141a1702c
|
chore: gitignore ruff format
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
|
2024-04-10 16:11:12 +05:30 |
|
ruthra kumar
|
22689958da
|
fix: use 'eq' and isnull() on qb conditions
(cherry picked from commit eee86d2e4b)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
|
2024-04-10 16:11:12 +05:30 |
|
Akhil Narang
|
41d7c03cbb
|
fix: exclude some query builder lines from ruff rules
`== None` and `== True` are intentional here
(cherry picked from commit ac69513f60)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
|
2024-04-10 16:11:10 +05:30 |
|
Akhil Narang
|
7828eee014
|
fix(treewide): manual ruff fixes
(cherry picked from commit f63396ef47)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
|
2024-04-10 16:11:10 +05:30 |
|
ruthra kumar
|
9b1e36ebf0
|
Merge pull request #40938 from frappe/mergify/bp/version-15-hotfix/pr-40936
fix: ignore dimension validation for cancelled entries (backport #40936)
|
2024-04-10 15:28:16 +05:30 |
|
Akhil Narang
|
960ef14b7a
|
refactor(treewide): formatting and ruff fixes, + manually enabled F401
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
|
2024-04-10 14:15:58 +05:30 |
|
ruthra kumar
|
b288c73437
|
fix: ignore dimension validation for cancelled entries
(cherry picked from commit 971c867f29)
|
2024-04-10 08:29:25 +00:00 |
|