mergify[bot]
82960e3312
fix: reset the incoming rate on changing of the warehouse (backport #38925 ) ( #38926 )
...
fix: reset the incoming rate on changing of the warehouse (#38925 )
(cherry picked from commit 161ae1edd1ebcafd14d7a302ad1adde238e43426)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-22 17:55:58 +05:30
mergify[bot]
8f643f0df8
fix: Reserved Stock report (backport #38922 ) ( #38924 )
...
* chore: improve `Allowed Qty` error msg
(cherry picked from commit 1a1629196d0daedef3db4f73191e21321689306d)
* fix: `Reserved Stock` report
(cherry picked from commit a5d5223c0e7f85a64f70288ec6e0048864b2ffd7)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-22 16:45:40 +05:30
mergify[bot]
8c2c90f77a
feat: provision to add items in Stock Reservation dialog (backport #38558 ) ( #38920 )
...
* feat: provision to update items in Stock Reservation dialog
(cherry picked from commit 9471d8fff94f84a627957c5ff2c7f8f1ed53a098)
* fix(ux): show row index and field label while selecting the Sales Order Item
(cherry picked from commit 00261094c8ce0663f953b73ae17a5e7f3f494b59)
* feat: provision to add items in Stock Reservation dialog
(cherry picked from commit 8d5045ef4caf695dbfdc087b78c8f68a79976813)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-22 15:50:07 +05:30
mergify[bot]
a8f3f2343d
chore: fixup broken JSON files (backport #38915 ) ( #38917 )
...
chore: fixup broken JSON files (#38915 )
(cherry picked from commit 2dc49c834a0cab620465fafa555d239092107864)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-22 07:41:00 +05:30
mergify[bot]
308c6ffb4f
perf: Drop unused/duplicate/sub-optimal indexes (backport #38884 ) ( #38913 )
...
perf: Drop unused/duplicate/sub-optimal indexes (#38884 )
* ci: enable more checks
* perf: Drop unused/duplicate indexes
(cherry picked from commit 787333896c3710d16b1fa72432db0fe59c74dfa8)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-21 21:39:20 +05:30
mergify[bot]
a99470e017
chore: additional_asset_cost field (backport #38904 ) ( #38906 )
...
chore: additional_asset_cost field (#38904 )
(cherry picked from commit 283763dfb2affa6a0b7bb29e19123c3e1fb27f30)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-12-21 16:55:41 +05:30
mergify[bot]
eabb956aca
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895 ) (backport #38897 ) ( #38901 )
...
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895 ) (#38897 )
* fix: reposting not fixing valuation rate for sales return using movin… (#38895 )
fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe9694fdd6e8265869c6943e42f889ac41)
# Conflicts:
# erpnext/stock/stock_ledger.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 07175367d8158355e5f699c7c66a2a6743a85c29)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-21 15:44:50 +05:30
mergify[bot]
f6eb2b521d
fix: do not reset the basic rate for the material receipt stock entry (backport #38896 ) ( #38899 )
...
fix: do not reset the basic rate for the material receipt stock entry (#38896 )
(cherry picked from commit 98bfcc4c758b61f714c53ea0f00246731a30fdaf)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-21 14:22:53 +05:30
ruthra kumar
bf98a8f855
fix: typeerror on pos order summary to new order screen
...
(cherry picked from commit 6a0a08b59c5b1eadbfdc657a131531d0e7461b11)
2023-12-21 06:53:22 +00:00
mergify[bot]
74606dc927
fix: allow to set rate manually for service item in BOM (backport #38880 ) (backport #38882 ) ( #38885 )
...
fix: allow to set rate manually for service item in BOM (backport #38880 ) (#38882 )
fix: allow to set rate manually for service item in BOM (#38880 )
(cherry picked from commit c2f692a4e4f3dd5089fe4949c6cd74574282fdb1)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit a6ab53236e08cb57fc8a45496ee4c9ccfbc53e10)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-21 10:44:20 +05:30
mergify[bot]
58f1df5004
feat: total_asset_cost field (backport #38879 ) ( #38887 )
...
* feat: total_asset_cost field (#38879 )
(cherry picked from commit d370c60a6c840be23ec4094593b9bbf1d1dca88b)
# Conflicts:
# erpnext/patches.txt
* chore: resolve conflicts
* chore: remove unnecessary patch
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-12-20 22:47:48 +05:30
mergify[bot]
e3be9c1da4
fix: local reference error in BOM (backport #38850 ) ( #38877 )
...
fix: local reference error in BOM (#38850 )
fix: local reference error
(cherry picked from commit ae353398d96746e9e89640b586d1bbd6afbbce77)
Co-authored-by: NIYAZ RAZAK <76736615+niyazrazak@users.noreply.github.com>
2023-12-20 16:34:27 +05:30
mergify[bot]
648f275797
perf: use estimated rows instead of actual rows (backport #38830 ) ( #38876 )
...
perf: use estimated rows instead of actual rows (#38830 )
(cherry picked from commit 9983283f95753e7523cf30cc258df0572f88081d)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-20 13:58:38 +05:30
Devin Slauenwhite
2d9a0a8e2e
fix(test): expect account currency when party account is specified.
...
(cherry picked from commit a09241e3c763882a0a0e06b21ccaa0b06f60bc75)
2023-12-20 07:05:32 +00:00
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
Frappe PR Bot
2a5164d170
chore(release): Bumped to Version 15.7.0
...
# [15.7.0](https://github.com/frappe/erpnext/compare/v15.6.1...v15.7.0 ) (2023-12-20)
### Bug Fixes
* asset patch failure due to missing shift_based column (backport [#38776 ](https://github.com/frappe/erpnext/issues/38776 )) ([#38777 ](https://github.com/frappe/erpnext/issues/38777 )) ([6e92c78](6e92c78cbd#38716 ](https://github.com/frappe/erpnext/issues/38716 )) ([#38718 ](https://github.com/frappe/erpnext/issues/38718 )) ([1dcb065](1dcb065c647d844411fbf55b561ff9fba28d694158de9913b9#38755 ](https://github.com/frappe/erpnext/issues/38755 )) ([#38756 ](https://github.com/frappe/erpnext/issues/38756 )) ([ad3a5b5](ad3a5b58e4#38861 ](https://github.com/frappe/erpnext/issues/38861 )) ([#38865 ](https://github.com/frappe/erpnext/issues/38865 )) ([5ec75fb](5ec75fb6df#38849 ](https://github.com/frappe/erpnext/issues/38849 )) (backport [#38863 ](https://github.com/frappe/erpnext/issues/38863 )) ([#38866 ](https://github.com/frappe/erpnext/issues/38866 )) ([d65be69](d65be69c4c#37858 ](https://github.com/frappe/erpnext/issues/37858 )) ([#38811 ](https://github.com/frappe/erpnext/issues/38811 )) ([18bd330](18bd330a597802f6c528#38845 ](https://github.com/frappe/erpnext/issues/38845 )) (backport [#38847 ](https://github.com/frappe/erpnext/issues/38847 )) ([#38851 ](https://github.com/frappe/erpnext/issues/38851 )) ([7320440](7320440b61#38817 ](https://github.com/frappe/erpnext/issues/38817 )) (backport [#38821 ](https://github.com/frappe/erpnext/issues/38821 )) ([#38829 ](https://github.com/frappe/erpnext/issues/38829 )) ([4bd1a5f](4bd1a5f955#38826 ](https://github.com/frappe/erpnext/issues/38826 )) (backport [#38828 ](https://github.com/frappe/erpnext/issues/38828 )) ([#38833 ](https://github.com/frappe/erpnext/issues/38833 )) ([02ceee6](02ceee6669#38848 ](https://github.com/frappe/erpnext/issues/38848 )) (backport [#38859 ](https://github.com/frappe/erpnext/issues/38859 )) ([#38862 ](https://github.com/frappe/erpnext/issues/38862 )) ([cbbc6af](cbbc6af12877dba4834c#38789 ](https://github.com/frappe/erpnext/issues/38789 )) ([#38791 ](https://github.com/frappe/erpnext/issues/38791 )) ([2045306](2045306283#38754 ](https://github.com/frappe/erpnext/issues/38754 )) ([#38806 ](https://github.com/frappe/erpnext/issues/38806 )) ([8990c48](8990c48e7b#38842 ](https://github.com/frappe/erpnext/issues/38842 )) ([#38855 ](https://github.com/frappe/erpnext/issues/38855 )) ([4e27174](4e27174c854ed86dbff2bf8a2d0e3a#38712 ](https://github.com/frappe/erpnext/issues/38712 )) ([#38713 ](https://github.com/frappe/erpnext/issues/38713 )) ([feb452b](feb452b740#38745 ](https://github.com/frappe/erpnext/issues/38745 )) ([#38747 ](https://github.com/frappe/erpnext/issues/38747 )) ([a551660](a551660d2a#38720 ](https://github.com/frappe/erpnext/issues/38720 )) ([#38763 ](https://github.com/frappe/erpnext/issues/38763 )) ([703be50](703be50bc7aa5e16e681#38778 ](https://github.com/frappe/erpnext/issues/38778 )) ([#38780 ](https://github.com/frappe/erpnext/issues/38780 )) ([7fc8150](7fc8150617cff9e47162f30bede2e0f7706211ea#38827 ](https://github.com/frappe/erpnext/issues/38827 )) ([#38832 ](https://github.com/frappe/erpnext/issues/38832 )) ([6ad75e7](6ad75e72e6
2023-12-20 04:47:03 +00:00
Deepesh Garg
028228ee12
Merge pull request #38853 from frappe/version-15-hotfix
...
chore: release v15
2023-12-20 10:15:54 +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
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
5a807af505
refactor: ignore ERR journals in Statment of Accounts
...
(cherry picked from commit 39ef75e2d0f18aa8d7434297be596b9223aa7910)
2023-12-18 10:26:30 +00: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
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
Dany Robert
77dba4834c
fix(pe): show split alert only on splitting
2023-12-15 16:08:48 +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
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
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
ruthra kumar
d890391531
refactor: handle bank transaction in foreign currency
...
(cherry picked from commit 74a0d6408a2082a2a039cd55547e56206e7c70bd)
2023-12-15 07:06:48 +00:00
ruthra kumar
6e1d9a3dbc
refactor: exc rate on foreign currency JE from Bank Reconciliation
...
(cherry picked from commit 89f484282a90516c117c31624fb2cc5eab6fb840)
2023-12-15 07:06:48 +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
