CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 17:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,379 Commits 396 Branches 1,698 Tags
version-13
Commit Graph

42379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
37e00a66da chore(release): Bumped to Version 13.55.2 
## [13.55.2](https://github.com/frappe/erpnext/compare/v13.55.1...v13.55.2) (2023-12-27)

### Bug Fixes

* incorrect price list in customer-wise item price report ([32f3365](32f3365ac7))
* **Payment Entry:** don't check empty references ([f0877ff](f0877ffa47))
v13.55.2 		2023-12-27 08:40:57 +00:00
rohitwaghchaure
4394c0113e Merge pull request #38951 from frappe/version-13-hotfix 
chore: release v13
 2023-12-27 14:09:51 +05:30
ruthra kumar
ab82e30fac Merge pull request #38947 from frappe/mergify/bp/version-13-hotfix/pr-38891 
fix: incorrect price list in customer-wise item price report (backport #38891)
 2023-12-26 12:16:39 +05:30
ruthra kumar
32f3365ac7 fix: incorrect price list in customer-wise item price report 
(cherry picked from commit 9a00edb031)
 2023-12-26 06:18:00 +00:00
Deepesh Garg
80012b7339 Merge pull request #38769 from frappe/deepeshgarg007-patch-1 
chore: Loan Interest Accrual post topup
 2023-12-22 08:40:48 +05:30
ruthra kumar
b049b52294 Merge pull request #38750 from barredterra/pe-empty-referneces 
fix(Payment Entry): don't check empty references
 2023-12-21 11:00:21 +05:30
Frappe PR Bot
82c28ac89f chore(release): Bumped to Version 13.55.1 
## [13.55.1](https://github.com/frappe/erpnext/compare/v13.55.0...v13.55.1) (2023-12-20)

### Bug Fixes

* avoid over allocation during backdated assignment creation ([fee4eae](fee4eae96c))
* earned leave allocation in policy assignment ([14955c7](14955c70d4))
* earned leave exceeding annual allocation ([ee7c9ad](ee7c9add39))
* get customers for leaderboard ([10f02e6](10f02e60ce))
* get items for leaderboard ([3863c4e](3863c4e7fb))
* get sales partner for leaderboard ([b0f7de1](b0f7de1a0f))
* get sales person for leaderboard ([8dbb200](8dbb200fe3))
* get suppliers for leaderboard ([7df8425](7df8425756))
v13.55.1 		2023-12-20 04:45:38 +00:00
Deepesh Garg
692d98dd4d Merge pull request #38854 from frappe/version-13-hotfix 
chore: release v13
 2023-12-20 10:14:33 +05:30
Rucha Mahabal
5d1c35634c Merge pull request #38610 from ruchamahabal/EL-overallocation-v13 
fix: earned leave exceeding annual allocation
 2023-12-19 15:26:38 +05:30
Rucha Mahabal
9900274b27 test(fix): earned leave tests 2023-12-19 13:03:57 +05:30
Rucha Mahabal
14955c70d4 fix: earned leave allocation in policy assignment 2023-12-19 13:03:36 +05:30
Raffael Meyer
8c55e35d20 Merge pull request #38676 from frappe/mergify/bp/version-13-hotfix/pr-38672 
fix: get data for leaderboard (backport #38672)
 2023-12-15 16:27:22 +01:00
barredterra
e6e9f1dc26 chore: remove deprecation wrapper 
not available in v13
 2023-12-15 15:46:40 +01:00
Deepesh Garg
4f8b13ac57 chore: Loan Interest Accrual post topup 2023-12-15 12:46:59 +05:30
barredterra
f0877ffa47 fix(Payment Entry): don't check empty references 
Manual partial backport of https://github.com/frappe/erpnext/pull/36649
 2023-12-14 13:39:35 +01:00
barredterra
e291b5db3d chore: deprecate unused method 
(cherry picked from commit 956c3c50a0)
 2023-12-12 04:24:54 +00:00
barredterra
b0f7de1a0f fix: get sales partner for leaderboard 
(cherry picked from commit 40c1acc961)
 2023-12-12 04:24:54 +00:00
barredterra
8dbb200fe3 fix: get sales person for leaderboard 
(cherry picked from commit 7babfd4ac4)
 2023-12-12 04:24:54 +00:00
barredterra
7df8425756 fix: get suppliers for leaderboard 
(cherry picked from commit 65df4b6aa8)
 2023-12-12 04:24:54 +00:00
barredterra
3863c4e7fb fix: get items for leaderboard 
(cherry picked from commit 2721ee3a8d)
 2023-12-12 04:24:53 +00:00
barredterra
10f02e60ce fix: get customers for leaderboard 
(cherry picked from commit 137b5a6108)
 2023-12-12 04:24:53 +00:00
Rucha Mahabal
48eaa51c4a test: earned leave over-allocation 2023-12-07 13:04:51 +05:30
Rucha Mahabal
fee4eae96c fix: avoid over allocation during backdated assignment creation 2023-12-07 13:04:23 +05:30
Rucha Mahabal
ee7c9add39 fix: earned leave exceeding annual allocation 2023-12-07 13:01:57 +05:30
Frappe PR Bot
b6229515ef chore(release): Bumped to Version 13.55.0 
# [13.55.0](https://github.com/frappe/erpnext/compare/v13.54.14...v13.55.0) (2023-12-05)

### Bug Fixes

* consider the `Valuation Method` while picking incorrect SLE (backport [#38592](https://github.com/frappe/erpnext/issues/38592)) ([#38596](https://github.com/frappe/erpnext/issues/38596)) ([1b78dd1](1b78dd17c9))
* make create button translatable (backport [#38165](https://github.com/frappe/erpnext/issues/38165)) ([#38412](https://github.com/frappe/erpnext/issues/38412)) ([bd371e6](bd371e697c))
* show difference amount in default currency ([6f44a16](6f44a1630f))
* update voucher currency for allocated entry ([3dfc145](3dfc1450a1))

### Features

* `Company` filter in `Stock Ledger Variance` report (backport [#38553](https://github.com/frappe/erpnext/issues/38553)) ([#38575](https://github.com/frappe/erpnext/issues/38575)) ([77e01eb](77e01ebacf))
* add currency column for allocated entries ([835c85a](835c85a087))
v13.55.0 		2023-12-05 13:50:34 +00:00
Deepesh Garg
6e25a5189c Merge pull request #38588 from frappe/version-13-hotfix 
chore: release v13
 2023-12-05 19:19:16 +05:30
mergify[bot]
1b78dd17c9 fix: consider the Valuation Method while picking incorrect SLE (backport #38592) (#38596) 
* fix: incorrect SLE for `Moving Average` valuation method

(cherry picked from commit 8beec58670)

* feat: add `Valuation Method` column in `Stock Ledger Variance` report

(cherry picked from commit 16c297c2ec)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 18:14:19 +05:30
mergify[bot]
77e01ebacf feat: Company filter in Stock Ledger Variance report (backport #38553) (#38575) 
feat: `Company` filter in `Stock Ledger Variance` report

(cherry picked from commit fb3421fcce)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 12:32:57 +05:30
mergify[bot]
bd371e697c fix: make create button translatable (backport #38165) (#38412) 
fix: make create button translatable (#38165)

* fix: make all create buttons translatable

* style: use double quotes

---------

Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8e4b591ea2)

Co-authored-by: Patrick Eissler <77415730+PatrickDEissler@users.noreply.github.com>
 2023-12-01 11:33:35 +05:30
Raffael Meyer
2c4cee025b ci: pin semgrep to old version (#38426) 
* ci: pin semgrep to old version

current version has problem with PRs originating from fork

* ci: unpin semgrep

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2023-11-29 22:06:31 +05:30
Deepesh Garg
303becf1e3 Merge pull request #38390 from GursheenK/payment-reco-currency-symbol 
fix: currency symbol in payment rec allocations
 2023-11-29 17:22:12 +05:30
Frappe PR Bot
983c2133c2 chore(release): Bumped to Version 13.54.14 
## [13.54.14](https://github.com/frappe/erpnext/compare/v13.54.13...v13.54.14) (2023-11-29)

### Bug Fixes

* patch - Duplicate entry quality inspection parameter (backport [#38262](https://github.com/frappe/erpnext/issues/38262)) ([#38265](https://github.com/frappe/erpnext/issues/38265)) ([095d99d](095d99dbd2))
* precision for invoice outstandings ([#38323](https://github.com/frappe/erpnext/issues/38323)) ([190f77a](190f77abff))
v13.54.14 		2023-11-29 04:55:27 +00:00
Deepesh Garg
a76c6ab042 Merge pull request #38385 from frappe/version-13-hotfix 
chore: release v13
 2023-11-29 10:24:11 +05:30
Gursheen Anand
6f44a1630f fix: show difference amount in default currency 2023-11-28 16:31:40 +05:30
Gursheen Anand
b7944a7c07 chore: hide currency column 2023-11-28 15:51:33 +05:30
Gursheen Anand
3dfc1450a1 fix: update voucher currency for allocated entry 2023-11-28 15:43:36 +05:30
Gursheen Anand
835c85a087 feat: add currency column for allocated entries 2023-11-28 15:42:30 +05:30
Gursheen Kaur Anand
190f77abff fix: precision for invoice outstandings (#38323) 
fix: precision while setting inv outstanding
 2023-11-26 18:56:34 +05:30
Frappe PR Bot
a37bdb54cd chore(release): Bumped to Version 13.54.13 
## [13.54.13](https://github.com/frappe/erpnext/compare/v13.54.12...v13.54.13) (2023-11-22)

### Bug Fixes

* patch - Duplicate entry quality inspection parameter (backport [#38262](https://github.com/frappe/erpnext/issues/38262)) (backport [#38265](https://github.com/frappe/erpnext/issues/38265)) ([#38266](https://github.com/frappe/erpnext/issues/38266)) ([b28e29c](b28e29cab1))
v13.54.13 		2023-11-22 08:53:41 +00:00
mergify[bot]
b28e29cab1 fix: patch - Duplicate entry quality inspection parameter (backport #38262) (backport #38265) (#38266) 
fix: patch - Duplicate entry quality inspection parameter (backport #38262) (#38265)

fix: patch - Duplicate entry quality inspection parameter (#38262)

(cherry picked from commit 0ca7527f7a)

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-11-22 14:22:30 +05:30
mergify[bot]
095d99dbd2 fix: patch - Duplicate entry quality inspection parameter (backport #38262) (#38265) 
fix: patch - Duplicate entry quality inspection parameter (#38262)

(cherry picked from commit 0ca7527f7a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-22 14:09:00 +05:30
Frappe PR Bot
01fc5f6865 chore(release): Bumped to Version 13.54.12 
## [13.54.12](https://github.com/frappe/erpnext/compare/v13.54.11...v13.54.12) (2023-11-21)

### Bug Fixes

* `get_previous_allocation` return value ([6cb8a40](6cb8a40339))
* backward compatible query without pluck ([958db77](958db77cda))
* pass check permission in render_address ([65ae8d9](65ae8d9c05))
* **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134](https://github.com/frappe/erpnext/issues/38134)) ([#38154](https://github.com/frappe/erpnext/issues/38154)) ([1e43605](1e436052e2))
* **Timesheet:** warn user if billing hours > actual hours instead of resetting  (backport [#38239](https://github.com/frappe/erpnext/issues/38239)) ([#38242](https://github.com/frappe/erpnext/issues/38242)) ([a9429e1](a9429e160d))
* use `get_all` instead of `get_list` ([4b8ed0f](4b8ed0f6ae))

### Performance Improvements

* index most queried fields in Leave Ledger Entry ([eea7bbc](eea7bbcea7))
* limit rows to 1 for cf leave expiry query ([635c3d5](635c3d54f5))
v13.54.12 		2023-11-21 18:56:36 +00:00
Deepesh Garg
911e2c5b36 Merge pull request #38249 from frappe/version-13-hotfix 
chore: release v13
 2023-11-22 00:25:25 +05:30
mergify[bot]
a9429e160d fix(Timesheet): warn user if billing hours > actual hours instead of resetting (backport #38239) (#38242) 
fix(Timesheet): warn user if billing hours > actual hours instead of resetting  (#38239)

* revert: "fix(Timesheet): reset billing hours equal to hours if they exceed actual hours"

This reverts commit 0ec8034507.

* fix: warn user if billing hours > actual hours

(cherry picked from commit ac91030b31)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-21 13:42:36 +05:30
Sagar Vora
5342cd0dfa Merge pull request #38170 from frappe/mergify/bp/version-13-hotfix/pr-38167 
fix: pass check permission in `render_address` (backport #38167)
 2023-11-18 17:43:40 +05:30
Sagar Vora
3bf84e1464 chore: fix conflicts 2023-11-18 17:42:06 +05:30
Vishakh Desai
65ae8d9c05 fix: pass check permission in render_address 
(cherry picked from commit 45299fe4b3)

# Conflicts:
#	erpnext/accounts/party.py
 2023-11-18 12:09:18 +00:00
Rucha Mahabal
35717124cd Merge pull request #38158 from ruchamahabal/perf-leave-balance-report-v13 
perf: faster Employee Leave Balance report
 2023-11-17 22:57:49 +05:30
Rucha Mahabal
89c107ea8b chore: remove states from json 2023-11-17 22:56:42 +05:30
Rucha Mahabal
958db77cda fix: backward compatible query without pluck 2023-11-17 21:11:42 +05:30