Merge branch 'develop' into version-12
Showing
- .mergify.yml 14 additions, 0 deletions.mergify.yml
- frappe/__init__.py 1 addition, 1 deletionfrappe/__init__.py
- frappe/core/doctype/comment/test_comment.py 2 additions, 0 deletionsfrappe/core/doctype/comment/test_comment.py
- frappe/core/doctype/doctype/doctype.py 5 additions, 3 deletionsfrappe/core/doctype/doctype/doctype.py
- frappe/core/doctype/file/file.json 1 addition, 15 deletionsfrappe/core/doctype/file/file.json
- frappe/core/doctype/file/file.py 11 additions, 40 deletionsfrappe/core/doctype/file/file.py
- frappe/core/doctype/file/test_file.py 3 additions, 10 deletionsfrappe/core/doctype/file/test_file.py
- frappe/core/doctype/prepared_report/prepared_report.json 108 additions, 443 deletionsfrappe/core/doctype/prepared_report/prepared_report.json
- frappe/core/doctype/prepared_report/prepared_report.py 23 additions, 20 deletionsfrappe/core/doctype/prepared_report/prepared_report.py
- frappe/core/doctype/role/role.py 1 addition, 1 deletionfrappe/core/doctype/role/role.py
- frappe/database/database.py 4 additions, 1 deletionfrappe/database/database.py
- frappe/desk/reportview.py 2 additions, 0 deletionsfrappe/desk/reportview.py
- frappe/email/doctype/notification/notification.py 1 addition, 3 deletionsfrappe/email/doctype/notification/notification.py
- frappe/model/base_document.py 2 additions, 2 deletionsfrappe/model/base_document.py
- frappe/permissions.py 1 addition, 1 deletionfrappe/permissions.py
- frappe/public/js/frappe/form/quick_entry.js 3 additions, 1 deletionfrappe/public/js/frappe/form/quick_entry.js
- frappe/public/js/frappe/views/file/file_view.js 1 addition, 1 deletionfrappe/public/js/frappe/views/file/file_view.js
- frappe/public/js/frappe/views/reports/report_view.js 18 additions, 14 deletionsfrappe/public/js/frappe/views/reports/report_view.js
- frappe/public/js/frappe/web_form/web_form.js 0 additions, 1 deletionfrappe/public/js/frappe/web_form/web_form.js
- frappe/public/js/frappe/web_form/web_form_list.js 8 additions, 4 deletionsfrappe/public/js/frappe/web_form/web_form_list.js
Loading
Please register or sign in to comment