CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-27 08:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,340 Commits 408 Branches 1,707 Tags
a37bdb54cddce02418c77100508b88bba4e433df
Commit Graph

42340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Rucha Mahabal
bc1da4678a refactor: retain backward compatible type hints 2023-11-17 20:45:34 +05:30
Rucha Mahabal
6cb8a40339 fix: get_previous_allocation return value 2023-11-17 20:19:39 +05:30
Rucha Mahabal
9139c14639 refactor(Leave Balance Summary report): remove unused department approver queries 2023-11-17 20:19:10 +05:30
Rucha Mahabal
461eb7a50d refactor: rewrite queries with frappe.qb + refactor type hints 2023-11-17 20:17:31 +05:30
Rucha Mahabal
635c3d54f5 perf: limit rows to 1 for cf leave expiry query 2023-11-17 20:17:11 +05:30
Rucha Mahabal
1bd3f4eeef refactor: remove unnecessary approver queries 2023-11-17 20:16:58 +05:30
Rucha Mahabal
4b8ed0f6ae fix: use get_all instead of get_list 
- query report already filters records based on permissions for link fields

- allow employees access to leave balance report by default
 2023-11-17 20:16:43 +05:30
Rucha Mahabal
eea7bbcea7 perf: index most queried fields in Leave Ledger Entry 2023-11-17 20:16:24 +05:30
mergify[bot]
1e436052e2 fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (backport #38134) (#38154) 
fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (#38134)

(cherry picked from commit 20c6e9fca2)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-17 18:32:35 +05:30
Frappe PR Bot
91a132c011 chore(release): Bumped to Version 13.54.11 
## [13.54.11](https://github.com/frappe/erpnext/compare/v13.54.10...v13.54.11) (2023-11-14)

### Bug Fixes

* close `Credit Limit Crossed` dialog (backport [#38052](https://github.com/frappe/erpnext/issues/38052)) ([#38057](https://github.com/frappe/erpnext/issues/38057)) ([5be5fde](5be5fde276))
v13.54.11 		2023-11-14 12:56:26 +00:00
Deepesh Garg
2263542a6b Merge pull request #38087 from frappe/version-13-hotfix 
chore: release v13
 2023-11-14 18:25:03 +05:30
mergify[bot]
5be5fde276 fix: close Credit Limit Crossed dialog (backport #38052) (#38057) 
fix: close `Credit Limit Crossed` dialog (#38052)

(cherry picked from commit 94faa44697)

Co-authored-by: Arjun <arjun99c@gmail.com>
 2023-11-12 18:07:50 +05:30
Frappe PR Bot
6a53e823f0 chore(release): Bumped to Version 13.54.10 
## [13.54.10](https://github.com/frappe/erpnext/compare/v13.54.9...v13.54.10) (2023-11-08)

### Bug Fixes

* add missing disbursement account in update_old_loans patch ([37b1a0e](37b1a0e778))
* bump pygithub requirement to handle conflict ([#37800](https://github.com/frappe/erpnext/issues/37800)) ([13d5eec](13d5eec194))
* e-invoice jwt verification error ([#37818](https://github.com/frappe/erpnext/issues/37818)) ([8f4ded6](8f4ded6ad1))
* permission error while creating Supplier Quotation from Portal (backport [#37864](https://github.com/frappe/erpnext/issues/37864)) ([#37872](https://github.com/frappe/erpnext/issues/37872)) ([6952f0f](6952f0f082))
* Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport [#37499](https://github.com/frappe/erpnext/issues/37499)) ([#37918](https://github.com/frappe/erpnext/issues/37918)) ([4789eca](4789ecacea))
* remove voucher type and no for Item and Warehouse based reposting (backport [#37849](https://github.com/frappe/erpnext/issues/37849)) (backport [#37850](https://github.com/frappe/erpnext/issues/37850)) ([#37938](https://github.com/frappe/erpnext/issues/37938)) ([8cb0f69](8cb0f690d5))
v13.54.10 		2023-11-08 06:04:16 +00:00
Deepesh Garg
c808607975 Merge pull request #37966 from frappe/version-13-hotfix 
chore: release v13
 2023-11-08 11:33:04 +05:30
mergify[bot]
8cb0f690d5 fix: remove voucher type and no for Item and Warehouse based reposting (backport #37849) (backport #37850) (#37938) 
* fix: remove voucher type and no for Item and Warehouse based reposting (backport #37849) (#37850)

* fix: remove voucher type and no for Item and Warehouse based reposting

(cherry picked from commit 0104897d69)

* chore: fix test cases

---------

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

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
#	erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
#	erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* fix: conflicts

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-07 16:07:17 +05:30
mergify[bot]
4789ecacea fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport #37499) (#37918) 
fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (#37499)

* fix: account for case-insensitive database primary key for parameter names

* chore: linting

(cherry picked from commit b099590b2c)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2023-11-05 06:22:42 +00:00
Anand Baburajan
d00257ffd7 Merge pull request #37891 from frappe/mergify/bp/version-13-hotfix/pr-37889 
fix: add missing disbursement account in update_old_loans patch (backport #37889)
 2023-11-03 21:48:57 +05:30
anandbaburajan
37b1a0e778 fix: add missing disbursement account in update_old_loans patch 
(cherry picked from commit ad64065ec6)
 2023-11-03 16:17:29 +00:00
mergify[bot]
6952f0f082 fix: permission error while creating Supplier Quotation from Portal (backport #37864) (#37872) 
* fix: permission error while creating Supplier Quotation from Portal

(cherry picked from commit e019d43d0b)

# Conflicts:
#	erpnext/controllers/buying_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-03 16:26:45 +05:30
Frappe PR Bot
c84384aa1b chore(release): Bumped to Version 13.54.9 
## [13.54.9](https://github.com/frappe/erpnext/compare/v13.54.8...v13.54.9) (2023-11-01)

### Bug Fixes

* e-invoice jwt verification error (backport [#37818](https://github.com/frappe/erpnext/issues/37818)) ([#37820](https://github.com/frappe/erpnext/issues/37820)) ([428f7a6](428f7a61ef))
v13.54.9 		2023-11-01 07:59:52 +00:00
mergify[bot]
428f7a61ef fix: e-invoice jwt verification error (backport #37818) (#37820) 
fix: e-invoice jwt verification error (#37818)

(cherry picked from commit 8f4ded6ad1)

Co-authored-by: Dany Robert <rtdany10@gmail.com>
 2023-11-01 13:28:21 +05:30
Dany Robert
8f4ded6ad1 fix: e-invoice jwt verification error (#37818) 2023-11-01 13:27:24 +05:30
Frappe PR Bot
9607d69ada chore(release): Bumped to Version 13.54.8 
## [13.54.8](https://github.com/frappe/erpnext/compare/v13.54.7...v13.54.8) (2023-10-31)

### Bug Fixes

* bump pygithub requirement to handle conflict (backport [#37800](https://github.com/frappe/erpnext/issues/37800)) ([#37808](https://github.com/frappe/erpnext/issues/37808)) ([aaba335](aaba335273))
v13.54.8 		2023-10-31 14:46:40 +00:00
mergify[bot]
aaba335273 fix: bump pygithub requirement to handle conflict (backport #37800) (#37808) 
fix: bump pygithub requirement to handle conflict (#37800)

build: bump pygithub requirement

This conflicts with pyjwt

(cherry picked from commit 13d5eec194)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-10-31 20:04:31 +05:30
Ankush Menat
13d5eec194 fix: bump pygithub requirement to handle conflict (#37800) 
build: bump pygithub requirement

This conflicts with pyjwt
 2023-10-31 19:55:56 +05:30
Frappe PR Bot
411bba1b98 chore(release): Bumped to Version 13.54.7 
## [13.54.7](https://github.com/frappe/erpnext/compare/v13.54.6...v13.54.7) (2023-10-31)

### Bug Fixes

* wrong german translation ([#37658](https://github.com/frappe/erpnext/issues/37658)) ([5669a89](5669a89afe))
v13.54.7 		2023-10-31 12:45:41 +00:00
rohitwaghchaure
49f2d868c7 Merge pull request #37786 from frappe/version-13-hotfix 
chore: release v13
 2023-10-31 18:14:20 +05:30
Raffael Meyer
335b6c84db Merge pull request #37666 from frappe/mergify/bp/version-13-hotfix/pr-37658 
fix: wrong german translation (backport #37658)
 2023-10-28 23:07:59 +02:00
barredterra
00dff0a219 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-37658 2023-10-28 22:42:43 +02:00
mergify[bot]
b55b428114 chore: fixed test case non_internal_transfer_delivery_note (backport #37671) (#37677) 
chore: fixed test case non_internal_transfer_delivery_note (#37671)

(cherry picked from commit 2bcff4c7f2)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-25 13:55:17 +05:30
Frappe PR Bot
dd6498d347 chore(release): Bumped to Version 13.54.6 
## [13.54.6](https://github.com/frappe/erpnext/compare/v13.54.5...v13.54.6) (2023-10-25)

### Bug Fixes

* incorrect cost center in the purchase invoice (backport [#37591](https://github.com/frappe/erpnext/issues/37591)) ([#37610](https://github.com/frappe/erpnext/issues/37610)) ([4fc45b0](4fc45b035a))
* remove from or target warehouse for non internal transfer entries (backport [#37612](https://github.com/frappe/erpnext/issues/37612)) ([#37629](https://github.com/frappe/erpnext/issues/37629)) ([b5b5187](b5b51879ee))
v13.54.6 		2023-10-25 03:45:08 +00:00
Raffael Meyer
5669a89afe fix: wrong german translation (#37658) 
(cherry picked from commit fa5780ca81)
 2023-10-25 03:44:15 +00:00
Deepesh Garg
6e871c51ef Merge pull request #37655 from frappe/version-13-hotfix 
chore: release v13
 2023-10-25 09:13:26 +05:30
mergify[bot]
b5b51879ee fix: remove from or target warehouse for non internal transfer entries (backport #37612) (#37629) 
* fix: remove from or target warehouse for non internal transfer entries (#37612)

(cherry picked from commit 5136fe196b)

* chore: removed test cases

* chore: removed test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-24 08:41:41 +05:30
mergify[bot]
4fc45b035a fix: incorrect cost center in the purchase invoice (backport #37591) (#37610) 
* fix: incorrect cost center in the purchase invoice (#37591)

(cherry picked from commit 14b009b093)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-20 17:03:25 +05:30
Frappe PR Bot
24103554f5 chore(release): Bumped to Version 13.54.5 
## [13.54.5](https://github.com/frappe/erpnext/compare/v13.54.4...v13.54.5) (2023-10-19)

### Bug Fixes

* e-commerce permissions for address (backport [#37554](https://github.com/frappe/erpnext/issues/37554)) ([#37560](https://github.com/frappe/erpnext/issues/37560)) ([49d0ab5](49d0ab5867))
* **gp:** wrong `allocated_amount` on multi sales person invoice ([7805c3a](7805c3acf6))
* Issues related to RFQ and Supplier Quotation on Portal (backport [#37565](https://github.com/frappe/erpnext/issues/37565)) (backport [#37577](https://github.com/frappe/erpnext/issues/37577)) ([#37588](https://github.com/frappe/erpnext/issues/37588)) ([bc907b2](bc907b22d4))
* keep customer/supplier website role by default ([52aff1f](52aff1f703))
* negative valuation rate in PR return (backport [#37424](https://github.com/frappe/erpnext/issues/37424)) ([#37462](https://github.com/frappe/erpnext/issues/37462)) ([66ad823](66ad823417))
* use `flt` to ignore TypeError (backport [#37481](https://github.com/frappe/erpnext/issues/37481)) ([#37489](https://github.com/frappe/erpnext/issues/37489)) ([8b4e692](8b4e69235a))
v13.54.5 		2023-10-19 11:36:26 +00:00
Deepesh Garg
d459421175 Merge pull request #37544 from frappe/version-13-hotfix 
chore: release v13
 2023-10-19 17:04:53 +05:30
mergify[bot]
bc907b22d4 fix: Issues related to RFQ and Supplier Quotation on Portal (backport #37565) (backport #37577) (#37588) 
* fix: Issues related to RFQ and Supplier Quotation on Portal (backport #37565) (#37577)

* fix: Issues related to RFQ and Supplier Quotation on Portal (#37565)

fix: RFQ and Supplier Quotation for Portal
(cherry picked from commit 2851a41310)

* chore: removed backport changes

---------

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

# Conflicts:
#	erpnext/templates/includes/rfq.js

* chore: fix conflicts

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-19 16:39:38 +05:30
mergify[bot]
7e26449b9f chore: rewrite query using query builder (backport #37310) (#37585) 
* chore: rewrite query using query builder

(cherry picked from commit 25718f5cc7)

* chore: fix shopping cart tests

(cherry picked from commit fb51cae88b)

* chore: fix test case

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-19 15:58:45 +05:30