48220 Commits

Author SHA1 Message Date
rohitwaghchaure
159a123dc7
fix: warehouse issue in pick list (#39826) 2024-02-09 11:14:54 +05:30
s-aga-r
1568af2a7b
Merge pull request #39816 from s-aga-r/FIX-9595
fix(ux): set rate as price list rate on uom change in MR
2024-02-08 17:54:19 +05:30
s-aga-r
1745371cd6 chore: linter 2024-02-08 16:44:31 +05:30
Gursheen Anand
ecdc4c8e9b feat: add patch for making repostable dimension fields editable 2024-02-08 16:36:30 +05:30
s-aga-r
5cf0759b0c fix: set rate as price list rate on uom change 2024-02-08 16:34:26 +05:30
s-aga-r
61a29eb5fb fix: add price list rate field in MR Item 2024-02-08 16:33:48 +05:30
Gursheen Anand
8bb83e267c fix: allow editable accounting dimensions for repostable doctypes 2024-02-08 16:09:28 +05:30
Gursheen Anand
781bdd2ec9 fix: disable editable account heads 2024-02-08 15:35:10 +05:30
Gursheen Anand
2d78dba66f chore: rebase 2024-02-08 15:20:50 +05:30
mergify[bot]
2c8e4c1ab3
fix: do not consider rejected warehouses in pick list (backport #39539) (#39804)
* fix: do not consider rejected warehouses in pick list (#39539)

* fix: do not picked rejected materials

* test: test case for pick list without rejected materials

(cherry picked from commit f6725e43425043eaba7dcdd3cf3768a857a39ee6)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/stock/doctype/pick_list/pick_list.json
#	erpnext/stock/doctype/pick_list/pick_list.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fixed test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-08 13:54:08 +05:30
ruthra kumar
22a187c3be
Merge pull request #39783 from ruthra-kumar/cancel_cr_dr_note_jes_on_cancel
fix: cancelling cr/dr notes should update the linked Invoice status
2024-02-07 20:25:53 +05:30
ruthra kumar
2f676ced5c refactor(test): Forex Credit Note cancellation against Invoice 2024-02-07 19:59:33 +05:30
s-aga-r
e9251c3775
Merge pull request #39785 from s-aga-r/FIX-9505
fix: incorrect planned qty in PP
2024-02-07 19:02:31 +05:30
Ankush Menat
294f562fb9
build: Pin frappe requirements to ^16.0.0 (#39782) 2024-02-07 18:30:35 +05:30
s-aga-r
81e82b0595
Merge pull request #39780 from s-aga-r/FIX-9577
fix: add permissions to SRE
2024-02-07 18:14:08 +05:30
s-aga-r
a8ebc94a36 fix: incorrect planned qty in PP 2024-02-07 18:13:34 +05:30
ruthra kumar
33efe0d12d refactor(test): assert Invoice status as well 2024-02-07 17:33:55 +05:30
ruthra kumar
31a8c3bdc4 test: Invoice status on Cr/Dr note cancellation 2024-02-07 17:21:29 +05:30
ruthra kumar
0549535603 refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 2024-02-07 16:35:07 +05:30
s-aga-r
50f54d983d fix: add permissions to SRE 2024-02-07 16:06:28 +05:30
Gursheen Kaur Anand
146147316d
Merge pull request #39757 from GursheenK/duplicates-in-tax-category-map
fix: duplicates in tax category map
2024-02-07 15:11:59 +05:30
rohitwaghchaure
ab9d6576d0
Merge pull request #39769 from rohitwaghchaure/fixed-inventory-dimension-validation-8004
fix: do not throw validation for canceled SLE
2024-02-06 23:11:50 +05:30
Rohit Waghchaure
32ccf3524a fix: do not throw validation for cancelled sle 2024-02-06 22:48:13 +05:30
rohitwaghchaure
d6d91257b6
Merge pull request #39764 from rohitwaghchaure/fixed-remove-file-from-disk-9515
fix: remove file from the disk after the completion of reposting
2024-02-06 21:26:28 +05:30
s-aga-r
40ce0c851d
Merge pull request #39765 from s-aga-r/FIX-9412
fix: set rate for PO created against BO
2024-02-06 21:18:48 +05:30
Rohit Waghchaure
76b57a4338 test: test case to check removed attached file 2024-02-06 21:09:58 +05:30
s-aga-r
0e5b4e5f07 fix: set rate for PO created against BO 2024-02-06 19:21:51 +05:30
Rohit Waghchaure
fb330d1b5a fix: remove file from the disk after the completion of reposting 2024-02-06 19:13:48 +05:30
Ankush Menat
9636458ae1
ci: codecov changes (#39760)
- don't report coverage on individual PRs, instead do it daily
- update tokens for reporting
2024-02-06 10:21:46 +00:00
rohitwaghchaure
4671f65cbd
Merge pull request #39718 from rohitwaghchaure/create-bundle-using-old-fields
fix: use old serial / batch fields to make serial batch bundle
2024-02-06 15:47:08 +05:30
Gursheen Anand
9383f5da94 test: single account for multiple tax categories 2024-02-06 15:03:12 +05:30
Rohit Waghchaure
01650120d4 test: test case to check use serial / batch fields feature 2024-02-06 14:31:19 +05:30
Gursheen Kaur Anand
943dcb6dea
Merge branch 'frappe:develop' into duplicates-in-tax-category-map 2024-02-06 14:17:40 +05:30
Gursheen Anand
3a26823c62 refactor: fetch rate once tax category is set 2024-02-06 14:01:06 +05:30
Gursheen Anand
e55611497b fix: duplicate for tax category in map 2024-02-06 13:56:41 +05:30
Ankush Menat
798a0510e6
refactor: change server_action args (#39756)
args are now flat, no need to accept them as dict

ref: https://github.com/frappe/frappe/pull/24782
2024-02-06 08:04:28 +00:00
Gursheen Kaur Anand
e38b46300c
Merge pull request #39349 from GursheenK/JVs-in-withholding-report
fix: TDS accounts GLE query for withholding category report
2024-02-06 13:00:13 +05:30
s-aga-r
41f58476e1
Merge pull request #39746 from s-aga-r/FIX-9365
fix: show warehouse title field in sales docs
2024-02-06 12:03:33 +05:30
Ankush Menat
56e5611337
chore: update CI badges (#39753) 2024-02-06 06:01:11 +00:00
ruthra kumar
2e509f69d4
Merge pull request #39694 from ruthra-kumar/enforce_separate_account_for_each_bank_account
refactor: enforce unique GL Account for each 'Bank Account'
2024-02-06 09:29:12 +05:30
s-aga-r
ee14faaa39 fix: show warehouse title field in sales docs 2024-02-05 22:08:59 +05:30
s-aga-r
ae4ebcd987
Merge pull request #39733 from s-aga-r/FIX-9458
fix: update company in serial no doc
2024-02-05 21:54:02 +05:30
rohitwaghchaure
1bfbbfe393
Merge pull request #39742 from rohitwaghchaure/fixed-performance-issue-9247
perf: timeout while submitting the purchase receipt entry
2024-02-05 21:01:17 +05:30
Rohit Waghchaure
1fa6233377 perf: timeout while submitting the purchase receipt entry 2024-02-05 19:46:51 +05:30
Rohit Waghchaure
c1e869f040 test: fixed test cases 2024-02-05 19:39:58 +05:30
s-aga-r
3b671d5875
Merge pull request #39725 from s-aga-r/FIX-9411
fix: Blanket Order Ordered Quantity
2024-02-05 16:07:50 +05:30
s-aga-r
4d614c1589
Merge pull request #39688 from s-aga-r/FIX-9169
fix: remove applied pricing rule on qty change
2024-02-05 15:40:44 +05:30
s-aga-r
27d6c8b6d5 test: BO on PO Close/Open 2024-02-05 15:38:31 +05:30
s-aga-r
61ded697a7 fix: update BO Ordered Quantity on PO Close/Open 2024-02-05 15:38:31 +05:30
s-aga-r
5ce5c352e4 fix: disable no-copy for blanket order in PO 2024-02-05 15:38:31 +05:30