CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 11:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,425 Commits 424 Branches 1,724 Tags
v14.61.1
Commit Graph

46425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
26ca27a431 chore(release): Bumped to Version 14.61.1 
## [14.61.1](https://github.com/frappe/erpnext/compare/v14.61.0...v14.61.1) (2024-01-23)

### Bug Fixes

* linting issue ([6895b74](6895b74ecc))
* party field in pdf html ([a19b41d](a19b41d8c8))
* set unallocated amount after base tax ([f7ba736](f7ba7361ca))
* UOM needs to be whole number not being checked in quotations ([55c9cc3](55c9cc3f26))
* use most reliable section reference per report line ([3bdff18](3bdff18467))
v14.61.1 		2024-01-23 11:54:25 +00:00
ruthra kumar
f8f3c917d2 Merge pull request #39506 from frappe/version-14-hotfix 
chore: release v14
 2024-01-23 17:23:12 +05:30
rohitwaghchaure
5be99295da Merge pull request #39491 from frappe/mergify/bp/version-14-hotfix/pr-39488 
fix: UOM needs to be whole number not being checked in quotations (backport #39488)
 2024-01-23 11:54:47 +05:30
Rohit Waghchaure
55c9cc3f26 fix: UOM needs to be whole number not being checked in quotations 
(cherry picked from commit aaf83da3e9)
 2024-01-22 11:55:27 +00:00
Gursheen Kaur Anand
be56c1838b Merge pull request #39482 from frappe/mergify/bp/version-14-hotfix/pr-39462 
fix: party field in PDF for AP / AR reports (backport #39462)
 2024-01-22 17:06:09 +05:30
Gursheen Anand
a19b41d8c8 fix: party field in pdf html 
(cherry picked from commit b2d9380596)
 2024-01-22 09:51:30 +00:00
Gursheen Kaur Anand
1a46f60633 Merge pull request #39473 from frappe/mergify/bp/version-14-hotfix/pr-39229 
fix: use most reliable section reference per report line (backport #39229)
 2024-01-21 14:23:34 +05:30
David Arnold
3bdff18467 fix: use most reliable section reference per report line 
(cherry picked from commit b5be17c6df)
 2024-01-21 08:14:13 +00:00
Gursheen Kaur Anand
5c1bf1f3fa Merge pull request #39470 from frappe/mergify/bp/version-14-hotfix/pr-39424 
Revert "fix(minor): financial statements period end date" (backport #39424)
 2024-01-20 18:51:59 +05:30
Gursheen Kaur Anand
837fff4533 Revert "fix(minor): financial statements period end date" 
(cherry picked from commit 73625a2622)
 2024-01-20 12:29:22 +00:00
Gursheen Kaur Anand
f405a6c31d Merge pull request #39450 from frappe/mergify/bp/version-14-hotfix/pr-39449 
fix: unallocated amount after taxes and charges (backport #39449)
 2024-01-19 10:58:27 +05:30
Gursheen Anand
6895b74ecc fix: linting issue 
(cherry picked from commit 99b94af49f)
 2024-01-18 10:45:49 +00:00
Gursheen Anand
f7ba7361ca fix: set unallocated amount after base tax 
(cherry picked from commit e9bc63aacf)
 2024-01-18 10:45:49 +00:00
Frappe PR Bot
9aa1e7444e chore(release): Bumped to Version 14.61.0 
# [14.61.0](https://github.com/frappe/erpnext/compare/v14.60.1...v14.61.0) (2024-01-17)

### Bug Fixes

* added indexing to improve performance ([d9f7070](d9f7070f92))
* added item group in stock reco ([c69a59c](c69a59c3c6))
* broken dimension filters in Sales/Purchase register ([298cdf5](298cdf5f0e))
* Cancel asset capitalisation record on cancellation of asset and vice-versa ([1dff960](1dff96057c))
* circular dependency error while deleting QC ([dfcb746](dfcb746774))
* composite asset capitalization using asset components ([ac6020a](ac6020a940))
* consider all years in holiday list ([3180266](3180266150))
* date in master document for dictionary condition ([670d615](670d61547f))
* empty category in Plaid ([1acaa20](1acaa20ee1))
* ignore cancelled payments in Sales/Purchase Register ([36b8e97](36b8e972f1))
* incorrect active serial nos due to backdated transactions ([1a26c70](1a26c70df2))
* incorrect percentage received in purchase invoice ([453700d](453700d0ab))
* incorrect sql error if account name has '%' ([d0e3458](d0e3458c8c))
* modified date ([e9d2437](e9d2437c7a))
* modified date ([28434d1](28434d101b))
* modified date was not set ([724c934](724c934fbb))
* modified date was not updated ([cb67574](cb6757437e))
* pass accounts as list to query ([a6bc5ca](a6bc5cae90))
* performance issue related to stock entry (backport [#39301](https://github.com/frappe/erpnext/issues/39301)) ([#39302](https://github.com/frappe/erpnext/issues/39302)) ([dc7c9e7](dc7c9e7aff))
* possible typeerror in consolidated report ([9395f75](9395f7535b))
* possible typerror in utils.js ([4ea72f4](4ea72f4b69))
* project filters on Delivery Note and Sales Order ([520cdb6](520cdb6f32))
* project query controller logic ([f2e577b](f2e577bec7))
* reset default after test ([6bd01f2](6bd01f227e))
* resolved merge conflict ([4edb73d](4edb73d398))
* show bill_date and bill_no in Purchase Register ([4b19792](4b197920c1))
* **test:** test case for project query ([98967ed](98967ed584))
* unreconcile Bank Transaction on cancel of payment voucher ([755576b](755576bd78))
* use child table values instead of global min max ([d21fc60](d21fc6055c))
* WDV as per IT Act: calculate yearly amount first and then split it based on months ([3989b97](3989b97579))
* wrong file name ([9d256e1](9d256e131d))

### Features

* provision to select the qty field for Product Page ([#39292](https://github.com/frappe/erpnext/issues/39292)) ([d42db11](d42db1174d))
v14.61.0 		2024-01-17 17:05:44 +00:00
Deepesh Garg
e74e5875ea Merge pull request #39404 from frappe/version-14-hotfix 
chore: release v14
 2024-01-17 22:34:31 +05:30
Nabin Hait
05a2fb3011 Merge pull request #39437 from frappe/mergify/bp/version-14-hotfix/pr-39429 
fix: composite asset capitalization using asset components (backport #39429)
 2024-01-17 22:05:19 +05:30
Nabin Hait
ac6020a940 fix: composite asset capitalization using asset components 
(cherry picked from commit 5df40661d2)
 2024-01-17 15:35:56 +00:00
Nabin Hait
9bcbd94bf1 Merge pull request #39421 from frappe/mergify/bp/version-14-hotfix/pr-39386 
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa (backport #39386)
 2024-01-17 21:05:42 +05:30
Nabin Hait
4edb73d398 fix: resolved merge conflict 2024-01-17 17:36:42 +05:30
Nabin Hait
82732f976a Merge pull request #39432 from frappe/revert-39419-mergify/bp/version-14-hotfix/pr-39385 
Revert "fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)"
 2024-01-17 17:32:38 +05:30
Nabin Hait
8014839795 Revert "fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)" 2024-01-17 17:32:14 +05:30
Nabin Hait
8d1164f652 Merge pull request #39419 from frappe/mergify/bp/version-14-hotfix/pr-39385 
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)
 2024-01-17 17:29:32 +05:30
Nabin Hait
1dff96057c fix: Cancel asset capitalisation record on cancellation of asset and vice-versa 
(cherry picked from commit efe9f6656f)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
 2024-01-17 06:44:52 +00:00
Nabin Hait
3989b97579 fix: WDV as per IT Act: calculate yearly amount first and then split it based on months 
(cherry picked from commit 22bd6a54b2)

# Conflicts:
#	erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
 2024-01-17 06:44:25 +00:00
Deepesh Garg
bee90e56f5 Merge pull request #39410 from ljain112/fix-pr 
fix(Purchase Register): show bill_date and bill_no (#38742)
 2024-01-17 11:00:24 +05:30
ruthra kumar
5693979165 Merge pull request #39411 from frappe/mergify/bp/version-14-hotfix/pr-39402 
fix: project query controller logic (backport #39402)
 2024-01-17 10:57:36 +05:30
ruthra kumar
42c1de640c chore: resolve conflict 2024-01-17 10:36:29 +05:30
ruthra kumar
b35a83ee47 refactor: better ordering of query result 
(cherry picked from commit bfe42fdccb)

# Conflicts:
#	erpnext/controllers/queries.py
 2024-01-16 10:55:31 +00:00
ruthra kumar
98967ed584 fix(test): test case for project query 
(cherry picked from commit 3349dde5e2)
 2024-01-16 10:55:30 +00:00
ruthra kumar
f2e577bec7 fix: project query controller logic 
(cherry picked from commit 4eefb445a7)

# Conflicts:
#	erpnext/controllers/queries.py
 2024-01-16 10:55:30 +00:00
ljain112
4b197920c1 fix: show bill_date and bill_no in Purchase Register 2024-01-16 15:53:53 +05:30
ruthra kumar
f3628c7d1a Merge pull request #39392 from frappe/mergify/bp/version-14-hotfix/pr-39391 
fix: possible typerror in utils.js (backport #39391)
 2024-01-15 20:49:43 +05:30
ruthra kumar
4ea72f4b69 fix: possible typerror in utils.js 
and remove unwanted debugging statements

(cherry picked from commit 60b26ad8b2)
 2024-01-15 15:16:44 +00:00
ruthra kumar
46d846bf1a Merge pull request #39136 from frappe/mergify/bp/version-14-hotfix/pr-39125 
fix: ignore cancelled payments in Sales/Purchase Register (backport #39125)
 2024-01-15 14:49:22 +05:30
ruthra kumar
a6bc5cae90 fix: pass accounts as list to query 2024-01-15 14:10:55 +05:30
mergify[bot]
3caf11472d ci: bump node in release workflow (backport #39377) (backport #39379) (#39381) 
ci: bump node in release workflow (backport #39377) (#39379)

* ci: bump node in release workflow

(cherry picked from commit aef87cced7)

# Conflicts:
#	.github/workflows/release.yml

* chore: `conflicts`

---------

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-01-15 12:15:15 +05:30
mergify[bot]
4af3159f62 ci: bump node in release workflow (backport #39377) (#39379) 
* ci: bump node in release workflow

(cherry picked from commit aef87cced7)

# Conflicts:
#	.github/workflows/release.yml

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-15 12:11:17 +05:30
ruthra kumar
1ca8dd4349 Merge pull request #39374 from frappe/mergify/bp/version-14-hotfix/pr-39371 
fix: incorrect sql error if account name has '%' (backport #39371)
 2024-01-15 10:41:04 +05:30
ruthra kumar
9550ed84c0 Merge pull request #39105 from frappe/mergify/bp/version-14-hotfix/pr-39097 
refactor: flag to control loyalty point creation at invoice level (backport #39097)
 2024-01-15 09:59:30 +05:30
ruthra kumar
d0e3458c8c fix: incorrect sql error if account name has '%' 
(cherry picked from commit 641c3de0ca)
 2024-01-15 04:10:30 +00:00
rohitwaghchaure
55e790cd2f Merge pull request #39368 from frappe/mergify/bp/version-14-hotfix/pr-39224 
Update purchase_taxes_and_charges.json label Rate to Tax Rate (backport #39224)
 2024-01-14 11:59:59 +05:30
rohitwaghchaure
e9d2437c7a fix: modified date 
(cherry picked from commit 6827edb2c5)
 2024-01-14 05:57:43 +00:00
rohitwaghchaure
724c934fbb fix: modified date was not set 
(cherry picked from commit 566876ae7a)
 2024-01-14 05:57:43 +00:00
mahsem
e9af0c6e67 Update purchase_taxes_and_charges.json label Rate to Tax Rate 
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages

(cherry picked from commit bd464197c4)
 2024-01-14 05:57:42 +00:00
rohitwaghchaure
e0d12a9b98 Merge pull request #39360 from frappe/mergify/bp/version-14-hotfix/pr-39225 
Update sales_taxes_and_charges.json (backport #39225)
 2024-01-14 11:24:33 +05:30
rohitwaghchaure
2cc756be57 Merge pull request #39364 from frappe/mergify/bp/version-14-hotfix/pr-39359 
fix: added item group in stock reco (backport #39359)
 2024-01-14 11:24:08 +05:30
rohitwaghchaure
28434d101b fix: modified date 2024-01-14 10:44:18 +05:30
rohitwaghchaure
4d11a9c884 chore: fix conflicts 2024-01-14 10:32:10 +05:30
Rohit Waghchaure
c69a59c3c6 fix: added item group in stock reco 
(cherry picked from commit 116ff8241c)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
 2024-01-14 04:58:27 +00:00
rohitwaghchaure
cb6757437e fix: modified date was not updated 
(cherry picked from commit f567af49a6)
 2024-01-14 04:46:29 +00:00