47853 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Abdeali Chharchhoda	e2728db5c2	refactor: Used object to get payment request status indicator ... (cherry picked from commit e1c4d6e1e6) # Conflicts: # erpnext/accounts/doctype/payment_request/payment_request_list.js	2024-11-29 09:11:06 +00:00
Smit Vora	f6f1052a80	Merge pull request #44409 from frappe/mergify/bp/version-14-hotfix/pr-44195 ... fix: Data Should be Computed in Backend to Maintain Consistent Behaviour (backport #44195)	2024-11-28 16:27:16 +05:30
Ninad Parikh	8529eb4573	fix: Data Should be Computed in Backend to Maintain Consistent Behaviour (#44195) ... (cherry picked from commit 69bd90b038)	2024-11-28 10:31:28 +00:00
ruthra kumar	a73fedbaca	Merge pull request #44406 from frappe/mergify/bp/version-14-hotfix/pr-44405 ... fix: typeerror on transaction.js (backport #44405)	2024-11-28 15:13:27 +05:30
ruthra kumar	147eb047aa	fix: typeerror on transaction.js ... (cherry picked from commit 46ce8780f2)	2024-11-28 15:02:35 +05:30
mergify[bot]	9ae04dfed3	fix: show "Send SMS" only when enabled (backport #43941) (#43969) ... fix: show "Send SMS" only when enabled (#43941) (cherry picked from commit 65088cbb1b) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2024-11-27 23:52:12 +01:00
mergify[bot]	78ab44ce1a	feat: add Company Contact Person in selling transactions (backport #44362) (#44397) ... * feat: add Company Contact Person in selling transactions (#44362) (cherry picked from commit f6776c7d6b) * chore: resolve conflicts --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2024-11-27 17:09:09 +01:00
ruthra kumar	627a50e7bc	Merge pull request #44384 from frappe/mergify/bp/version-14-hotfix/pr-44323 ... fix: update gross profit for returned invoices (backport #44323)	2024-11-27 17:21:13 +05:30
ljain112	7eafe7f853	fix: test case ... (cherry picked from commit af5a3e5a48)	2024-11-27 11:20:16 +00:00
ljain112	6e563438bd	fix: gp for return invoice ... (cherry picked from commit 00403515a8)	2024-11-27 11:20:16 +00:00
ljain112	0eb5e001e1	fix: update gross profit for returned invoices ... (cherry picked from commit 8a42601e99)	2024-11-27 11:20:15 +00:00
ruthra kumar	0dfb9ddb85	Merge pull request #44380 from frappe/mergify/bp/version-14-hotfix/pr-44377 ... fix: correct placeholder index in message (backport #44377)	2024-11-27 15:38:39 +05:30
ljain112	d7e6b0e1b7	fix: correct placeholder index in message ... (cherry picked from commit d61cb9a4bf)	2024-11-27 09:26:10 +00:00
Raffael Meyer	fef7cfb888	fix: unify company address query in sales transactions (backport #44361) (#44366) ... * fix: unify company address query in sales transactions (backport #44361) * style: add whitespace	2024-11-26 21:11:27 +01:00
Khushi Rawat	aa442da2f6	Merge pull request #44329 from khushi8112/incorrect-gl-entry-on-asset-sale ... fix: incorrect GL entry on sale of fully depreciated asset	2024-11-27 01:09:33 +05:30
mergify[bot]	6aebe98020	fix: billed qty and received amount in PO analysis report (backport #44349) (#44353) ... * fix: billed qty and received amount in PO analysis report (#44349) (cherry picked from commit 2ab7ec5437) # Conflicts: # erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2024-11-26 21:18:38 +05:30
Khushi Rawat	841df3b1ce	fix: change asset status correctly	2024-11-26 14:06:07 +05:30
Khushi Rawat	cc5ada194e	fix: incorrect GL entry on sale of fully depreciated asset	2024-11-26 01:39:42 +05:30
Smit Vora	edccb746f0	Merge pull request #44294 from Abdeali099/fix-fiscal-dates	2024-11-25 16:15:04 +05:30
ruthra kumar	506fd97a2c	Merge pull request #44314 from frappe/mergify/bp/version-14-hotfix/pr-44297 ... refactor: added translate function for some columns of report (backport #44297)	2024-11-25 10:39:49 +05:30
Abdeali Chharchhoda	6c9485fb13	refactor: added translate function for some columns of report ... (cherry picked from commit e545c913b5)	2024-11-25 04:39:26 +00:00
Abdeali Chharchhoda	4f806f9a72	fix: Used Fiscal Dates instead of year's Start and End dates	2024-11-22 18:09:23 +05:30
ruthra kumar	8a45258778	Merge pull request #44286 from frappe/mergify/bp/version-14-hotfix/pr-44246 ... fix: Get submitted documents in validate_for_closed_fiscal_year (backport #44246)	2024-11-22 16:25:37 +05:30
rohitwaghchaure	d10a9d3225	Merge pull request #44288 from frappe/mergify/bp/version-14-hotfix/pr-44191 ... fix: patch (backport #44191)	2024-11-22 16:25:03 +05:30
rohitwaghchaure	3643c60c67	fix: patch (#44191) ... (cherry picked from commit 495528a758)	2024-11-22 10:51:44 +00:00
ruthra kumar	92e252e37a	Merge pull request #44284 from frappe/mergify/bp/version-14-hotfix/pr-44266 ... fix: make free qty round on large transaction qty (backport #44266)	2024-11-22 16:15:19 +05:30
vimalraj27	b9efeeb71a	fix: Get submitted documents in validate_for_closed_fiscal_year ... (cherry picked from commit c607e5f940)	2024-11-22 15:56:34 +05:30
venkat102	d695fb5723	test: add unit test to validate free qty round on large transaction qty ... (cherry picked from commit 013a6fc6ec)	2024-11-22 10:20:54 +00:00
venkat102	2eb70026ae	fix: make free qty round on large transaction qty ... (cherry picked from commit f9b8165385)	2024-11-22 10:20:53 +00:00
ruthra kumar	18cbc956bb	Merge pull request #44271 from frappe/mergify/bp/version-14-hotfix/pr-44194 ... fix: include current invoice amount when tax_on_excess_amount is checked (backport #44194)	2024-11-22 11:29:21 +05:30
venkat102	47e4fd3c76	test: add unit test for tax on excess amount ... (cherry picked from commit 4820273595)	2024-11-22 05:37:26 +00:00
venkat102	071adcf291	fix: include current invoice amount when tax_on_excess_amount is checked ... (cherry picked from commit b74f2896cd)	2024-11-22 05:37:26 +00:00
mergify[bot]	ee647f2381	fix: added Stock UOM field for RM in work order (backport #44185) (#44236) ... * fix: added Stock UOM field for RM in work order (#44185) fix: added UOM field for RM in work order (cherry picked from commit cc571aca8f) # Conflicts: # erpnext/manufacturing/doctype/work_order_item/work_order_item.json # erpnext/manufacturing/doctype/work_order_item/work_order_item.py # erpnext/patches.txt * chore: fix conflicts * chore: fix conflicts * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2024-11-21 14:52:18 +05:30
ruthra kumar	24126b03dd	Merge pull request #44244 from frappe/mergify/bp/version-14-hotfix/pr-44197 ... fix: payment reco for jv with negative dr or cr amount (backport #44197)	2024-11-20 13:12:55 +05:30
ljain112	5fa4fd8825	fix: added test cases ... (cherry picked from commit 6f9ea6422d)	2024-11-20 07:18:19 +00:00
ljain112	23fb4f348f	fix: payment reco for jv with negative dr or cr amount ... (cherry picked from commit fee79b9445)	2024-11-20 07:18:19 +00:00
ruthra kumar	227c912ece	Merge pull request #44241 from frappe/mergify/bp/version-14-hotfix/pr-44240 ... fix: non group pos warehouse (backport #44240)	2024-11-20 12:17:33 +05:30
ruthra kumar	5bfbdb805c	Merge pull request #44238 from frappe/mergify/bp/version-14-hotfix/pr-44220 ... refactor: Update `Payment Request` search query in PE's reference (backport #44220)	2024-11-20 12:16:21 +05:30
Nihantra C. Patel	ec40131d4d	fix: non group pos warehouse ... (cherry picked from commit d526be0394)	2024-11-20 06:41:34 +00:00
ruthra kumar	859672c419	Merge pull request #44232 from frappe/mergify/bp/version-14-hotfix/pr-44207 ... fix: validate sales team to ensure all sales person are enabled (backport #44207)	2024-11-20 11:51:56 +05:30
Abdeali Chharchhoda	e8c3617628	refactor: Update Payment Request search query in PE's reference ... (cherry picked from commit 4ab3499a17)	2024-11-20 06:21:41 +00:00
ruthra kumar	09b21b8cb4	Merge pull request #44234 from frappe/mergify/bp/version-14-hotfix/pr-44203 ... fix: disable conversion to user tz for sales order calender (backport #44203)	2024-11-20 11:51:21 +05:30
ljain112	356da69179	fix: disable conversion to user tz for sales order calender ... (cherry picked from commit cdf098c193)	2024-11-20 05:17:52 +00:00
ljain112	bd0f11ef4f	fix: validate sales team to ensure all sales person are enabled ... (cherry picked from commit 548dbb33eb)	2024-11-20 05:11:35 +00:00
ruthra kumar	9f3dfb3d18	Merge pull request #44216 from frappe/mergify/bp/version-14-hotfix/pr-44104 ... fix: check if pricing rule matches with coupon code (backport #44104)	2024-11-19 17:37:33 +05:30
Nikolas Beckel	24b5b3c8e0	fix: check if pricing rule matches with coupon code (#44104) ... * fix: check if pricing rule matches with coupon code * fix: correct linting error (cherry picked from commit 9d31bf7647)	2024-11-19 11:41:48 +00:00
mergify[bot]	a7de8c1143	feat: new DocTypes "Code List" and "Common Code" (backport #43425) (#44172) ... Co-authored-by: David <dgx.arnold@gmail.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2024-11-18 20:59:41 +01:00
ruthra kumar	2fcab327aa	Merge pull request #44181 from frappe/mergify/bp/version-14-hotfix/pr-44127 ... fix: set default Party Type based on Payment Type in Payment Entry (backport #44127)	2024-11-18 10:49:10 +05:30
vishakhdesai	f3cbbef346	fix: set default party type in Payment Entry ... (cherry picked from commit 19222690d3)	2024-11-18 10:16:59 +05:30
ruthra kumar	339beff023	Merge pull request #44179 from frappe/mergify/bp/version-14-hotfix/pr-44147 ... fix: set conversion factor before applying price list (backport #44147)	2024-11-18 10:14:34 +05:30