CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 19:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,728 Commits 424 Branches 1,724 Tags
ceafa0ce282cc41cb00a9c8f302a87166ea03595
Commit Graph

48728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
a8f3f2343d chore: fixup broken JSON files (backport #38915) (#38917) 
chore: fixup broken JSON files (#38915)

(cherry picked from commit 2dc49c834a)

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 787333896c)

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 283763dfb2)

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 3a668bbe96)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

---------

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

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 98bfcc4c75)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-21 14:22:53 +05:30
ruthra kumar
135aced98e Merge pull request #38894 from frappe/mergify/bp/version-15-hotfix/pr-38893 
fix: typeerror on pos order summary to new order screen (backport #38893)
 2023-12-21 12:26:04 +05:30
ruthra kumar
bf98a8f855 fix: typeerror on pos order summary to new order screen 
(cherry picked from commit 6a0a08b59c)
 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 c2f692a4e4)

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

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 d370c60a6c)

# 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 ae353398d9)

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 9983283f95)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-20 13:58:38 +05:30
ruthra kumar
4626ab5e19 Merge pull request #38873 from frappe/mergify/bp/version-15-hotfix/pr-38838 
fix: use party account currency when party account is specified (backport #38838)
 2023-12-20 13:09:15 +05:30
Devin Slauenwhite
2d9a0a8e2e fix(test): expect account currency when party account is specified. 
(cherry picked from commit a09241e3c7)
 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 c7b961ffa2)
 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 6d5bdc6c68)

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))
* barcode scanning for the stock entry (backport [#38716](https://github.com/frappe/erpnext/issues/38716)) ([#38718](https://github.com/frappe/erpnext/issues/38718)) ([1dcb065](1dcb065c64))
* **demo:** Demo setup for canadian COA ([7d84441](7d844411fb))
* fetch exc rate of multi currency journals ([f55b561](f55b561ff9))
* fetch item_tax_template values if fields with fetch_from exisit ([fba28d6](fba28d6941))
* groups for current accounts in German CoAs ([58de991](58de9913b9))
* homepage not working (backport [#38755](https://github.com/frappe/erpnext/issues/38755)) ([#38756](https://github.com/frappe/erpnext/issues/38756)) ([ad3a5b5](ad3a5b58e4))
* if not budget then don't validate (backport [#38861](https://github.com/frappe/erpnext/issues/38861)) ([#38865](https://github.com/frappe/erpnext/issues/38865)) ([5ec75fb](5ec75fb6df))
* incoming rate for sales return with Moving Average valuation method (backport [#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))
* incorrect available qty for backdated stock reco with batch (backport [#37858](https://github.com/frappe/erpnext/issues/37858)) ([#38811](https://github.com/frappe/erpnext/issues/38811)) ([18bd330](18bd330a59))
* Init internal child table values ([7802f6c](7802f6c528))
* item variant with manufacturer (backport [#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))
* not able to cancel SCR with Batch (backport [#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))
* not able to make inter-company po from so (backport [#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))
* on closed unreserved the production plan qty (backport [#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](cbbc6af128))
* **pe:** show split alert only on splitting ([77dba48](77dba4834c))
* Reset SLA on issue doesn't work (backport [#38789](https://github.com/frappe/erpnext/issues/38789)) ([#38791](https://github.com/frappe/erpnext/issues/38791)) ([2045306](2045306283))
* serial and batch bundle return not working (backport [#38754](https://github.com/frappe/erpnext/issues/38754)) ([#38806](https://github.com/frappe/erpnext/issues/38806)) ([8990c48](8990c48e7b))
* set `fg-itm-qty` based on `qty` instead of the other way round in Subcontracting POs (backport [#38842](https://github.com/frappe/erpnext/issues/38842)) ([#38855](https://github.com/frappe/erpnext/issues/38855)) ([4e27174](4e27174c85))
* show bill_date and bill_no in Purchase Register ([4ed86db](4ed86dbff2))
* skip jvs against bank accounts ([bf8a2d0](bf8a2d0e3a))
* supplier removed on selection of item (backport [#38712](https://github.com/frappe/erpnext/issues/38712)) ([#38713](https://github.com/frappe/erpnext/issues/38713)) ([feb452b](feb452b740))
* timezone aware SLA banner (backport [#38745](https://github.com/frappe/erpnext/issues/38745)) ([#38747](https://github.com/frappe/erpnext/issues/38747)) ([a551660](a551660d2a))
* **ux:** don't override Item Name and Description in MR (backport [#38720](https://github.com/frappe/erpnext/issues/38720)) ([#38763](https://github.com/frappe/erpnext/issues/38763)) ([703be50](703be50bc7))
* validation error on reconciling PE to Journals as Invoice ([aa5e16e](aa5e16e681))
* wrong currency in Stock Balance report (backport [#38778](https://github.com/frappe/erpnext/issues/38778)) ([#38780](https://github.com/frappe/erpnext/issues/38780)) ([7fc8150](7fc8150617))
* wrong paid and cn amount on pos invoice ([cff9e47](cff9e47162))

### Features

* RFQ print preview ([f30bede](f30bede2e0))
* set lead name from email ([f770621](f7706211ea))

### Performance Improvements

* index `return_against` on delivery note (backport [#38827](https://github.com/frappe/erpnext/issues/38827)) ([#38832](https://github.com/frappe/erpnext/issues/38832)) ([6ad75e7](6ad75e72e6))
v15.7.0 		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 a99d0a65b0)

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 7fdac62393)

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

* chore: fix conflicts

---------

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

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 d375164100)

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 2184e8ef58)

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

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 e0c8ff10da)

* chore: fix test case

---------

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

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 8772628912)
 2023-12-19 05:33:15 +00:00
Dany Robert
cff9e47162 fix: wrong paid and cn amount on pos invoice 
(cherry picked from commit 5cb5e09dbb)
 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 23042dfc3c)

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

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 fb5090fd3f)

# 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 71e833c3f2)

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 8d79365e0d)

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 39ef75e2d0)
 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 259f313af7)
 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 0743289925)

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 d4c0dbfacc)

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 c9fd182268)
 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 fa1c7b663c)

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 f53ba178a8)
 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 2588970d55)
 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 5a83a16e60)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-15 15:32:59 +05:30