47189 Commits

Author SHA1 Message Date
Devin Slauenwhite
32d3d4e571 fix: use party account currency when party account is specified
(cherry picked from commit c7b961ffa27c611a1e0a45750b38f1f23b0b0c7f)
2023-12-20 07:05:32 +00:00
mergify[bot]
d75ac136d7
fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (backport #38870) (#38871)
fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (#38870)

* refactor: typerror on set_root_readonly

* refactor: remove 'cur_frm' usage in supplier_group

* refactor: remove 'cur_frm' usage in territory.js

* refactor: remove 'cur_frm' from sales_person.js

(cherry picked from commit 6d5bdc6c68dfda915972f3747de752b8fad7cdb5)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2023-12-20 12:32:35 +05:30
ruthra kumar
88b3811c5d
Merge pull request #38839 from pps190/backport/version-15/37746
feat: in_party_currency option for AR/AP reports (backport  #37746)
2023-12-20 12:25:11 +05:30
mergify[bot]
4e27174c85
fix: set fg-itm-qty based on qty instead of the other way round in Subcontracting POs (backport #38842) (#38855)
fix: set `fg-itm-qty` based on `qty` instead of the other way round

(cherry picked from commit a99d0a65b028b05b5c3bcb46a48a16771d00861f)

Co-authored-by: Gughan Ravikumar <gughanrk@gmail.com>
2023-12-20 09:12:20 +05:30
mergify[bot]
d65be69c4c
fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (backport #38863) (#38866)
fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (#38863)

* fix: incoming rate for sales return with Moving Average valuation method (#38849)

(cherry picked from commit 7fdac62393ee1e96969cca38a4ce0c07993dce7e)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4057682c878bd6abffa63e7343ba33bd220bc88c)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 19:13:08 +05:30
mergify[bot]
5ec75fb6df
fix: if not budget then don't validate (backport #38861) (#38865)
fix: if not budget then don't validate (#38861)

(cherry picked from commit d375164100158db9b974742caa3e05062c481d7d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-19 18:30:36 +05:30
mergify[bot]
cbbc6af128
fix: on closed unreserved the production plan qty (backport #38848) (backport #38859) (#38862)
fix: on closed unreserved the production plan qty (backport #38848) (#38859)

fix: on closed unreserved the production plan qty (#38848)

(cherry picked from commit 2184e8ef58379f53ef8f1d069afa26e64796b073)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 5e68b7e3a6cea0001ad1275300a019c0db9e8e13)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 18:18:40 +05:30
mergify[bot]
7320440b61
fix: item variant with manufacturer (backport #38845) (backport #38847) (#38851)
fix: item variant with manufacturer (backport #38845) (#38847)

* fix: item variant with manufacturer (#38845)

(cherry picked from commit e0c8ff10daeed0829266aea9142805f68ceedb2b)

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4aa960b744c289b0cda9acfae7911b1ef6ffe5d6)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 15:17:54 +05:30
ruthra kumar
637343f751
Merge pull request #38844 from frappe/mergify/bp/version-15-hotfix/pr-38797
fix: wrong paid and cn amount on pos invoice (backport #38797)
2023-12-19 11:33:23 +05:30
Dany Robert
ffb6d65910 test: partial payment for pos invoice
(cherry picked from commit 877262891235b21447c5b74684fb7173910427e1)
2023-12-19 05:33:15 +00:00
Dany Robert
cff9e47162 fix: wrong paid and cn amount on pos invoice
(cherry picked from commit 5cb5e09dbbac878906023c07423d5d8233279790)
2023-12-19 05:33:15 +00:00
Richard Case
dc9b4de976 chore: update tests 2023-12-18 18:13:27 +00:00
Richard Case
a65bc77b02 feat: in_party_currency option for AR/AP reports 2023-12-18 18:13:15 +00:00
mergify[bot]
02ceee6669
fix: not able to make inter-company po from so (backport #38826) (backport #38828) (#38833)
fix: not able to make inter-company po from so (backport #38826) (#38828)

fix: not able to make inter-company po from so (#38826)

(cherry picked from commit 23042dfc3c0d02374c5710ed679731b1910f9b9a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 32a608f94848564806d6254d11c6c0655fbcaa9a)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-18 18:31:28 +05:30
mergify[bot]
4bd1a5f955
fix: not able to cancel SCR with Batch (backport #38817) (backport #38821) (#38829)
fix: not able to cancel SCR with Batch (backport #38817) (#38821)

* fix: not able to cancel SCR with Batch (#38817)

(cherry picked from commit fb5090fd3f23ada507fe8abc5a899f4b06e48d7e)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

* chore: fix test case

* chore: fix test case

* chore: fix test case

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 71e833c3f2323873953c3ad7ab4a9403ebbdeb0a)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-18 18:13:15 +05:30
mergify[bot]
6ad75e72e6
perf: index return_against on delivery note (backport #38827) (#38832)
perf: index `return_against` on delivery note (#38827)

There's a multi-column index but that's useful IFF all parts of column
are part of query.

return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.

(cherry picked from commit 8d79365e0ddef42e788f97c668a64c479a803617)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-18 18:09:42 +05:30
ruthra kumar
c696370cff
Merge pull request #38823 from frappe/mergify/bp/version-15-hotfix/pr-38820
refactor: ignore ERR journals in Statment of Accounts (backport #38820)
2023-12-18 16:24:48 +05:30
ruthra kumar
5a807af505 refactor: ignore ERR journals in Statment of Accounts
(cherry picked from commit 39ef75e2d0f18aa8d7434297be596b9223aa7910)
2023-12-18 10:26:30 +00:00
Raffael Meyer
4fe7988249
Merge pull request #38814 from frappe/mergify/bp/version-15-hotfix/pr-38803
fix: groups for current accounts in German CoAs (backport #38803)
2023-12-17 19:52:24 +01:00
barredterra
58de9913b9 fix: groups for current accounts in German CoAs
(cherry picked from commit 259f313af75c3cbdcc1af75a8e7d2ad1a3a90c0c)
2023-12-17 18:24:07 +00:00
Deepesh Garg
b52ceceeb7
Merge pull request #38808 from vorasmit/fetch-item-taxes-v15
fix: fetch item_tax_template values if fields with fetch_from exisit (#38284)
2023-12-17 18:51:05 +05:30
mergify[bot]
8990c48e7b
fix: serial and batch bundle return not working (backport #38754) (#38806)
fix: serial and batch bundle return not working (#38754)

* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no

(cherry picked from commit 0743289925d0866a16373c05cfb81825b58e35ba)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-17 18:02:31 +05:30
mergify[bot]
18bd330a59
fix: incorrect available qty for backdated stock reco with batch (backport #37858) (#38811)
fix: incorrect available qty for backdated stock reco with batch (#37858)

* fix: incorrect available qty for backdated stock reco with batch

* test: added test case

(cherry picked from commit d4c0dbfacc7e99da6cba2c5d389f0a662490b0eb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-17 17:41:51 +05:30
Deepesh Garg
b02604396d
Merge pull request #38810 from frappe/mergify/bp/version-15-hotfix/pr-38807
fix(demo): Demo setup for Canadian COA (#38807)
2023-12-17 17:13:54 +05:30
Deepesh Garg
7d844411fb fix(demo): Demo setup for canadian COA
(cherry picked from commit c9fd1822681420868923fd53aa1df3e3c776a4a6)
2023-12-17 08:35:53 +00:00
Smit Vora
fba28d6941 fix: fetch item_tax_template values if fields with fetch_from exisit 2023-12-17 13:59:22 +05:30
Deepesh Garg
57f7933a4b
Merge pull request #38771 from frappe/mergify/bp/version-15-hotfix/pr-38767
fix: skip JVs against bank accounts in tax report (#38767)
2023-12-16 22:28:55 +05:30
mergify[bot]
2045306283
fix: Reset SLA on issue doesn't work (backport #38789) (#38791)
fix: Reset SLA on issue doesn't work (#38789)

This was broken since last refactor where it was spun off to work with
all types of doctypes but client side code was never adapted.

(cherry picked from commit fa1c7b663c2e3f433190d29017eaebbe15d4c604)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-15 22:02:33 +05:30
Raffael Meyer
4fb479e2f5
Merge pull request #38788 from barredterra/bp-38440
fix(pe): show split alert only on splitting (backport #38440)
2023-12-15 16:26:33 +01:00
Dany Robert
77dba4834c fix(pe): show split alert only on splitting 2023-12-15 16:08:48 +01:00
Raffael Meyer
a70be4299e
Merge pull request #38787 from frappe/mergify/bp/version-15-hotfix/pr-38742
fix(Purchase Register): show bill_date and bill_no (backport #38742)
2023-12-15 15:39:45 +01:00
ljain112
4ed86dbff2 fix: show bill_date and bill_no in Purchase Register
(cherry picked from commit f53ba178a8b0909373c378db31d01928c576ee89)
2023-12-15 14:25:03 +00:00
Deepesh Garg
63f6970b45
Merge pull request #38783 from frappe/mergify/bp/version-15-hotfix/pr-38691
fix: Init internal child table values (#38691)
2023-12-15 18:48:24 +05:30
Deepesh Garg
7802f6c528 fix: Init internal child table values
(cherry picked from commit 2588970d5576bbfa085a1f30cf098d7e18e71a84)
2023-12-15 12:45:56 +00:00
mergify[bot]
7fc8150617
fix: wrong currency in Stock Balance report (backport #38778) (#38780)
fix: wrong currency in Stock Balance report

(cherry picked from commit 5a83a16e60b2c47f8ef0307edcd0311824007c86)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-15 15:32:59 +05:30
mergify[bot]
6e92c78cbd
fix: asset patch failure due to missing shift_based column (backport #38776) (#38777)
fix: asset patch failure due to missing shift_based column (#38776)

* fix: add missing daily_prorata_based in get_asset_finance_books_map

* fix: reload Asset Finance Book doctype

(cherry picked from commit 1704180f38802ba81e9c912455e74d9a0595233e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-12-15 14:47:24 +05:30
ruthra kumar
5beea361fe
Merge pull request #38775 from frappe/mergify/bp/version-15-hotfix/pr-38766
fix: validation error on reconciling PE to Journals as Invoice (backport #38766)
2023-12-15 14:41:55 +05:30
ruthra kumar
aa5e16e681 fix: validation error on reconciling PE to Journals as Invoice
With the same exchange rate on Journal Entry and Payment Entry,
reconcilition should not post exc gain/loss journal and should not
throw validation error

(cherry picked from commit 5eeb650dfd3ab4b20f49bacefc43d98cb856c3f3)
2023-12-15 07:44:08 +00:00
Gursheen Anand
bf8a2d0e3a fix: skip jvs against bank accounts
(cherry picked from commit f7b2380ec1cbe5e58755f88ca08cb052b92e05c7)
2023-12-15 07:29:30 +00:00
mergify[bot]
703be50bc7
fix(ux): don't override Item Name and Description in MR (backport #38720) (#38763)
fix(ux): don't override Item Name and Description in MR

(cherry picked from commit 726ac6bda1ee3b25c1d62b312d96aa32466ba11e)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-15 11:58:20 +05:30
ruthra kumar
013d0ff99c
Merge pull request #38764 from frappe/mergify/bp/version-15-hotfix/pr-37625
refactor: set exchange rate on foreign currency JE from Bank Reconciliation (backport #37625)
2023-12-15 11:41:04 +05:30
ruthra kumar
b1b157aa19 refactor: handle bank transaction in foreign currency
(cherry picked from commit 74a0d6408a2082a2a039cd55547e56206e7c70bd)
2023-12-15 05:51:44 +00:00
ruthra kumar
e7e5727015 refactor: exc rate on foreign currency JE from Bank Reconciliation
(cherry picked from commit 89f484282a90516c117c31624fb2cc5eab6fb840)
2023-12-15 05:51:43 +00:00
mergify[bot]
ad3a5b58e4
fix: homepage not working (backport #38755) (#38756)
fix: homepage not working (#38755)

(cherry picked from commit d6201ce5c7b6f981ca6e0adbfa52c1c24ba5de83)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-14 23:02:25 +05:30
Raffael Meyer
f501c8b336
Merge pull request #38752 from frappe/mergify/bp/version-15-hotfix/pr-38505 2023-12-14 16:38:29 +01:00
barredterra
f7706211ea feat: set lead name from email
(cherry picked from commit ceeb724acc54d06ec27f3a3b5e948e5b6236af7c)
2023-12-14 12:49:41 +00:00
mergify[bot]
a551660d2a
fix: timezone aware SLA banner (backport #38745) (#38747)
fix: timezone aware SLA banner (#38745)

(cherry picked from commit eaf86a6461438720fe941100d6feccefbfa3bfed)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-14 15:59:21 +05:30
ruthra kumar
5cbe170117
Merge pull request #38737 from frappe/mergify/bp/version-15-hotfix/pr-38717
fix: fetch exc rate of multi currency journals on reconciliation (backport #38717)
2023-12-14 09:59:47 +05:30
ruthra kumar
f55b561ff9 fix: fetch exc rate of multi currency journals
(cherry picked from commit 1b3ba25220ca4ef96df5416331ee2f78376da64a)
2023-12-14 04:06:48 +00:00
mergify[bot]
3fabca1051
Revert "fix(ux): don't update qty blindly" (backport #38728) (#38730)
Revert "fix(ux): don't update qty blindly" (#38728)

(cherry picked from commit 6851c5042fc5e2d3f45d070af18a33c24fc10794)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-13 23:16:15 +05:30