CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 09:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,299 Commits 423 Branches 1,720 Tags
e07557c9c5ee2a52e56440d1ca30b5a1fc5bc6bd
Commit Graph

48299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
e07557c9c5 fix: type of transaction validation for the stock entry (backport #40986) (backport #40992) (#40994) 
fix: type of transaction validation for the stock entry (backport #40986) (#40992)

* fix: type of transaction validation for the stock entry

(cherry picked from commit 8ad0295f1b)

* chore: fix test case

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4342b891eb)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-04-13 15:57:50 +05:30
mergify[bot]
7d12674430 fix: do not validate batch qty for LCV (backport #40975) (backport #40981) (#40991) 
fix: do not validate batch qty for LCV

(cherry picked from commit baf0c83cc5)
(cherry picked from commit 5de9b6ac75)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-04-13 15:57:41 +05:30
Frappe PR Bot
7711b13766 chore(release): Bumped to Version 15.20.2 
## [15.20.2](https://github.com/frappe/erpnext/compare/v15.20.1...v15.20.2) (2024-04-12)

### Bug Fixes

* Subcontracting Receipt GL Entries (backport [#40773](https://github.com/frappe/erpnext/issues/40773)) (backport [#40979](https://github.com/frappe/erpnext/issues/40979)) ([#40983](https://github.com/frappe/erpnext/issues/40983)) ([3d6ba6f](3d6ba6f21f))
v15.20.2 		2024-04-12 10:03:02 +00:00
mergify[bot]
3d6ba6f21f fix: Subcontracting Receipt GL Entries (backport #40773) (backport #40979) (#40983) 
fix: Subcontracting Receipt GL Entries (backport #40773) (#40979)

* fix: Subcontracting Receipt GL Entries

(cherry picked from commit 9808ae92a4)

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

* chore: `conflicts`

---------

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-04-12 15:31:40 +05:30
Frappe PR Bot
c24d9675e8 chore(release): Bumped to Version 15.20.1 
## [15.20.1](https://github.com/frappe/erpnext/compare/v15.20.0...v15.20.1) (2024-04-11)

### Bug Fixes

* landed cost voucher for legacy pr with batch ([83a5284](83a5284ba9))
* zero division error ([72fc083](72fc0836e1))
v15.20.1 		2024-04-11 13:23:28 +00:00
rohitwaghchaure
e90b60b5cb Merge pull request #40971 from frappe/mergify/bp/version-15/pr-40969 
fix: zero division error (backport #40967) (backport #40969)
 2024-04-11 18:52:09 +05:30
rohitwaghchaure
5d2ac5b3e9 Merge pull request #40970 from frappe/mergify/bp/version-15/pr-40968 
fix: landed cost voucher for legacy pr with batch (backport #40966) (backport #40968)
 2024-04-11 18:51:54 +05:30
Rohit Waghchaure
72fc0836e1 fix: zero division error 
(cherry picked from commit f9e230e758)
(cherry picked from commit e9c6c5a8eb)
 2024-04-11 12:47:35 +00:00
Rohit Waghchaure
83a5284ba9 fix: landed cost voucher for legacy pr with batch 
(cherry picked from commit fa91cda46c)
(cherry picked from commit 4e215c6b7b)
 2024-04-11 12:31:50 +00:00
Frappe PR Bot
04ca25e199 chore(release): Bumped to Version 15.20.0 
# [15.20.0](https://github.com/frappe/erpnext/compare/v15.19.2...v15.20.0) (2024-04-11)

### Bug Fixes

* check if there is any existing depreciation schedule ([dcb7e27](dcb7e27a5e))
* Default company bank account ([d8c5f15](d8c5f15bc0))
* depr amount pro rata and related tests ([350d53d](350d53dbe1))
* depr amount pro rata and related tests ([854d4a9](854d4a9c79))
* Don't call get_fiscal_year if setup is not done yet ([9beaf65](9beaf65d19))
* exclude some query builder lines from ruff rules ([41d7c03](41d7c03cbb))
* Fetch outstanding and total amount for reference journal entry ([c72f61e](c72f61ef2f))
* Get default party bank account and company bank account for a party ([1745673](174567350e))
* Get pro-rata amount based on correct days ([1276855](1276855f40))
* Get pro-rata amount based on correct days ([5bf7c79](5bf7c799e2))
* group warehouse added in the stock reconciliation ([e6d6172](e6d6172b4c))
* ignore dimension validation for cancelled entries ([b288c73](b288c73437))
* Ignore permissions while fetching module settings properties ([5e9f31c](5e9f31cf21))
* incorrect currency symbol in General Ledger print ([9f4663b](9f4663b4d0))
* incorrect operator causing incorrect validation ([80c2a33](80c2a33fd7))
* invalid ledger entries on payment against reverse payments ([f3eb559](f3eb559a71))
* linter issues ([8016b0a](8016b0aee7))
* notify update when update outstanding amount ([b10d3c4](b10d3c4da2))
* notify update when update outstanding amount - Linters ([f514819](f51481983d))
* pass empty string email content of pos invoice ([7a9291b](7a9291b3d1))
* pick list validation didn't consider existing draft pick list ([722abf1](722abf1b6b))
* pro-rata amount for straight line method ([16a5475](16a5475c0c))
* query_report.trigger_refresh is not a function ([4f48ede](4f48ede7a0))
* Recalculate sales commission on item update ([5117494](5117494a52))
* Receive payment entry from Employee ([0cee954](0cee954f84))
* resolved merge conflict ([edd143b](edd143b084))
* Show amount in transaction currency in general ledger report ([67bac41](67bac41df4))
* show currency symbol in base currency in fixed asset register report ([7904389](79043894b2))
* Show itemised TDS breakup based on Apply TDS checkbox on item level ([4e3c885](4e3c885808))
* **test:** Advance Received should be under liability account ([4f13f47](4f13f4779a))
* **test:** for reverse payments, only advance acc should have effect ([3668de7](3668de7cb7))
* translatable web footer ([#40834](https://github.com/frappe/erpnext/issues/40834)) ([e8497b2](e8497b2d80))
* **treewide:** manual ruff fixes ([7828eee](7828eee014))
* use 'eq' and isnull() on qb conditions ([2268995](22689958da))
* use reference type name to update exc rate ([5b62f20](5b62f2050b))
* Values in transaciton currency ([3b179ba](3b179bad89))
* workstation refresh after prompt ([9f12c96](9f12c964dc))
* wrong value for total amount in payments ([807def0](807def0f04))

### Features

* ledger health doctype ([5d978c2](5d978c2729))
* new hook `fields_for_group_similar_items` to group additional fields for print formats ([#40831](https://github.com/frappe/erpnext/issues/40831)) ([4ef4466](4ef4466e67))
v15.20.0 		2024-04-11 07:38:28 +00:00
Nabin Hait
205e7afb9d Merge pull request #40918 from frappe/version-15-hotfix 
chore: release v15
 2024-04-11 13:07:06 +05:30
Nabin Hait
3b166ea249 Merge pull request #40891 from frappe/mergify/bp/version-15-hotfix/pr-40698 
fix: Get pro-rata amount based on correct days (backport #40698)
 2024-04-11 11:56:32 +05:30
Nabin Hait
694187b853 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40698 2024-04-11 11:53:20 +05:30
Nabin Hait
91fe25356e Merge pull request #40960 from nabinhait/itemised-tds-breakup-v15-hotfix 
fix: Show itemised TDS breakup based on Apply TDS checkbox on item level
 2024-04-11 11:49:34 +05:30
Nabin Hait
2e35065070 Merge pull request #40961 from nabinhait/permission-issue-v15 
fix: Ignore permissions while fetching module settings properties
 2024-04-11 11:49:21 +05:30
Nabin Hait
cca7f17b19 Merge pull request #40963 from frappe/revert-40630-mergify/bp/version-15-hotfix/pr-40514 
Revert "fix: pass empty string email content of pos invoice (backport #40514)"
 2024-04-11 11:48:49 +05:30
Nabin Hait
4591ba063c Revert "fix: pass empty string email content of pos invoice (backport #40514)" 2024-04-11 11:43:59 +05:30
Nabin Hait
5ba9fbcbdb Merge pull request #40953 from frappe/mergify/bp/version-15-hotfix/pr-40916 
fix: check if there is any existing depreciation schedule (backport #40916)
 2024-04-11 11:32:44 +05:30
Nabin Hait
23d4b01137 Merge pull request #40825 from frappe/mergify/bp/version-15-hotfix/pr-40584 
fix: show currency symbol in base currency in fixed asset register report (backport #40584)
 2024-04-11 11:30:51 +05:30
Nabin Hait
a93a9122bb Merge pull request #40955 from frappe/mergify/bp/version-15-hotfix/pr-40861 
fix: Get default party bank account and company bank account for a party (backport #40861)
 2024-04-11 11:29:30 +05:30
Nabin Hait
ac99d8543d Merge pull request #40958 from frappe/mergify/bp/version-15-hotfix/pr-40920 
fix: Fetch correct outstanding and total amount for reference journal entry (backport #40920)
 2024-04-11 11:28:53 +05:30
Nabin Hait
5e9f31cf21 fix: Ignore permissions while fetching module settings properties 2024-04-11 11:23:19 +05:30
Nabin Hait
4e3c885808 fix: Show itemised TDS breakup based on Apply TDS checkbox on item level 2024-04-11 11:20:38 +05:30
Nabin Hait
711bc3ff1c Merge pull request #40951 from frappe/mergify/bp/version-15-hotfix/pr-40833 
fix: wrong value for total amount in payments (backport #40833)
 2024-04-11 11:12:07 +05:30
Nabin Hait
c72f61ef2f fix: Fetch outstanding and total amount for reference journal entry 
(cherry picked from commit f331f9b15c)
 2024-04-11 05:35:43 +00:00
Nabin Hait
174567350e fix: Get default party bank account and company bank account for a party 
(cherry picked from commit f87be1d96e)
 2024-04-11 05:25:34 +00:00
Nabin Hait
dcb7e27a5e fix: check if there is any existing depreciation schedule 
(cherry picked from commit 433c8c450c)
 2024-04-11 05:24:08 +00:00
Nabin Hait
959d9c5fda Merge branch 'version-15' into version-15-hotfix 2024-04-11 10:51:32 +05:30
Deepesh Garg
955ffce775 Merge pull request #40630 from frappe/mergify/bp/version-15-hotfix/pr-40514 
fix: pass empty string email content of pos invoice (#40514)
 2024-04-10 21:36:57 +05:30
Deepesh Garg
6f3a70d35f Merge pull request #40697 from frappe/mergify/bp/version-15-hotfix/pr-40641 
chore: Reduce usage of cur_frm (#40641)
 2024-04-10 21:35:08 +05:30
mergify[bot]
0ec1f01b00 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40584 2024-04-10 15:57:49 +00:00
HarryPaulo
807def0f04 fix: wrong value for total amount in payments 
(cherry picked from commit bf88b8eb65)
 2024-04-10 15:57:11 +00:00
Deepesh Garg
87e30a2981 Merge pull request #40950 from frappe/mergify/bp/version-15-hotfix/pr-40863 
fix: Show amount in transaction currency in general ledger report (#40863)
 2024-04-10 21:24:39 +05:30
Deepesh Garg
0e1c7e8788 Merge pull request #40946 from frappe/mergify/bp/version-15-hotfix/pr-40844 
fix: notify update when update outstanding amount (#40844)
 2024-04-10 21:22:42 +05:30
Deepesh Garg
21454e4dfb Merge pull request #40948 from frappe/mergify/bp/version-15-hotfix/pr-40931 
fix: Don't call get_fiscal_year if setup is not done yet (backport #40931)
 2024-04-10 21:22:22 +05:30
Deepesh Garg
18700c26f9 Merge pull request #40945 from frappe/mergify/bp/version-15-hotfix/pr-40849 
fix: Values in transaction currency (backport #40849)
 2024-04-10 21:22:06 +05:30
Nabin Hait
67bac41df4 fix: Show amount in transaction currency in general ledger report 
(cherry picked from commit d868122f12)
 2024-04-10 15:26:25 +00:00
Corentin Flr
9beaf65d19 fix: Don't call get_fiscal_year if setup is not done yet 
(cherry picked from commit c203fafb1b)
 2024-04-10 15:18:26 +00:00
HarryPaulo
f51481983d fix: notify update when update outstanding amount - Linters 
(cherry picked from commit 198b90eb01)
 2024-04-10 15:17:17 +00:00
HarryPaulo
b10d3c4da2 fix: notify update when update outstanding amount 
(cherry picked from commit f67f163e7d)
 2024-04-10 15:17:16 +00:00
Deepesh Garg
3b179bad89 fix: Values in transaciton currency 
(cherry picked from commit a3c9fd6567)
 2024-04-10 15:16:39 +00:00
Akhil Narang
29e3a400f9 Merge pull request #40935 from akhilnarang/v15-ruff 
chore: backport ruff linting/formatting
 2024-04-10 16:36:13 +05:30
Akhil Narang
3141a1702c chore: gitignore ruff format 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:12 +05:30
ruthra kumar
22689958da fix: use 'eq' and isnull() on qb conditions 
(cherry picked from commit eee86d2e4b)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:12 +05:30
Akhil Narang
41d7c03cbb fix: exclude some query builder lines from ruff rules 
`== None` and `== True` are intentional here

(cherry picked from commit ac69513f60)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
Akhil Narang
7828eee014 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
ruthra kumar
9b1e36ebf0 Merge pull request #40938 from frappe/mergify/bp/version-15-hotfix/pr-40936 
fix: ignore dimension validation for cancelled entries (backport #40936)
 2024-04-10 15:28:16 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
ruthra kumar
b288c73437 fix: ignore dimension validation for cancelled entries 
(cherry picked from commit 971c867f29)
 2024-04-10 08:29:25 +00:00
barredterra
9eeedd8515 chore: switch to ruff for python formatting/linting 
(cherry picked from commit 8afb7790de)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 13:10:19 +05:30