Today, I updated my ERPNext account and received this error. Please check for the error at the end.
Also, I appreciate, if anyone can help me in this regard.
sam@sam-VirtualBox:~/frappe-bench$ bench update
remote: Counting objects: 864, done.
remote: Compressing objects: 100% (92/92), done.
Receiving objects: 100% (864/864), 933.25 KiB | 343.00 KiB/s, done.
remote: Total 864 (delta 597), reused 563 (delta 555), pack-reused 217
Resolving deltas: 100% (689/689), completed with 289 local objects.
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript
aee558a…7a338ca develop → upstream/develop
569f2f0…f98af8a master → upstream/master
- [new tag] v6.10.4 → v6.10.4
- [new tag] v6.10.0 → v6.10.0
- [new tag] v6.10.1 → v6.10.1
- [new tag] v6.10.2 → v6.10.2
- [new tag] v6.10.3 → v6.10.3
- [new tag] v6.9.0 → v6.9.0
- [new tag] v6.9.1 → v6.9.1
- [new tag] v6.9.2 → v6.9.2
- [new tag] v6.9.3 → v6.9.3
remote: Counting objects: 8, done.
remote: Total 8 (delta 4), reused 4 (delta 4), pack-reused 4
Unpacking objects: 100% (8/8), done.
From GitHub - frappe/bench: CLI to manage Multi-tenant deployments for Frappe apps
6dc236f…995d8e7 master → origin/master - [new branch] revert-159-swap-setup → origin/revert-159-swap-setup
Updating 6dc236f…995d8e7
Fast-forward
Requirement already satisfied (use --upgrade to upgrade): Pillow in ./env/lib/python2.7/site-packages
/home/sam/frappe-bench/env/local/lib/python2.7/site-packages/pip/vendor/requests/packages/urllib3/util/ssl.py:90: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. For more information, see https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning.
InsecurePlatformWarning
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript - branch develop → FETCH_HEAD
Updating aee558a…7a338ca
Fast-forward
frappe/init.py | 2 ±
frappe/version.py | 2 ±
frappe/boot.py | 7 ±
frappe/commands.py | 2 ±
frappe/config/docs.py | 16 ±
frappe/config/setup.py | 68 ±
frappe/core/doctype/async_task/async_task.json | 13 ±
frappe/core/doctype/block_module/block_module.json | 4 ±
frappe/core/doctype/comment/comment.json | 15 ±
frappe/core/doctype/communication/communication.js | 24 -
…/core/doctype/communication/communication.json | 38 ±
frappe/core/doctype/communication/communication.py | 9 ±
frappe/core/doctype/defaultvalue/defaultvalue.json | 5 ±
frappe/core/doctype/docfield/docfield.json | 1742 ++++++++++±--------
frappe/core/doctype/docperm/docperm.json | 28 ±
frappe/core/doctype/docshare/docshare.json | 10 ±
frappe/core/doctype/doctype/doctype.json | 48 ±
frappe/core/doctype/doctype/doctype.py | 14 ±
frappe/core/doctype/file/file.json | 23 ±
frappe/core/doctype/file/file.py | 96 ±
frappe/core/doctype/file/test_file.py | 6 ±
frappe/core/doctype/module_def/module_def.json | 5 ±
frappe/core/doctype/page/page.json | 14 ±
frappe/core/doctype/page/page.py | 4 ±
frappe/core/doctype/page_role/page_role.json | 4 ±
frappe/core/doctype/patch_log/patch_log.json | 4 ±
frappe/core/doctype/report/report.json | 20 ±
frappe/core/doctype/role/role.json | 4 ±
…/core/doctype/scheduler_log/scheduler_log.json | 6 ±
frappe/core/doctype/scheduler_log/scheduler_log.py | 2 ±
frappe/core/doctype/user/user.json | 57 ±
frappe/core/doctype/user/user.py | 4 ±
frappe/core/doctype/userrole/userrole.json | 4 ±
frappe/core/doctype/version/version.json | 6 ±
frappe/core/notifications.py | 2 ±
frappe/core/page/data_import_tool/importer.py | 2 ±
…/core/page/desktop/all_applications_dialog.html | 7 ±
…/page/permission_manager/permission_manager.py | 4 ±
…/core/page/user_permissions/user_permissions.js | 7 ±
…/core/page/user_permissions/user_permissions.py | 2 ±
…/custom/doctype/custom_field/custom_field.json | 1427 +++++++±-------
…/doctype/custom_script/custom_script.json | 9 ±
…/doctype/customize_form/customize_form.py | 101 ±
…/customize_form_field/customize_form_field.json | 94 ±
…/doctype/property_setter/property_setter.json | 15 ±
frappe/data/Framework.sql | 31 ±
frappe/data/app_listing/base_vat/data.json | 11 -
frappe/data/app_listing/erpnext_shopify.json | 13 +
…/app_listing/jasper_erpnext_report/data.json | 11 -
frappe/data/app_listing/knowledge_base.json | 13 +
frappe/data/app_listing/mandrill_integration.json | 13 +
frappe/data/app_listing/poll.json | 13 +
frappe/data/languages.txt | 3 ±
frappe/desk/doctype/event/event.json | 35 ±
frappe/desk/doctype/event/event.py | 2 ±
frappe/desk/doctype/event_role/event_role.json | 4 ±
frappe/desk/doctype/feed/feed.json | 357 +±-
frappe/desk/doctype/note/note.json | 6 ±
frappe/desk/doctype/todo/todo.json | 20 ±
frappe/desk/form/assign_to.py | 28 ±
frappe/desk/form/meta.py | 2 ±
frappe/desk/moduleview.py | 8 ±
frappe/desk/page/applications/application_row.html | 10 ±
frappe/desk/page/applications/applications.css | 6 ±
frappe/desk/page/applications/applications.js | 129 ±
frappe/desk/page/applications/applications.json | 33 ±
frappe/desk/page/applications/applications.py | 67 ±
frappe/desk/page/messages/messages.py | 2 ±
frappe/desk/page/setup_wizard/setup_wizard.js | 4 ±
frappe/docs/user/tutorial/controllers.md | 2 ±
frappe/docs/user/tutorial/doctypes.md | 5 ±
frappe/docs/user/tutorial/models.md | 2 ±
frappe/docs/user/tutorial/users-and-records.md | 2 ±
frappe/email/bulk.py | 2 ±
frappe/email/doctype/bulk_email/bulk_email.json | 14 ±
…/email/doctype/email_account/email_account.json | 1642 ++++++++±--------
…/email/doctype/email_account/email_account.py | 47 ±
…/doctype/email_account/test_email_account.py | 8 +
frappe/email/doctype/email_alert/email_alert.json | 43 ±
frappe/email/doctype/email_alert/email_alert.py | 16 ±
…/email_alert_recipient.json | 6 ±
…/email_unsubscribe/email_unsubscribe.json | 7 ±
…/doctype/standard_reply/standard_reply.json | 6 ±
frappe/email/receive.py | 4 ±
frappe/email/smtp.py | 5 ±
frappe/geo/doctype/country/country.json | 7 ±
frappe/geo/doctype/currency/currency.json | 11 ±
frappe/hooks.py | 33 ±
frappe/model/base_document.py | 28 ±
frappe/model/db_schema.py | 22 ±
frappe/model/rename_doc.py | 12 ±
frappe/patches.txt | 4 ±
frappe/patches/v4_0/change_varchar_length.py | 2 ±
frappe/patches/v4_0/set_user_permissions.py | 4 ±
frappe/patches/v6_9/init.py | 0
frappe/patches/v6_9/int_float_not_null.py | 30 +
frappe/patches/v6_9/rename_burmese_language.py | 7 +
frappe/print/doctype/letter_head/letter_head.json | 6 ±
…/print/doctype/print_format/print_format.json | 27 ±
frappe/print/doctype/print_format/print_format.py | 20 ±
frappe/public/css/desk.css | 16 +
frappe/public/css/docs.css | 22 ±
frappe/public/css/navbar.css | 8 ±
frappe/public/images/ui/ajax-loader.gif | Bin 0 → 1737 bytes
frappe/public/js/frappe/form/control.js | 30 ±
frappe/public/js/frappe/form/footer/assign_to.js | 48 ±
frappe/public/js/frappe/form/grid.js | 18 ±
frappe/public/js/frappe/form/save.js | 4 ±
frappe/public/js/frappe/form/script_manager.js | 1 +
frappe/public/js/frappe/form/toolbar.js | 4 ±
frappe/public/js/frappe/list/doclistview.js | 1 +
frappe/public/js/frappe/request.js | 3 -
frappe/public/js/frappe/ui/editor.html | 2 ±
frappe/public/js/frappe/ui/field_group.js | 2 ±
frappe/public/js/frappe/ui/filters/filters.js | 2 ±
frappe/public/js/frappe/ui/messages.js | 20 +
frappe/public/js/frappe/upload.js | 16 +
frappe/public/less/desk.less | 20 +
frappe/tasks.py | 15 ±
frappe/templates/autodoc/doctype.html | 2 ±
frappe/templates/generators/web_form.html | 12 ±
frappe/templates/includes/comments/comments.py | 2 ±
frappe/translations/ar.csv | 314 +±-
frappe/translations/bg.csv | 314 +±-
frappe/translations/bn.csv | 338 +±-
frappe/translations/bs.csv | 314 +±-
frappe/translations/ca.csv | 314 +±-
frappe/translations/cs.csv | 314 +±-
frappe/translations/da-DK.csv | 262 +±
frappe/translations/da.csv | 314 +±-
frappe/translations/de.csv | 394 +±–
frappe/translations/el.csv | 314 +±-
frappe/translations/es-PE.csv | 262 +±
frappe/translations/es.csv | 356 +±-
frappe/translations/fa.csv | 314 +±-
frappe/translations/fi.csv | 314 +±-
frappe/translations/fr.csv | 314 +±-
frappe/translations/he.csv | 299 +±-
frappe/translations/hi.csv | 314 +±-
frappe/translations/hr.csv | 320 +±-
frappe/translations/hu.csv | 314 +±-
frappe/translations/id.csv | 314 +±-
frappe/translations/it.csv | 314 +±-
frappe/translations/ja.csv | 314 +±-
frappe/translations/km.csv | 199 ±-
frappe/translations/kn.csv | 314 +±-
frappe/translations/ko.csv | 314 +±-
frappe/translations/lv.csv | 314 +±-
frappe/translations/mk.csv | 314 +±-
frappe/translations/mr.csv | 314 +±-
frappe/translations/ms.csv | 1742 ++++++++++++++++++++
frappe/translations/my.csv | 314 +±-
frappe/translations/nl.csv | 318 +±-
frappe/translations/no.csv | 314 +±-
frappe/translations/pl.csv | 314 +±-
frappe/translations/pt-BR.csv | 317 +±-
frappe/translations/pt.csv | 314 +±-
frappe/translations/ro.csv | 314 +±-
frappe/translations/ru.csv | 314 +±-
frappe/translations/sk.csv | 370 ++±-
frappe/translations/sl.csv | 318 +±-
frappe/translations/sq.csv | 314 +±-
frappe/translations/sr.csv | 312 +±-
frappe/translations/sv.csv | 314 +±-
frappe/translations/ta.csv | 314 +±-
frappe/translations/th.csv | 314 +±-
frappe/translations/tr.csv | 314 +±-
frappe/translations/uk.csv | 314 +±-
frappe/translations/vi.csv | 314 +±-
frappe/translations/zh-cn.csv | 320 +±-
frappe/translations/zh-tw.csv | 329 +±-
frappe/utils/file_manager.py | 5 ±
frappe/utils/formatters.py | 4 +
frappe/utils/setup_docs.py | 3 ±
…/about_us_team_member/about_us_team_member.json | 6 ±
…/doctype/blog_category/blog_category.json | 8 ±
frappe/website/doctype/blog_post/blog_post.json | 14 ±
frappe/website/doctype/blog_post/blog_post.py | 4 ±
frappe/website/doctype/blogger/blogger.json | 9 ±
…/doctype/company_history/company_history.json | 5 ±
…/website/doctype/top_bar_item/top_bar_item.json | 10 ±
frappe/website/doctype/web_form/web_form.js | 3 ±
frappe/website/doctype/web_form/web_form.json | 902 ++++±----
frappe/website/doctype/web_form/web_form.py | 45 +
…/doctype/web_form_field/web_form_field.json | 20 ±
frappe/website/doctype/web_page/web_page.json | 29 ±
…/website_slideshow/website_slideshow.json | 6 ±
…/website_slideshow_item.json | 5 ±
…/website/doctype/website_theme/website_theme.js | 7 ±
…/doctype/website_theme/website_theme.json | 31 ±
frappe/website/js/website.js | 6 -
frappe/website/router.py | 2 ±
frappe/workflow/doctype/workflow/workflow.json | 11 ±
…/doctype/workflow_action/workflow_action.json | 4 ±
…/workflow_document_state.json | 11 ±
…/doctype/workflow_state/workflow_state.json | 10 ±
…/workflow_transition/workflow_transition.json | 7 ±
setup.py | 2 ±
198 files changed, 14533 insertions(+), 10523 deletions(-)
delete mode 100644 frappe/data/app_listing/base_vat/data.json
create mode 100644 frappe/data/app_listing/erpnext_shopify.json
delete mode 100644 frappe/data/app_listing/jasper_erpnext_report/data.json
create mode 100644 frappe/data/app_listing/knowledge_base.json
create mode 100644 frappe/data/app_listing/mandrill_integration.json
create mode 100644 frappe/data/app_listing/poll.json
create mode 100644 frappe/patches/v6_9/init.py
create mode 100644 frappe/patches/v6_9/int_float_not_null.py
create mode 100644 frappe/patches/v6_9/rename_burmese_language.py
create mode 100644 frappe/public/images/ui/ajax-loader.gif
create mode 100644 frappe/translations/ms.csv
remote: Counting objects: 1133, done.
remote: Compressing objects: 100% (35/35), done.
remote: Total 1133 (delta 873), reused 866 (delta 866), pack-reused 232
Receiving objects: 100% (1133/1133), 3.00 MiB | 799.00 KiB/s, done.
Resolving deltas: 100% (971/971), completed with 557 local objects.
From GitHub - frappe/erpnext: Free and Open Source Enterprise Resource Planning (ERP) - branch develop → FETCH_HEAD
d962d1c…3f10e0b develop → upstream/develop
Updating d962d1c…3f10e0b
error: Your local changes to the following files would be overwritten by merge:
erpnext/hr/print_format/offer_letter/offer_letter.json
Please, commit your changes or stash them before you can merge.
Aborting
Traceback (most recent call last):
File “/usr/local/bin/bench”, line 9, in
load_entry_point(‘bench==0.92’, ‘console_scripts’, ‘bench’)()
File “/home/sam/bench-repo/bench/cli.py”, line 60, in cli
bench()
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 700, in call
return self.main(*args, **kwargs)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 680, in main
rv = self.invoke(ctx)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 1027, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 873, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 508, in invoke
return callback(*args, **kwargs)
File “/home/sam/bench-repo/bench/cli.py”, line 240, in _update
update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force)
File “/home/sam/bench-repo/bench/cli.py”, line 259, in update
pull_all_apps(bench=bench_path)
File “/home/sam/bench-repo/bench/app.py”, line 88, in pull_all_apps
exec_cmd(“git pull {rebase} upstream {branch}”.format(rebase=rebase, branch=get_current_branch(app, bench=bench)), cwd=app_dir)
File “/home/sam/bench-repo/bench/utils.py”, line 104, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull upstream develop
sam@sam-VirtualBox:~/frappe-bench$