CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,728 Commits 423 Branches 1,723 Tags
ceafa0ce282cc41cb00a9c8f302a87166ea03595
Commit Graph

48728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
6cefe45e5b Merge pull request #40905 from frappe/mergify/bp/version-15-hotfix/pr-40878 
refactor: merge taxes from delivery note to Sales Invoice (backport #40878)
 2024-04-08 15:47:11 +05:30
ruthra kumar
d4a74923c1 test: tax merging from 2 Delivery Note to Sales Invoice 
(cherry picked from commit 39a48a2e2a)
 2024-04-08 09:09:46 +00:00
ruthra kumar
e9b87fdd42 refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:46 +00:00
ruthra kumar
7f790ca908 Merge pull request #40903 from frappe/mergify/bp/version-15-hotfix/pr-40876 
fix: ledger entries for Payment against reverse payment reconciliation (backport #40876)
 2024-04-08 09:11:33 +05:30
ruthra kumar
2373dd9b95 chore: resolve conflicts 2024-04-08 08:52:41 +05:30
ruthra kumar
67df5ae0ec refactor(test): include new fields in assertion 
(cherry picked from commit 64b7f624a5)
 2024-04-08 01:59:13 +00:00
ruthra kumar
7c0d46409f test: advance payment against reverse payment reconciliation 
(cherry picked from commit 141f462368)
 2024-04-08 01:59:13 +00:00
ruthra kumar
4ad423b1b9 test: reverse payment against payment for supplier 
(cherry picked from commit 248cc6105b)
 2024-04-08 01:59:12 +00:00
ruthra kumar
3668de7cb7 fix(test): for reverse payments, only advance acc should have effect 
This applies for Payments against Reverse-Payment reconcilition

(cherry picked from commit 74bc38e0af)
 2024-04-08 01:59:12 +00:00
ruthra kumar
d9826e3dfc refactor: supplementary field to better handle reverse payments 
(cherry picked from commit bdd36b0001)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
 2024-04-08 01:59:12 +00:00
ruthra kumar
f3eb559a71 fix: invalid ledger entries on payment against reverse payments 
On Advance payments booked on separate party account, reconciliation
against a reverse payment posted invalid ledger entries.

(cherry picked from commit 9fd2dddfde)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
 2024-04-08 01:59:11 +00:00
ruthra kumar
4f13f4779a fix(test): Advance Received should be under liability account 
(cherry picked from commit a75e095d00)
 2024-04-08 01:59:10 +00:00
Frappe PR Bot
3566a8adc6 chore(release): Bumped to Version 15.19.2 
## [15.19.2](https://github.com/frappe/erpnext/compare/v15.19.1...v15.19.2) (2024-04-07)

### Bug Fixes

* depr amount pro rata and related tests ([e41d23d](e41d23d26c))
* Get pro-rata amount based on correct days ([f229282](f229282754))
* pro-rata amount for straight line method ([e71f334](e71f33425c))
v15.19.2 		2024-04-07 10:40:27 +00:00
Nabin Hait
7fdc8f7c38 Merge pull request #40902 from frappe/mergify/bp/version-15/pr-40901 
fix: Get pro-rata depreciation amount based on correct days (backport #40901)
 2024-04-07 16:09:14 +05:30
Nabin Hait
e71f33425c fix: pro-rata amount for straight line method 
(cherry picked from commit 16a5475c0c)
 2024-04-07 10:14:39 +00:00
Nabin Hait
6ddd08d0b0 fix:linter issue 
(cherry picked from commit 8247fd1727)
 2024-04-07 10:14:39 +00:00
Nabin Hait
e41d23d26c fix: depr amount pro rata and related tests 
(cherry picked from commit 350d53dbe1)
 2024-04-07 10:14:39 +00:00
Nabin Hait
f229282754 fix: Get pro-rata amount based on correct days 
(cherry picked from commit 1276855f40)
 2024-04-07 10:14:38 +00:00
Nabin Hait
77fd0436a8 Merge pull request #40901 from nabinhait/pro-rata-depr-v15 
fix: Get pro-rata depreciation amount based on correct days
 2024-04-07 15:43:32 +05:30
Nabin Hait
16a5475c0c fix: pro-rata amount for straight line method 2024-04-07 15:21:46 +05:30
Nabin Hait
8247fd1727 fix:linter issue 2024-04-07 15:18:29 +05:30
rohitwaghchaure
159d633a62 Merge pull request #40836 from frappe/mergify/bp/version-15-hotfix/pr-40834 
fix: translatable web footer (backport #40834)
 2024-04-07 14:36:03 +05:30
rohitwaghchaure
99a57e689d Merge pull request #40860 from frappe/mergify/bp/version-15-hotfix/pr-40848 
fix: group warehouse added in the stock reconciliation (backport #40848)
 2024-04-07 14:34:58 +05:30
rohitwaghchaure
97bf4a829a Merge pull request #40894 from frappe/mergify/bp/version-15-hotfix/pr-40883 
fix: incorrect operator causing incorrect validation (backport #40883)
 2024-04-07 14:33:43 +05:30
Nabin Hait
350d53dbe1 fix: depr amount pro rata and related tests 2024-04-07 14:14:13 +05:30
Nabin Hait
1276855f40 fix: Get pro-rata amount based on correct days 2024-04-07 14:14:06 +05:30
Nabin Hait
edd143b084 fix: resolved merge conflict 2024-04-07 12:15:52 +05:30
Rohit Waghchaure
80c2a33fd7 fix: incorrect operator causing incorrect validation 
(cherry picked from commit 6b317b0c0d)
 2024-04-07 06:34:23 +00:00
rohitwaghchaure
25e0a808cd Merge pull request #40889 from frappe/mergify/bp/version-15-hotfix/pr-40887 
fix: query_report.trigger_refresh is not a function (backport #40887)
 2024-04-07 12:02:46 +05:30
Nabin Hait
0cd94b017f fix:linter issue 
(cherry picked from commit be0cb5289f)

# Conflicts:
#	erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
 2024-04-07 06:32:22 +00:00
Nabin Hait
854d4a9c79 fix: depr amount pro rata and related tests 
(cherry picked from commit e8dcbe2625)
 2024-04-07 06:32:22 +00:00
Nabin Hait
5bf7c799e2 fix: Get pro-rata amount based on correct days 
(cherry picked from commit 6c1e9fab27)
 2024-04-07 06:32:22 +00:00
Rohit Waghchaure
4f48ede7a0 fix: query_report.trigger_refresh is not a function 
(cherry picked from commit 30bbb58ca1)
 2024-04-07 06:27:51 +00:00
ruthra kumar
0532b1fd94 Merge pull request #40869 from frappe/mergify/bp/version-15-hotfix/pr-40856 
fix: unwanted Exc Gain/Loss journals on Payment against Journal entry (backport #40856)
 2024-04-05 10:52:43 +05:30
ruthra kumar
4b78eb7e76 test: payment against JE reconciliation with different rates 
(cherry picked from commit fe84558b77)
 2024-04-05 05:04:02 +00:00
ruthra kumar
5b62f2050b fix: use reference type name to update exc rate 
(cherry picked from commit c15690e475)
 2024-04-05 05:04:02 +00:00
Rohit Waghchaure
e6d6172b4c fix: group warehouse added in the stock reconciliation 
(cherry picked from commit 8f53bc0096)
 2024-04-04 10:10:24 +00:00
Deepesh Garg
91f689575e Merge pull request #40810 from frappe/mergify/bp/version-15-hotfix/pr-40796 
fix: Default company bank account (#40796)
 2024-04-04 14:28:07 +05:30
Frappe PR Bot
dc0c85a227 chore(release): Bumped to Version 15.19.1 
## [15.19.1](https://github.com/frappe/erpnext/compare/v15.19.0...v15.19.1) (2024-04-04)

### Bug Fixes

* Receive payment entry from Employee ([3e7abf5](3e7abf5fe5))
v15.19.1 		2024-04-04 08:57:45 +00:00
Deepesh Garg
5c5a0c965d Merge pull request #40809 from frappe/mergify/bp/version-15-hotfix/pr-40770 
fix: Recalculate sales commission on item update (#40770)
 2024-04-04 14:27:40 +05:30
Deepesh Garg
162b6bf50b Merge pull request #40855 from frappe/mergify/bp/version-15/pr-40808 
fix: Receive payment entry from Employee (#40755)
 2024-04-04 14:26:36 +05:30
Deepesh Garg
3e7abf5fe5 fix: Receive payment entry from Employee 
(cherry picked from commit 29e5c6807e)
(cherry picked from commit 0cee954f84)
 2024-04-04 08:55:02 +00:00
Deepesh Garg
7131e7836d Merge pull request #40808 from frappe/mergify/bp/version-15-hotfix/pr-40755 
fix: Receive payment entry from Employee (#40755)
 2024-04-04 14:24:13 +05:30
rohitwaghchaure
806a802daa Merge pull request #40853 from frappe/mergify/bp/version-15-hotfix/pr-40852 
fix: workstation refresh after prompt (backport #40852)
 2024-04-04 12:07:47 +05:30
Nihantra C. Patel
9f12c964dc fix: workstation refresh after prompt 
(cherry picked from commit bed1af26e3)
 2024-04-04 06:21:36 +00:00
Frappe PR Bot
f78df8dccb chore(release): Bumped to Version 15.19.0 
# [15.19.0](https://github.com/frappe/erpnext/compare/v15.18.3...v15.19.0) (2024-04-03)

### Bug Fixes

* added validation if parent id is missing in BOM Creator ([87ce9d8](87ce9d834f))
* barcode not fetched on selection of item ([2b1b51b](2b1b51b5bb))
* button to select serial / batch bundle in the subcontracting receipt ([d2a6509](d2a6509950))
* cost center shouldn't update debit/credit in Exc gain/loss JV ([71704be](71704beb6f))
* do not fetch received items in purchase receipt ([3761e74](3761e74436))
* enable list view for the issues on the portal ([b089eda](b089eda8bf))
* markdown to text editor set for supplier quotation ([5fb6428](5fb642831c))
* payment_order_status should be no_copy ([2dd697e](2dd697ee77))
* Priority not copied from project template ([a3a6bf6](a3a6bf6ae1))
* rate changed on changing of the qty ([41b3a59](41b3a59aae))
* sales / prchase return validation issue ([7a21997](7a21997701))
* show future payments allocated sales returns is considered as payment ([0561d0a](0561d0a81c))
* Show Stock Ageing Data filter not working in stock balance report ([2185a29](2185a29555))
* Warehouse linked company name in multicompany setup (backport [#40779](https://github.com/frappe/erpnext/issues/40779)) ([#40781](https://github.com/frappe/erpnext/issues/40781)) ([33b6244](33b6244ae6))

### Features

* allow to pick manually qty / batches / serial nos ([5ea11af](5ea11af36b))
v15.19.0 		2024-04-03 10:32:58 +00:00
Deepesh Garg
955078abb0 Merge pull request #40820 from frappe/version-15-hotfix 
chore: release v15
 2024-04-03 16:01:44 +05:30
rohitwaghchaure
405719cd3d Merge pull request #40838 from frappe/mergify/bp/version-15-hotfix/pr-40723 
feat: allow to pick manually qty / batches / serial nos (backport #40723)
 2024-04-02 22:55:34 +05:30
rohitwaghchaure
52c4157723 chore: fix conflicts 2024-04-02 22:23:22 +05:30
Rohit Waghchaure
5ea11af36b feat: allow to pick manually qty / batches / serial nos 
(cherry picked from commit 50dd9fa8a3)

# Conflicts:
#	erpnext/stock/doctype/pick_list/pick_list.json
 2024-04-02 16:45:23 +00:00