CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 10:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,594 Commits 425 Branches 1,723 Tags
v14.62.4
Commit Graph

46594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
22ace5cb5a chore(release): Bumped to Version 14.62.4 
## [14.62.4](https://github.com/frappe/erpnext/compare/v14.62.3...v14.62.4) (2024-02-14)

### Bug Fixes

*  production plan issue with sales order (backport [#39901](https://github.com/frappe/erpnext/issues/39901)) ([#39903](https://github.com/frappe/erpnext/issues/39903)) ([ab7e323](ab7e323648))
* accommodate for default rounding method in v14 ([d6a758d](d6a758d1f4))
* broken route option in Profitability report ([f79e0d1](f79e0d1e37))
* calculate `stock_value_diff` ([8f58b61](8f58b613e4))
* cancel asset capitalization ([2438600](24386006d6))
* do not throw validation for canceled SLE (backport [#39769](https://github.com/frappe/erpnext/issues/39769)) ([#39810](https://github.com/frappe/erpnext/issues/39810)) ([2885b8f](2885b8fa44))
* Handling circular linking while cancelling asset capitalization ([f2d094d](f2d094d1ab))
* incorrect planned qty in PP (backport [#39785](https://github.com/frappe/erpnext/issues/39785)) ([#39792](https://github.com/frappe/erpnext/issues/39792)) ([df9d52d](df9d52d3ce))
* landed cost voucher not submitting because of incorrect reference (backport [#39898](https://github.com/frappe/erpnext/issues/39898)) ([#39899](https://github.com/frappe/erpnext/issues/39899)) ([d0b9c56](d0b9c568d3))
* remove duplicates from tax category map ([c56f3a5](c56f3a58ab))
* set rate for PO created against BO (backport [#39765](https://github.com/frappe/erpnext/issues/39765)) ([#39766](https://github.com/frappe/erpnext/issues/39766)) ([de47e67](de47e67dfa))
* set route options to cost center ([#37235](https://github.com/frappe/erpnext/issues/37235)) ([79a16ba](79a16bad15))
* **ux:** set rate as price list rate on uom change in MR (backport [#39816](https://github.com/frappe/erpnext/issues/39816)) ([#39817](https://github.com/frappe/erpnext/issues/39817)) ([de6e8c7](de6e8c74c5))

### Performance Improvements

* cached get_last_purchase_details to fix performance issue (backport [#39854](https://github.com/frappe/erpnext/issues/39854)) ([#39855](https://github.com/frappe/erpnext/issues/39855)) ([08e0271](08e02710cd))
* production plan submission (backport [#39846](https://github.com/frappe/erpnext/issues/39846)) ([#39859](https://github.com/frappe/erpnext/issues/39859)) ([a61cffd](a61cffd7c2))
v14.62.4 		2024-02-14 12:06:19 +00:00
rohitwaghchaure
4fd7b01beb Merge pull request #39881 from frappe/version-14-hotfix 
chore: release v14
 2024-02-14 17:34:41 +05:30
mergify[bot]
ab7e323648 fix: production plan issue with sales order (backport #39901) (#39903) 
fix:  production plan issue with sales order (#39901)

(cherry picked from commit d0df5df4a6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-14 17:28:50 +05:30
mergify[bot]
d0b9c568d3 fix: landed cost voucher not submitting because of incorrect reference (backport #39898) (#39899) 
fix: landed cost voucher not submitting because of incorrect reference (#39898)

(cherry picked from commit 6239fd704b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-14 15:57:48 +05:30
Raffael Meyer
6b53288975 Merge pull request #39893 from frappe/mergify/bp/version-14-hotfix/pr-39868 
fix(Purchase Receipt): calculate `stock_value_diff` (backport #39868)
 2024-02-14 01:22:09 +01:00
barredterra
8f58b613e4 fix: calculate stock_value_diff 
`d.item_tax_amount` is already in base currency.

(cherry picked from commit 5df5851798)
 2024-02-13 23:52:34 +00:00
Nabin Hait
6460e649a5 Merge pull request #39814 from nabinhait/asset-capitalization-cancellation 
fix: Handling circular linking while cancelling asset capitalization
 2024-02-13 09:46:31 +05:30
mergify[bot]
a61cffd7c2 perf: production plan submission (backport #39846) (#39859) 
perf: production plan submission

(cherry picked from commit aa1c69dd7a)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-12 18:17:49 +05:30
mergify[bot]
08e02710cd perf: cached get_last_purchase_details to fix performance issue (backport #39854) (#39855) 
perf: cached get_last_purchase_details to fix performance issue (#39854)

(cherry picked from commit b966c06a4f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-12 15:54:03 +05:30
Nabin Hait
24386006d6 fix: cancel asset capitalization 2024-02-12 11:44:41 +05:30
mergify[bot]
de6e8c74c5 fix(ux): set rate as price list rate on uom change in MR (backport #39816) (#39817) 
* fix: add price list rate field in MR Item

(cherry picked from commit 61a29eb5fb)

# Conflicts:
#	erpnext/stock/doctype/material_request_item/material_request_item.py

* fix: set rate as price list rate on uom change

(cherry picked from commit 5cf0759b0c)

* chore: linter

(cherry picked from commit 1745371cd6)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-11 17:38:37 +05:30
mergify[bot]
79a16bad15 fix: set route options to cost center (#37235) 
fix: set route to cost center

cost center mapping is not correct

(cherry picked from commit 5e4b73918d)

Co-authored-by: NIYAZ RAZAK <76736615+niyazrazak@users.noreply.github.com>
 2024-02-11 17:19:59 +05:30
ruthra kumar
157d17d0f3 Merge pull request #39808 from ruthra-kumar/dimension_filter_issue_in_profitability_report 
fix: incorrect route options on Profitability to Profit and Loss report
 2024-02-08 15:53:26 +05:30
Nabin Hait
f2d094d1ab fix: Handling circular linking while cancelling asset capitalization 2024-02-08 15:51:29 +05:30
Frappe PR Bot
8caf655529 chore(release): Bumped to Version 14.62.3 
## [14.62.3](https://github.com/frappe/erpnext/compare/v14.62.2...v14.62.3) (2024-02-08)

### Bug Fixes

* do not throw validation for canceled SLE (backport [#39769](https://github.com/frappe/erpnext/issues/39769)) ([#39810](https://github.com/frappe/erpnext/issues/39810)) ([d6054db](d6054dbdbd))
v14.62.3 		2024-02-08 09:12:55 +00:00
rohitwaghchaure
408d026465 Merge pull request #39812 from frappe/mergify/bp/version-14/pr-39810 
fix: do not throw validation for canceled SLE (backport #39769) (backport #39810)
 2024-02-08 14:41:43 +05:30
mergify[bot]
d6054dbdbd fix: do not throw validation for canceled SLE (backport #39769) (#39810) 
fix: do not throw validation for cancelled sle

(cherry picked from commit 32ccf3524a)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
(cherry picked from commit 2885b8fa44)
 2024-02-08 08:50:17 +00:00
mergify[bot]
2885b8fa44 fix: do not throw validation for canceled SLE (backport #39769) (#39810) 
fix: do not throw validation for cancelled sle

(cherry picked from commit 32ccf3524a)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-08 14:18:50 +05:30
ruthra kumar
f79e0d1e37 fix: broken route option in Profitability report 2024-02-08 13:22:55 +05:30
Frappe PR Bot
0822a2b40a chore(release): Bumped to Version 14.62.2 
## [14.62.2](https://github.com/frappe/erpnext/compare/v14.62.1...v14.62.2) (2024-02-08)

### Bug Fixes

* accommodate for default rounding method in v14 ([79479b6](79479b633f))
* remove duplicates from tax category map ([a4e6c38](a4e6c388cb))
v14.62.2 		2024-02-08 07:28:09 +00:00
ruthra kumar
cb64c5f579 Merge pull request #39797 from frappe/mergify/bp/version-14/pr-39789 
fix: remove duplicates from tax category map (backport #39789)
 2024-02-08 12:56:59 +05:30
rohitwaghchaure
a9c95567cb Merge pull request #39790 from aynugek/patch-2 
refactor: Clean up code used to fetch website item stock details
 2024-02-08 11:06:20 +05:30
ruthra kumar
e452e42145 Merge pull request #39802 from frappe/mergify/bp/version-14/pr-39783 
fix: cancelling cr/dr notes should update the linked Invoice status (backport #39783)
 2024-02-08 10:26:26 +05:30
ruthra kumar
8888ce196d refactor(test): Forex Credit Note cancellation against Invoice 
(cherry picked from commit 2f676ced5c)
 2024-02-08 04:36:03 +00:00
ruthra kumar
129ab38fba refactor(test): assert Invoice status as well 
(cherry picked from commit 33efe0d12d)
 2024-02-08 04:36:02 +00:00
ruthra kumar
c419c1de06 test: Invoice status on Cr/Dr note cancellation 
(cherry picked from commit 31a8c3bdc4)
 2024-02-08 04:36:02 +00:00
ruthra kumar
5c59ab5975 refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 
(cherry picked from commit 0549535603)
 2024-02-08 04:36:02 +00:00
ruthra kumar
28b0e988db Merge pull request #39798 from frappe/mergify/bp/version-14-hotfix/pr-39783 
fix: cancelling cr/dr notes should update the linked Invoice status (backport #39783)
 2024-02-08 10:00:54 +05:30
Frappe PR Bot
7413c8b0a9 chore(release): Bumped to Version 14.62.1 
## [14.62.1](https://github.com/frappe/erpnext/compare/v14.62.0...v14.62.1) (2024-02-07)

### Bug Fixes

* incorrect planned qty in PP (backport [#39785](https://github.com/frappe/erpnext/issues/39785)) (backport [#39792](https://github.com/frappe/erpnext/issues/39792)) ([#39795](https://github.com/frappe/erpnext/issues/39795)) ([596c9fd](596c9fd507))
v14.62.1 		2024-02-07 15:31:34 +00:00
mergify[bot]
596c9fd507 fix: incorrect planned qty in PP (backport #39785) (backport #39792) (#39795) 
fix: incorrect planned qty in PP (backport #39785) (#39792)

fix: incorrect planned qty in PP

(cherry picked from commit a8ebc94a36)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit df9d52d3ce)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-02-07 21:00:18 +05:30
ruthra kumar
8d9b5764dd refactor(test): Forex Credit Note cancellation against Invoice 
(cherry picked from commit 2f676ced5c)
 2024-02-07 15:00:47 +00:00
ruthra kumar
dd74728568 refactor(test): assert Invoice status as well 
(cherry picked from commit 33efe0d12d)
 2024-02-07 15:00:47 +00:00
ruthra kumar
e97f30d8e2 test: Invoice status on Cr/Dr note cancellation 
(cherry picked from commit 31a8c3bdc4)
 2024-02-07 15:00:46 +00:00
ruthra kumar
33777a4d4c refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 
(cherry picked from commit 0549535603)
 2024-02-07 15:00:44 +00:00
Gursheen Anand
79479b633f fix: accommodate for default rounding method in v14 
(cherry picked from commit d6a758d1f4)
 2024-02-07 14:23:32 +00:00
Gursheen Anand
a4e6c388cb fix: remove duplicates from tax category map 
(cherry picked from commit c56f3a58ab)
 2024-02-07 14:23:32 +00:00
Gursheen Kaur Anand
d62db9bb22 Merge pull request #39789 from GursheenK/duplicates-in-tax-category-bpv14 
fix: remove duplicates from tax category map
 2024-02-07 19:51:51 +05:30
mergify[bot]
df9d52d3ce fix: incorrect planned qty in PP (backport #39785) (#39792) 
fix: incorrect planned qty in PP

(cherry picked from commit a8ebc94a36)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-07 19:26:14 +05:30
Gursheen Anand
d6a758d1f4 fix: accommodate for default rounding method in v14 2024-02-07 19:12:32 +05:30
mergify[bot]
de47e67dfa fix: set rate for PO created against BO (backport #39765) (#39766) 
* fix: set rate for PO created against BO

(cherry picked from commit 0e5b4e5f07)

# Conflicts:
#	erpnext/manufacturing/doctype/blanket_order/blanket_order.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-07 19:03:38 +05:30
Gursheen Anand
c56f3a58ab fix: remove duplicates from tax category map 2024-02-07 18:46:07 +05:30
Babuuu
e3591270c6 refactor: Clean up code used to fetch website item stock details 2024-02-07 13:12:14 +00:00
Frappe PR Bot
9a8a9568b1 chore(release): Bumped to Version 14.62.0 
# [14.62.0](https://github.com/frappe/erpnext/compare/v14.61.4...v14.62.0) (2024-02-06)

### Bug Fixes

* Blanket Order Ordered Quantity (backport [#39725](https://github.com/frappe/erpnext/issues/39725)) ([#39738](https://github.com/frappe/erpnext/issues/39738)) ([44c09de](44c09de729))
* correctly calculate diff amount for included taxes ([#39655](https://github.com/frappe/erpnext/issues/39655)) ([350b2cd](350b2cdde3))
* don't overwrite existing terms in transaction ([#39519](https://github.com/frappe/erpnext/issues/39519)) ([e49f8d5](e49f8d5f55))
* Exchange rate on MR to PO creation for muticurrency POs ([#39646](https://github.com/frappe/erpnext/issues/39646)) ([4dc5d9a](4dc5d9a6ca))
* incorrect landed cost voucher amount ([4a609d8](4a609d8fa8))
* remove applied pricing rule on qty change (backport [#39688](https://github.com/frappe/erpnext/issues/39688)) ([#39736](https://github.com/frappe/erpnext/issues/39736)) ([46ac4f4](46ac4f4714))
* show warehouse title field in sales docs (backport [#39746](https://github.com/frappe/erpnext/issues/39746)) ([#39754](https://github.com/frappe/erpnext/issues/39754)) ([a6067c6](a6067c6239))

### Features

* copy emails from lead to customer ([#38647](https://github.com/frappe/erpnext/issues/38647)) ([7952bf4](7952bf4318))
* New financial views - Growth and margin views for P&L and balance sheet (backport [#39588](https://github.com/frappe/erpnext/issues/39588)) ([#39601](https://github.com/frappe/erpnext/issues/39601)) ([3808ddb](3808ddbf86))

### Performance Improvements

* memory consumption for the stock balance report ([#39626](https://github.com/frappe/erpnext/issues/39626)) ([b32848d](b32848d69d))
* Move dimension validation out of GL Entry doctype ([#39730](https://github.com/frappe/erpnext/issues/39730)) ([7691256](7691256f4d))
* timeout for auto material request through reorder level ([85e6b39](85e6b39e23))
* timeout while submitting the purchase receipt entry ([a1a70bb](a1a70bbae0))

### Reverts

* Revert "feat: New financial views - Growth and margin views for P&L and balance sheet (#39588)"  ([f01308b](f01308b972)), closes [#39588](https://github.com/frappe/erpnext/issues/39588)
v14.62.0 		2024-02-06 18:44:23 +00:00
rohitwaghchaure
1cedb4b430 Merge pull request #39759 from frappe/version-14-hotfix 
chore: release v14
 2024-02-07 00:13:04 +05:30
ruthra kumar
ae4c90766a Merge pull request #39750 from frappe/mergify/bp/version-14-hotfix/pr-39694 
refactor: enforce unique GL Account for each 'Bank Account' (backport #39694)
 2024-02-06 15:48:29 +05:30
mergify[bot]
a6067c6239 fix: show warehouse title field in sales docs (backport #39746) (#39754) 
fix: show warehouse title field in sales docs

(cherry picked from commit ee14faaa39)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-06 12:45:43 +05:30
ruthra kumar
8267fee9b8 refactor(test): make use of test fixtures in Payment Order 
(cherry picked from commit 322cdbaccf)
 2024-02-06 04:00:13 +00:00
ruthra kumar
f64f0437ae refactor(test): generate uniq GL acc and Bank acc for each test case 
(cherry picked from commit a9a2ec81de)
 2024-02-06 04:00:13 +00:00
ruthra kumar
0163e13aa3 refactor: ensure unique accounts for each Bank Account's 
(cherry picked from commit 2caa2d677c)
 2024-02-06 04:00:13 +00:00
rohitwaghchaure
c2486c8d58 Merge pull request #39744 from frappe/mergify/bp/version-14-hotfix/pr-39742 
perf: timeout while submitting the purchase receipt entry (backport #39742)
 2024-02-05 21:26:47 +05:30