Merge branch 'develop'
Showing
- frappe/__version__.py 1 addition, 1 deletionfrappe/__version__.py
- frappe/async.py 5 additions, 6 deletionsfrappe/async.py
- frappe/core/doctype/doctype/doctype.py 7 additions, 0 deletionsfrappe/core/doctype/doctype/doctype.py
- frappe/core/page/data_import_tool/importer.py 1 addition, 2 deletionsfrappe/core/page/data_import_tool/importer.py
- frappe/custom/doctype/customize_form/customize_form.js 1 addition, 0 deletionsfrappe/custom/doctype/customize_form/customize_form.js
- frappe/desk/search.py 1 addition, 0 deletionsfrappe/desk/search.py
- frappe/email/bulk.py 8 additions, 1 deletionfrappe/email/bulk.py
- frappe/handler.py 2 additions, 2 deletionsfrappe/handler.py
- frappe/hooks.py 1 addition, 1 deletionfrappe/hooks.py
- frappe/public/js/frappe/form/control.js 12 additions, 2 deletionsfrappe/public/js/frappe/form/control.js
- frappe/tasks.py 1 addition, 1 deletionfrappe/tasks.py
- frappe/tests/test_data_import.py 5 additions, 5 deletionsfrappe/tests/test_data_import.py
- frappe/workflow/doctype/workflow/workflow.js 13 additions, 11 deletionsfrappe/workflow/doctype/workflow/workflow.js
- setup.py 1 addition, 1 deletionsetup.py
Loading
Please register or sign in to comment