Bench Update Error New - bench.utils.CommandFailedError: git pull

aafpl@ubuntu:/home/frappe/frappe-bench$ sudo bench update
INFO:bench.utils:updating bench
Updating 44013a4..1c4385b
error: Your local changes to the following files would be overwritten by merge:
        bench/config/nginx.py
        bench/config/templates/nginx.conf
        playbooks/develop/centos.yml
        playbooks/develop/create_user.yml
        playbooks/develop/includes/setup_mariadb.yml
        playbooks/develop/ubuntu.yml
        requirements.txt
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 <module>
    load_entry_point('bench', 'console_scripts', 'bench')()
  File "/home/frappe/.bench/bench/cli.py", line 40, in cli
    bench_command()
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 716, in __call__
    return self.main(*args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 696, in main
    rv = self.invoke(ctx)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 1060, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 889, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 534, in invoke
    return callback(*args, **kwargs)
  File "/home/frappe/.bench/bench/commands/update.py", line 34, in update
    update_bench()
  File "/home/frappe/.bench/bench/utils.py", line 190, in update_bench
    exec_cmd("git pull", cwd=cwd)
  File "/home/frappe/.bench/bench/utils.py", line 90, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull
aafpl@ubuntu:/home/frappe/frappe-bench$

Note to @Ashish_Dhingra, Please include error log in code block.

Hi it seems you have some changes in your .bench folder, unless you meant to make those changes, you will have to run the following commands to fix this :

cd ~/.bench
git reset --hard
git pull

Also you should not run bench update as with sudo.

3 Likes

Its giving error of permission denied if we are using it without SUDO

Again the same error as below

 aafpl@ubuntu:/home/frappe/frappe-bench$ sudo bench update
INFO:bench.utils:updating bench
Updating 44013a4..1c4385b
error: Your local changes to the following files would be overwritten by merge:
        bench/config/nginx.py
        bench/config/templates/nginx.conf
        playbooks/develop/centos.yml
        playbooks/develop/create_user.yml
        playbooks/develop/includes/setup_mariadb.yml
        playbooks/develop/ubuntu.yml
        requirements.txt
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 <module>
    load_entry_point('bench', 'console_scripts', 'bench')()
  File "/home/frappe/.bench/bench/cli.py", line 40, in cli
    bench_command()
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 716, in __call__
    return self.main(*args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 696, in main
    rv = self.invoke(ctx)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 1060, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 889, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 534, in invoke
    return callback(*args, **kwargs)
  File "/home/frappe/.bench/bench/commands/update.py", line 34, in update
    update_bench()
  File "/home/frappe/.bench/bench/utils.py", line 190, in update_bench
    exec_cmd("git pull", cwd=cwd)
  File "/home/frappe/.bench/bench/utils.py", line 90, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull
aafpl@ubuntu:/home/frappe/frappe-bench$

What output did you get when you ran my commands?

aafpl@ubuntu:/home/frappe/frappe-bench/apps/erpnext$ sudo git reset --hard
HEAD is now at 3e001b5 Merge branch 'develop'
aafpl@ubuntu:/home/frappe/frappe-bench/apps/erpnext$ sudo git pull
remote: Counting objects: 583, done.
remote: Compressing objects: 100% (437/437), done.
remote: Total 583 (delta 187), reused 541 (delta 145), pack-reused 0
Receiving objects: 100% (583/583), 733.60 KiB | 49.00 KiB/s, done.
Resolving deltas: 100% (187/187), completed with 72 local objects.
From https://github.com/frappe/erpnext
   3e001b5..1e3e686  master     -> upstream/master
 * [new tag]         4.0.0      -> 4.0.0
 * [new tag]         4.0.0-beta1 -> 4.0.0-beta1
 * [new tag]         v3.1.0     -> v3.1.0
 * [new tag]         v3.1.1     -> v3.1.1
 * [new tag]         v3.1.2     -> v3.1.2
 * [new tag]         v3.2.0     -> v3.2.0
 * [new tag]         v3.2.1     -> v3.2.1
 * [new tag]         v3.2.2     -> v3.2.2
 * [new tag]         v3.2.3     -> v3.2.3
 * [new tag]         v3.3.0     -> v3.3.0
 * [new tag]         v3.3.1     -> v3.3.1
 * [new tag]         v3.3.2     -> v3.3.2
 * [new tag]         v3.3.3     -> v3.3.3
 * [new tag]         v3.3.4     -> v3.3.4
 * [new tag]         v3.3.5     -> v3.3.5
 * [new tag]         v3.3.6     -> v3.3.6
 * [new tag]         v3.3.7     -> v3.3.7
 * [new tag]         v3.3.8     -> v3.3.8
 * [new tag]         v3.4.0     -> v3.4.0
 * [new tag]         v3.4.1     -> v3.4.1
 * [new tag]         v3.4.2     -> v3.4.2
 * [new tag]         v3.4.3     -> v3.4.3
 * [new tag]         v3.4.4     -> v3.4.4
 * [new tag]         v3.4.5     -> v3.4.5
 * [new tag]         v3.4.6     -> v3.4.6
 * [new tag]         v3.4.7     -> v3.4.7
 * [new tag]         v3.4.8     -> v3.4.8
 * [new tag]         v3.4.9     -> v3.4.9
 * [new tag]         v3.5.0     -> v3.5.0
 * [new tag]         v3.5.1     -> v3.5.1
 * [new tag]         v3.6.0     -> v3.6.0
 * [new tag]         v3.6.1     -> v3.6.1
 * [new tag]         v3.6.2     -> v3.6.2
 * [new tag]         v3.6.3     -> v3.6.3
 * [new tag]         v3.6.4     -> v3.6.4
 * [new tag]         v3.6.5     -> v3.6.5
 * [new tag]         v3.6.6     -> v3.6.6
 * [new tag]         v3.7.0     -> v3.7.0
 * [new tag]         v3.7.1     -> v3.7.1
 * [new tag]         v3.8.0     -> v3.8.0
 * [new tag]         v3.8.1     -> v3.8.1
 * [new tag]         v3.8.2     -> v3.8.2
 * [new tag]         v3.8.3     -> v3.8.3
 * [new tag]         v3.8.4     -> v3.8.4
 * [new tag]         v3.8.5     -> v3.8.5
 * [new tag]         v3.8.6     -> v3.8.6
 * [new tag]         v4-beta2   -> v4-beta2
 * [new tag]         v4.0.1     -> v4.0.1
 * [new tag]         v4.10.0    -> v4.10.0
 * [new tag]         v4.11.0    -> v4.11.0
 * [new tag]         v4.11.1    -> v4.11.1
 * [new tag]         v4.11.2    -> v4.11.2
 * [new tag]         v4.12.0    -> v4.12.0
 * [new tag]         v4.13.0    -> v4.13.0
 * [new tag]         v4.13.1    -> v4.13.1
 * [new tag]         v4.14.0    -> v4.14.0
 * [new tag]         v4.15.0    -> v4.15.0
 * [new tag]         v4.15.1    -> v4.15.1
 * [new tag]         v4.15.2    -> v4.15.2
 * [new tag]         v4.15.3    -> v4.15.3
 * [new tag]         v4.15.4    -> v4.15.4
 * [new tag]         v4.16.0    -> v4.16.0
 * [new tag]         v4.17.0    -> v4.17.0
 * [new tag]         v4.18.0    -> v4.18.0
 * [new tag]         v4.18.1    -> v4.18.1
 * [new tag]         v4.19.0    -> v4.19.0
 * [new tag]         v4.20.0    -> v4.20.0
 * [new tag]         v4.20.1    -> v4.20.1
 * [new tag]         v4.20.2    -> v4.20.2
 * [new tag]         v4.21.0    -> v4.21.0
 * [new tag]         v4.21.1    -> v4.21.1
 * [new tag]         v4.21.2    -> v4.21.2
 * [new tag]         v4.21.3    -> v4.21.3
 * [new tag]         v4.21.4    -> v4.21.4
 * [new tag]         v4.22.0    -> v4.22.0
 * [new tag]         v4.22.1    -> v4.22.1
 * [new tag]         v4.22.2    -> v4.22.2
 * [new tag]         v4.23.0    -> v4.23.0
 * [new tag]         v4.24.0    -> v4.24.0
 * [new tag]         v4.24.1    -> v4.24.1
 * [new tag]         v4.24.2    -> v4.24.2
 * [new tag]         v4.24.3    -> v4.24.3
 * [new tag]         v4.24.4    -> v4.24.4
 * [new tag]         v4.25.0    -> v4.25.0
 * [new tag]         v4.25.1    -> v4.25.1
 * [new tag]         v4.25.2    -> v4.25.2
 * [new tag]         v4.25.3    -> v4.25.3
 * [new tag]         v4.25.4    -> v4.25.4
 * [new tag]         v4.25.5    -> v4.25.5
 * [new tag]         v4.25.6    -> v4.25.6
 * [new tag]         v4.25.7    -> v4.25.7
 * [new tag]         v4.3.0     -> v4.3.0
 * [new tag]         v4.4.0     -> v4.4.0
 * [new tag]         v4.4.1     -> v4.4.1
 * [new tag]         v4.4.2     -> v4.4.2
 * [new tag]         v4.5.0     -> v4.5.0
 * [new tag]         v4.5.1     -> v4.5.1
 * [new tag]         v4.5.2     -> v4.5.2
 * [new tag]         v4.6.0     -> v4.6.0
 * [new tag]         v4.6.1     -> v4.6.1
 * [new tag]         v4.6.2     -> v4.6.2
 * [new tag]         v4.7.0     -> v4.7.0
 * [new tag]         v4.7.1     -> v4.7.1
 * [new tag]         v4.7.2     -> v4.7.2
 * [new tag]         v4.8.0     -> v4.8.0
 * [new tag]         v4.9.0     -> v4.9.0
 * [new tag]         v4.9.1     -> v4.9.1
 * [new tag]         v4.9.2     -> v4.9.2
 * [new tag]         v4.9.3     -> v4.9.3
 * [new tag]         v5.0.0     -> v5.0.0
 * [new tag]         v5.0.1     -> v5.0.1
 * [new tag]         v5.0.10    -> v5.0.10
 * [new tag]         v5.0.11    -> v5.0.11
 * [new tag]         v5.0.12    -> v5.0.12
 * [new tag]         v5.0.13    -> v5.0.13
 * [new tag]         v5.0.14    -> v5.0.14
 * [new tag]         v5.0.15    -> v5.0.15
 * [new tag]         v5.0.16    -> v5.0.16
 * [new tag]         v5.0.17    -> v5.0.17
 * [new tag]         v5.0.18    -> v5.0.18
 * [new tag]         v5.0.19    -> v5.0.19
 * [new tag]         v5.0.2     -> v5.0.2
 * [new tag]         v5.0.20    -> v5.0.20
 * [new tag]         v5.0.21    -> v5.0.21
 * [new tag]         v5.0.22    -> v5.0.22
 * [new tag]         v5.0.23    -> v5.0.23
 * [new tag]         v5.0.24    -> v5.0.24
 * [new tag]         v5.0.25    -> v5.0.25
 * [new tag]         v5.0.26    -> v5.0.26
 * [new tag]         v5.0.27    -> v5.0.27
 * [new tag]         v5.0.28    -> v5.0.28
 * [new tag]         v5.0.29    -> v5.0.29
 * [new tag]         v5.0.3     -> v5.0.3
 * [new tag]         v5.0.4     -> v5.0.4
 * [new tag]         v5.0.5     -> v5.0.5
 * [new tag]         v5.0.6     -> v5.0.6
 * [new tag]         v5.0.7     -> v5.0.7
 * [new tag]         v5.0.8     -> v5.0.8
 * [new tag]         v5.0.9     -> v5.0.9
 * [new tag]         v5.1.0     -> v5.1.0
 * [new tag]         v5.1.1     -> v5.1.1
 * [new tag]         v5.1.2     -> v5.1.2
 * [new tag]         v5.1.3     -> v5.1.3
 * [new tag]         v5.1.4     -> v5.1.4
 * [new tag]         v5.1.5     -> v5.1.5
 * [new tag]         v5.1.6     -> v5.1.6
 * [new tag]         v5.2.0     -> v5.2.0
 * [new tag]         v5.2.1     -> v5.2.1
 * [new tag]         v5.3.0     -> v5.3.0
 * [new tag]         v5.3.1     -> v5.3.1
 * [new tag]         v5.4.0     -> v5.4.0
 * [new tag]         v5.4.1     -> v5.4.1
 * [new tag]         v5.4.2     -> v5.4.2
 * [new tag]         v5.5.0     -> v5.5.0
 * [new tag]         v5.5.1     -> v5.5.1
 * [new tag]         v5.6.0     -> v5.6.0
 * [new tag]         v5.6.1     -> v5.6.1
 * [new tag]         v5.6.2     -> v5.6.2
 * [new tag]         v5.6.3     -> v5.6.3
 * [new tag]         v5.6.4     -> v5.6.4
 * [new tag]         v5.7.0     -> v5.7.0
 * [new tag]         v5.7.1     -> v5.7.1
 * [new tag]         v5.7.2     -> v5.7.2
 * [new tag]         v5.7.3     -> v5.7.3
 * [new tag]         v5.7.4     -> v5.7.4
 * [new tag]         v5.7.5     -> v5.7.5
 * [new tag]         v5.7.6     -> v5.7.6
 * [new tag]         v5.7.7     -> v5.7.7
 * [new tag]         v5.8.0     -> v5.8.0
 * [new tag]         v5.8.1     -> v5.8.1
 * [new tag]         v5.8.2     -> v5.8.2
 * [new tag]         v6.0.0     -> v6.0.0
 * [new tag]         v6.0.1     -> v6.0.1
 * [new tag]         v6.1.0     -> v6.1.0
 * [new tag]         v6.1.1     -> v6.1.1
 * [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.11.0    -> v6.11.0
 * [new tag]         v6.11.1    -> v6.11.1
 * [new tag]         v6.11.2    -> v6.11.2
 * [new tag]         v6.11.3    -> v6.11.3
 * [new tag]         v6.12.0    -> v6.12.0
 * [new tag]         v6.12.1    -> v6.12.1
 * [new tag]         v6.12.10   -> v6.12.10
 * [new tag]         v6.12.11   -> v6.12.11
 * [new tag]         v6.12.2    -> v6.12.2
 * [new tag]         v6.12.3    -> v6.12.3
 * [new tag]         v6.12.4    -> v6.12.4
 * [new tag]         v6.12.5    -> v6.12.5
 * [new tag]         v6.12.6    -> v6.12.6
 * [new tag]         v6.12.7    -> v6.12.7
 * [new tag]         v6.12.8    -> v6.12.8
 * [new tag]         v6.12.9    -> v6.12.9
 * [new tag]         v6.13.0    -> v6.13.0
 * [new tag]         v6.13.1    -> v6.13.1
 * [new tag]         v6.14.0    -> v6.14.0
 * [new tag]         v6.14.1    -> v6.14.1
 * [new tag]         v6.15.0    -> v6.15.0
 * [new tag]         v6.15.1    -> v6.15.1
 * [new tag]         v6.16.0    -> v6.16.0
 * [new tag]         v6.16.1    -> v6.16.1
 * [new tag]         v6.16.2    -> v6.16.2
 * [new tag]         v6.16.3    -> v6.16.3
 * [new tag]         v6.16.4    -> v6.16.4
 * [new tag]         v6.17.0    -> v6.17.0
 * [new tag]         v6.18.0    -> v6.18.0
 * [new tag]         v6.18.1    -> v6.18.1
 * [new tag]         v6.18.2    -> v6.18.2
 * [new tag]         v6.18.3    -> v6.18.3
 * [new tag]         v6.18.4    -> v6.18.4
 * [new tag]         v6.19.0    -> v6.19.0
 * [new tag]         v6.2.0     -> v6.2.0
 * [new tag]         v6.2.1     -> v6.2.1
 * [new tag]         v6.20.0    -> v6.20.0
 * [new tag]         v6.21.0    -> v6.21.0
 * [new tag]         v6.21.1    -> v6.21.1
 * [new tag]         v6.21.2    -> v6.21.2
 * [new tag]         v6.21.3    -> v6.21.3
 * [new tag]         v6.21.4    -> v6.21.4
 * [new tag]         v6.21.5    -> v6.21.5
 * [new tag]         v6.21.6    -> v6.21.6
 * [new tag]         v6.22.0    -> v6.22.0
 * [new tag]         v6.22.1    -> v6.22.1
 * [new tag]         v6.23.0    -> v6.23.0
 * [new tag]         v6.23.1    -> v6.23.1
 * [new tag]         v6.23.2    -> v6.23.2
 * [new tag]         v6.23.3    -> v6.23.3
 * [new tag]         v6.23.4    -> v6.23.4
 * [new tag]         v6.23.5    -> v6.23.5
 * [new tag]         v6.23.6    -> v6.23.6
 * [new tag]         v6.23.7    -> v6.23.7
 * [new tag]         v6.24.0    -> v6.24.0
 * [new tag]         v6.24.1    -> v6.24.1
 * [new tag]         v6.24.2    -> v6.24.2
 * [new tag]         v6.24.3    -> v6.24.3
 * [new tag]         v6.24.4    -> v6.24.4
 * [new tag]         v6.24.5    -> v6.24.5
 * [new tag]         v6.25.0    -> v6.25.0
 * [new tag]         v6.25.1    -> v6.25.1
 * [new tag]         v6.25.2    -> v6.25.2
 * [new tag]         v6.25.3    -> v6.25.3
 * [new tag]         v6.25.4    -> v6.25.4
 * [new tag]         v6.25.5    -> v6.25.5
 * [new tag]         v6.26.0    -> v6.26.0
 * [new tag]         v6.27.0    -> v6.27.0
 * [new tag]         v6.27.1    -> v6.27.1
 * [new tag]         v6.27.10   -> v6.27.10
 * [new tag]         v6.27.11   -> v6.27.11
 * [new tag]         v6.27.12   -> v6.27.12
 * [new tag]         v6.27.13   -> v6.27.13
 * [new tag]         v6.27.14   -> v6.27.14
 * [new tag]         v6.27.15   -> v6.27.15
 * [new tag]         v6.27.16   -> v6.27.16
 * [new tag]         v6.27.17   -> v6.27.17
 * [new tag]         v6.27.18   -> v6.27.18
 * [new tag]         v6.27.19   -> v6.27.19
 * [new tag]         v6.27.2    -> v6.27.2
 * [new tag]         v6.27.20   -> v6.27.20
 * [new tag]         v6.27.21   -> v6.27.21
 * [new tag]         v6.27.22   -> v6.27.22
 * [new tag]         v6.27.23   -> v6.27.23
 * [new tag]         v6.27.24   -> v6.27.24
 * [new tag]         v6.27.25   -> v6.27.25
 * [new tag]         v6.27.26   -> v6.27.26
 * [new tag]         v6.27.3    -> v6.27.3
 * [new tag]         v6.27.4    -> v6.27.4
 * [new tag]         v6.27.5    -> v6.27.5
 * [new tag]         v6.27.6    -> v6.27.6
 * [new tag]         v6.27.7    -> v6.27.7
 * [new tag]         v6.27.8    -> v6.27.8
 * [new tag]         v6.27.9    -> v6.27.9
 * [new tag]         v6.3.0     -> v6.3.0
 * [new tag]         v6.3.1     -> v6.3.1
 * [new tag]         v6.3.2     -> v6.3.2
 * [new tag]         v6.4.0     -> v6.4.0
 * [new tag]         v6.4.1     -> v6.4.1
 * [new tag]         v6.4.2     -> v6.4.2
 * [new tag]         v6.4.3     -> v6.4.3
 * [new tag]         v6.4.4     -> v6.4.4
 * [new tag]         v6.4.5     -> v6.4.5
 * [new tag]         v6.4.6     -> v6.4.6
 * [new tag]         v6.4.7     -> v6.4.7
 * [new tag]         v6.5.0     -> v6.5.0
 * [new tag]         v6.5.1     -> v6.5.1
 * [new tag]         v6.5.2     -> v6.5.2
 * [new tag]         v6.5.3     -> v6.5.3
 * [new tag]         v6.6.0     -> v6.6.0
 * [new tag]         v6.6.1     -> v6.6.1
 * [new tag]         v6.6.2     -> v6.6.2
 * [new tag]         v6.6.3     -> v6.6.3
 * [new tag]         v6.6.4     -> v6.6.4
 * [new tag]         v6.6.5     -> v6.6.5
 * [new tag]         v6.6.6     -> v6.6.6
 * [new tag]         v6.6.7     -> v6.6.7
 * [new tag]         v6.7.0     -> v6.7.0
 * [new tag]         v6.7.1     -> v6.7.1
 * [new tag]         v6.7.2     -> v6.7.2
 * [new tag]         v6.7.3     -> v6.7.3
 * [new tag]         v6.7.4     -> v6.7.4
 * [new tag]         v6.7.5     -> v6.7.5
 * [new tag]         v6.7.6     -> v6.7.6
 * [new tag]         v6.7.7     -> v6.7.7
 * [new tag]         v6.7.8     -> v6.7.8
 * [new tag]         v6.8.0     -> v6.8.0
 * [new tag]         v6.8.1     -> v6.8.1
 * [new tag]         v6.8.2     -> v6.8.2
 * [new tag]         v6.8.3     -> v6.8.3
 * [new tag]         v6.8.4     -> v6.8.4
 * [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]         v7.0.0     -> v7.0.0
 * [new tag]         v7.0.1     -> v7.0.1
 * [new tag]         v7.0.10    -> v7.0.10
 * [new tag]         v7.0.11    -> v7.0.11
 * [new tag]         v7.0.16    -> v7.0.16
 * [new tag]         v7.0.2     -> v7.0.2
 * [new tag]         v7.0.3     -> v7.0.3
 * [new tag]         v7.0.4     -> v7.0.4
 * [new tag]         v7.0.6     -> v7.0.6
 * [new tag]         v7.0.7     -> v7.0.7
 * [new tag]         v7.0.8     -> v7.0.8
 * [new tag]         v7.0.9     -> v7.0.9
 * [new tag]         v7.0.12    -> v7.0.12
 * [new tag]         v7.0.13    -> v7.0.13
 * [new tag]         v7.0.14    -> v7.0.14
 * [new tag]         v7.0.15    -> v7.0.15
Updating 3e001b5..1e3e686
Fast-forward
 erpnext/__init__.py                                |   2 +-
 erpnext/accounts/doctype/sales_invoice/pos.py      |   4 +-
 erpnext/accounts/page/pos/pos.js                   |   8 +-
 .../quality_inspection/quality_inspection.json     |  56 ++++-
 erpnext/config/schools.py                          |   4 +
 erpnext/crm/doctype/opportunity/opportunity.py     |   5 +-
 erpnext/demo/user/stock.py                         |  27 +++
 erpnext/docs/assets/img/accounts/asset-item.png    | Bin 0 -> 69685 bytes
 erpnext/docs/assets/img/accounts/pos-customer.png  | Bin 0 -> 45722 bytes
 erpnext/docs/assets/img/accounts/pos-item.png      | Bin 0 -> 146829 bytes
 erpnext/docs/assets/img/accounts/pos-payment.png   | Bin 0 -> 47045 bytes
 erpnext/docs/assets/img/setup/print/cheque-1.png   | Bin 0 -> 15937 bytes
 erpnext/docs/assets/img/setup/print/cheque-2.png   | Bin 0 -> 61849 bytes
 erpnext/docs/assets/img/setup/print/cheque-3.png   | Bin 0 -> 49342 bytes
 erpnext/docs/assets/img/setup/print/cheque-4.png   | Bin 0 -> 122304 bytes
 erpnext/docs/assets/img/setup/print/cheque-5.gif   | Bin 0 -> 149055 bytes
 .../docs/assets/img/setup/print/sample-cheque.jpg  | Bin 0 -> 30366 bytes
 .../assets/old_images/erpnext/pos-add-item.png     | Bin 101600 -> 0 bytes
 .../assets/old_images/erpnext/pos-make-payment.png | Bin 71369 -> 0 bytes
 .../assets/old_images/erpnext/pos-remove-item.png  | Bin 111247 -> 0 bytes
 .../manual/en/accounts/managing-fixed-assets.md    |  35 +--
 .../en/accounts/point-of-sale-pos-invoice.md       |  54 ++---
 .../en/setting-up/print/cheque-print-template.md   |  45 ++++
 .../docs/user/manual/en/setting-up/print/index.txt |   1 +
 erpnext/hr/doctype/deduction_type/README.md        |   3 -
 erpnext/hr/doctype/deduction_type/__init__.py      |   1 -
 .../hr/doctype/deduction_type/deduction_type.json  | 110 ----------
 .../hr/doctype/deduction_type/deduction_type.py    |  10 -
 .../doctype/deduction_type/test_deduction_type.py  |   7 -
 .../hr/doctype/deduction_type/test_records.json    |  10 -
 erpnext/hr/doctype/department/department.json      |  23 +-
 erpnext/hr/doctype/earning_type/README.md          |   3 -
 erpnext/hr/doctype/earning_type/__init__.py        |   1 -
 erpnext/hr/doctype/earning_type/earning_type.json  | 110 ----------
 erpnext/hr/doctype/earning_type/earning_type.py    |  10 -
 .../hr/doctype/earning_type/test_earning_type.py   |   7 -
 erpnext/hr/doctype/earning_type/test_records.json  |  12 --
 erpnext/hr/doctype/interest/__init__.py            |   0
 .../earning_type.js => interest/interest.js}       |   2 +-
 erpnext/hr/doctype/interest/interest.json          | 144 +++++++++++++
 erpnext/hr/doctype/interest/interest.py            |  10 +
 erpnext/hr/doctype/interest/test_interest.py       |  12 ++
 erpnext/hr/doctype/salary_slip/salary_slip.py      |   3 +-
 erpnext/hr/doctype/salary_slip_deduction/README.md |   5 -
 .../hr/doctype/salary_slip_deduction/__init__.py   |   1 -
 .../salary_slip_deduction.json                     | 140 ------------
 .../salary_slip_deduction/salary_slip_deduction.py |  10 -
 erpnext/hr/doctype/salary_slip_earning/README.md   |   6 -
 erpnext/hr/doctype/salary_slip_earning/__init__.py |   1 -
 .../salary_slip_earning/salary_slip_earning.json   | 140 ------------
 .../salary_slip_earning/salary_slip_earning.py     |  10 -
 .../doctype/salary_structure_deduction/README.md   |   1 -
 .../doctype/salary_structure_deduction/__init__.py |   1 -
 .../salary_structure_deduction.json                | 116 ----------
 .../salary_structure_deduction.py                  |  10 -
 .../hr/doctype/salary_structure_earning/README.md  |   1 -
 .../doctype/salary_structure_earning/__init__.py   |   1 -
 .../salary_structure_earning.json                  | 116 ----------
 .../salary_structure_earning.py                    |  10 -
 erpnext/patches.txt                                |   7 +-
 .../v6_20x/remove_customer_supplier_roles.py       |   5 +
 erpnext/patches/v7_0/make_guardian.py              |  24 +++
 .../v7_0/remove_old_earning_deduction_doctypes.py  |  16 ++
 .../v7_0/update_refdoc_in_landed_cost_voucher.py   |  15 ++
 erpnext/projects/doctype/timesheet/timesheet.js    |   1 -
 erpnext/public/js/controllers/taxes_and_totals.js  |   2 +-
 erpnext/public/js/payment/payments.js              |  20 +-
 erpnext/public/js/utils.js                         |   4 +-
 erpnext/schools/doctype/guardian/__init__.py       |   0
 .../doctype/guardian/guardian.js}                  |   2 +-
 erpnext/schools/doctype/guardian/guardian.json     | 211 ++++++++++++++++++
 erpnext/schools/doctype/guardian/guardian.py       |  10 +
 erpnext/schools/doctype/guardian/test_guardian.py  |  12 ++
 .../schools/doctype/guardian_interest/__init__.py  |   0
 .../guardian_interest/guardian_interest.json       |  63 ++++++
 .../doctype/guardian_interest/guardian_interest.py |  10 +
 erpnext/schools/doctype/student/student.json       | 188 ++++------------
 .../schools/doctype/student/student_dashboard.py   |   4 +-
 erpnext/schools/doctype/student_log/__init__.py    |   0
 erpnext/schools/doctype/student_log/student_log.js |   8 +
 .../schools/doctype/student_log/student_log.json   | 236 +++++++++++++++++++++
 erpnext/schools/doctype/student_log/student_log.py |  10 +
 .../doctype/student_log/test_student_log.py        |  12 ++
 .../doctype/company/fixtures/india/__init__.py     |   6 +-
 erpnext/setup/setup_wizard/install_fixtures.py     |  10 +-
 85 files changed, 1083 insertions(+), 1081 deletions(-)
 create mode 100644 erpnext/docs/assets/img/accounts/asset-item.png
 create mode 100644 erpnext/docs/assets/img/accounts/pos-customer.png
 create mode 100644 erpnext/docs/assets/img/accounts/pos-item.png
 create mode 100644 erpnext/docs/assets/img/accounts/pos-payment.png
 create mode 100644 erpnext/docs/assets/img/setup/print/cheque-1.png
 create mode 100644 erpnext/docs/assets/img/setup/print/cheque-2.png
 create mode 100644 erpnext/docs/assets/img/setup/print/cheque-3.png
 create mode 100644 erpnext/docs/assets/img/setup/print/cheque-4.png
 create mode 100644 erpnext/docs/assets/img/setup/print/cheque-5.gif
 create mode 100644 erpnext/docs/assets/img/setup/print/sample-cheque.jpg
 delete mode 100644 erpnext/docs/assets/old_images/erpnext/pos-add-item.png
 delete mode 100644 erpnext/docs/assets/old_images/erpnext/pos-make-payment.png
 delete mode 100644 erpnext/docs/assets/old_images/erpnext/pos-remove-item.png
 create mode 100644 erpnext/docs/user/manual/en/setting-up/print/cheque-print-te                                                                                        mplate.md
 delete mode 100644 erpnext/hr/doctype/deduction_type/README.md
 delete mode 100644 erpnext/hr/doctype/deduction_type/__init__.py
 delete mode 100644 erpnext/hr/doctype/deduction_type/deduction_type.json
 delete mode 100644 erpnext/hr/doctype/deduction_type/deduction_type.py
 delete mode 100644 erpnext/hr/doctype/deduction_type/test_deduction_type.py
 delete mode 100644 erpnext/hr/doctype/deduction_type/test_records.json
 delete mode 100644 erpnext/hr/doctype/earning_type/README.md
 delete mode 100644 erpnext/hr/doctype/earning_type/__init__.py
 delete mode 100644 erpnext/hr/doctype/earning_type/earning_type.json
 delete mode 100644 erpnext/hr/doctype/earning_type/earning_type.py
 delete mode 100644 erpnext/hr/doctype/earning_type/test_earning_type.py
 delete mode 100644 erpnext/hr/doctype/earning_type/test_records.json
 create mode 100644 erpnext/hr/doctype/interest/__init__.py
 rename erpnext/hr/doctype/{earning_type/earning_type.js => interest/interest.js                                                                                        } (81%)
 create mode 100644 erpnext/hr/doctype/interest/interest.json
 create mode 100644 erpnext/hr/doctype/interest/interest.py
 create mode 100644 erpnext/hr/doctype/interest/test_interest.py
 delete mode 100644 erpnext/hr/doctype/salary_slip_deduction/README.md
 delete mode 100644 erpnext/hr/doctype/salary_slip_deduction/__init__.py
 delete mode 100644 erpnext/hr/doctype/salary_slip_deduction/salary_slip_deducti                                                                                        on.json
 delete mode 100644 erpnext/hr/doctype/salary_slip_deduction/salary_slip_deducti                                                                                        on.py
 delete mode 100644 erpnext/hr/doctype/salary_slip_earning/README.md
 delete mode 100644 erpnext/hr/doctype/salary_slip_earning/__init__.py
 delete mode 100644 erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.j                                                                                        son
 delete mode 100644 erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.p                                                                                        y
 delete mode 100644 erpnext/hr/doctype/salary_structure_deduction/README.md
 delete mode 100644 erpnext/hr/doctype/salary_structure_deduction/__init__.py
 delete mode 100644 erpnext/hr/doctype/salary_structure_deduction/salary_structu                                                                                        re_deduction.json
 delete mode 100644 erpnext/hr/doctype/salary_structure_deduction/salary_structu                                                                                        re_deduction.py
 delete mode 100644 erpnext/hr/doctype/salary_structure_earning/README.md
 delete mode 100644 erpnext/hr/doctype/salary_structure_earning/__init__.py
 delete mode 100644 erpnext/hr/doctype/salary_structure_earning/salary_structure                                                                                        _earning.json
 delete mode 100644 erpnext/hr/doctype/salary_structure_earning/salary_structure                                                                                        _earning.py
 create mode 100644 erpnext/patches/v7_0/make_guardian.py
 create mode 100644 erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.p                                                                                        y
 create mode 100644 erpnext/patches/v7_0/update_refdoc_in_landed_cost_voucher.py
 create mode 100644 erpnext/schools/doctype/guardian/__init__.py
 rename erpnext/{hr/doctype/deduction_type/deduction_type.js => schools/doctype/                                                                                        guardian/guardian.js} (80%)
 create mode 100644 erpnext/schools/doctype/guardian/guardian.json
 create mode 100644 erpnext/schools/doctype/guardian/guardian.py
 create mode 100644 erpnext/schools/doctype/guardian/test_guardian.py
 create mode 100644 erpnext/schools/doctype/guardian_interest/__init__.py
 create mode 100644 erpnext/schools/doctype/guardian_interest/guardian_interest.                                                                                        json
 create mode 100644 erpnext/schools/doctype/guardian_interest/guardian_interest.                                                                                        py
 create mode 100644 erpnext/schools/doctype/student_log/__init__.py
 create mode 100644 erpnext/schools/doctype/student_log/student_log.js
 create mode 100644 erpnext/schools/doctype/student_log/student_log.json
 create mode 100644 erpnext/schools/doctype/student_log/student_log.py
 create mode 100644 erpnext/schools/doctype/student_log/test_student_log.py
aafpl@ubuntu:/home/frappe/frappe-bench/apps/erpnext$ cd
aafpl@ubuntu:~$ cd /home/frappe/frappe-bench\
>
aafpl@ubuntu:/home/frappe/frappe-bench$ cd apps
aafpl@ubuntu:/home/frappe/frappe-bench/apps$ cd frappe
aafpl@ubuntu:/home/frappe/frappe-bench/apps/frappe$ sudo git reset --hard
HEAD is now at a08cbd6 Merge branch 'develop'
aafpl@ubuntu:/home/frappe/frappe-bench/apps/frappe$ sudo git pull
remote: Counting objects: 83, done.
remote: Compressing objects: 100% (42/42), done.
remote: Total 83 (delta 59), reused 65 (delta 41), pack-reused 0
Unpacking objects: 100% (83/83), done.
From https://github.com/frappe/frappe
   a08cbd6..2bd27c0  master     -> upstream/master
 * [new tag]         v7.0.14    -> v7.0.14
 * [new tag]         v7.0.11    -> v7.0.11
 * [new tag]         v7.0.12    -> v7.0.12
 * [new tag]         v7.0.13    -> v7.0.13
Updating a08cbd6..2bd27c0
Fast-forward
 .travis.yml                                        | 14 +++++---
 frappe/__init__.py                                 |  2 +-
 .../deployment/how-to-enable-social-logins.md      |  8 ++---
 frappe/installer.py                                |  6 ++++
 frappe/model/rename_doc.py                         |  6 +++-
 frappe/patches.txt                                 |  2 ++
 frappe/patches/v7_0/set_email_group.py             | 11 ++++++
 frappe/public/css/form_grid.css                    |  3 ++
 frappe/public/js/frappe/form/grid.js               | 42 +++++++++++++++++++---
 frappe/public/less/form_grid.less                  |  4 +++
 10 files changed, 82 insertions(+), 16 deletions(-)
 create mode 100644 frappe/patches/v7_0/set_email_group.py

Hi, I asked you to run those commands in the .bench directory.

su - frappe
cd ~/.bench
git reset --hard
git pull
3 Likes

can you please help , where can I find this directory.

aafpl@ubuntu:/home/frappe/frappe-bench$ sudo bench update
[sudo] password for aafpl:
INFO:bench.utils:updating bench
Already up-to-date.
remote: Counting objects: 62, done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 62 (delta 51), reused 50 (delta 39), pack-reused 0
error: insufficient permission for adding an object to repository database .git/objects
fatal: failed to write object
fatal: unpack-objects failed
remote: Counting objects: 62, done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 62 (delta 51), reused 50 (delta 39), pack-reused 0
error: insufficient permission for adding an object to repository database .git/objects
fatal: failed to write object
fatal: unpack-objects failed
Requirement already satisfied (use --upgrade to upgrade): Pillow in ./env/lib/python2.7/site-packages
INFO:bench.app:pulling frappe
remote: Counting objects: 61, done.
remote: Compressing objects: 100% (22/22), done.
remote: Total 61 (delta 51), reused 49 (delta 39), pack-reused 0
error: insufficient permission for adding an object to repository database .git/objects
fatal: failed to write object
fatal: unpack-objects failed
Traceback (most recent call last):
  File "/usr/local/bin/bench", line 9, in <module>
    load_entry_point('bench', 'console_scripts', 'bench')()
  File "/home/frappe/.bench/bench/cli.py", line 40, in cli
    bench_command()
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 716, in __call__
    return self.main(*args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 696, in main
    rv = self.invoke(ctx)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 1060, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 889, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 534, in invoke
    return callback(*args, **kwargs)
  File "/home/frappe/.bench/bench/commands/update.py", line 60, in update
    _update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force)
  File "/home/frappe/.bench/bench/commands/update.py", line 76, in _update
    pull_all_apps(bench_path=bench_path)
  File "/home/frappe/.bench/bench/app.py", line 148, in pull_all_apps
    remote=remote, branch=get_current_branch(app, bench_path=bench_path)), cwd=app_dir)
  File "/home/frappe/.bench/bench/utils.py", line 90, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream master
aafpl@ubuntu:/home/frappe/frappe-bench$

Hi ,

Can you please help me out over this issue.

Run these exact commands in order, and if you have an issue give me the output:

sudo chown -R frappe:frappe /home/frappe/.bench
sudo chown -R frappe:frappe /home/frappe/frappe-bench
cd /home/frappe/.bench
git reset --hard
git pull
cd /home/frappe/frappe-bench
bench update

11 Likes

Hi @vjFaLk,

I am updating erpnext from v7.0
but while bench update i am getting error “bench.utils.CommandFailedError: git pull upstream master”
So, i am following your above commands but while executing
“git reset --hard” inside
“cd /home/frappe/.bench” directory
i m getting error
“fatal: Not a git repository (or any of the parent directories): .git”
How can i make it a git repository???

You might have a different issue than ther person above. Can you create a separate issue with a full traceback?

ok, will create a new issue

after these steps following was the error

Executing erpnext.patches.v10_0.set_qty_in_transactions_based_on_serial_no_input in 2mec.hybridlogics.com (4865036ca9e614bc)
Traceback (most recent call last):
  File "/usr/lib/python2.7/runpy.py", line 174, in _run_module_as_main
    "__main__", fname, loader, pkg_name)
  File "/usr/lib/python2.7/runpy.py", line 72, in _run_code
    exec code in run_globals
  File "/home/frappe/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 97, in <module>
    main()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 18, in main
    click.Group(commands=commands)(prog_name='bench')
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py", line 722, in __call__
    return self.main(*args, **kwargs)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py", line 697, in main
    rv = self.invoke(ctx)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py", line 1066, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py", line 1066, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py", line 895, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py", line 535, in invoke
    return callback(*args, **kwargs)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/decorators.py", line 17, in new_func
    return f(get_current_context(), *args, **kwargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/commands/__init__.py", line 25, in _func
    ret = f(frappe._dict(ctx.obj), *args, **kwargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/commands/site.py", line 222, in migrate
    migrate(context.verbose, rebuild_website=rebuild_website)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/migrate.py", line 39, in migrate
    frappe.modules.patch_handler.run_all()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", line 29, in run_all
    if not run_single(patchmodule = patch):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", line 63, in run_single
    return execute_patch(patchmodule, method, methodargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", line 83, in execute_patch
    frappe.get_attr(patchmodule.split()[0] + ".execute")()
  File "/home/frappe/frappe-bench/apps/erpnext/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py", line 8, in execute
    frappe.reload_doc("stock", "doctype", "stock_settings")
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 698, in reload_doc
    return frappe.modules.reload_doc(module, dt, dn, force=force, reset_permissions=reset_permissions)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/modules/utils.py", line 155, in reload_doc
    return import_files(module, dt, dn, force=force, reset_permissions=reset_permissions)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/modules/import_file.py", line 19, in import_files
    reset_permissions=reset_permissions)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/modules/import_file.py", line 24, in import_file
    ret = import_file_by_path(path, force, pre_process=pre_process, reset_permissions=reset_permissions)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/modules/import_file.py", line 58, in import_file_by_path
    ignore_version=ignore_version, reset_permissions=reset_permissions)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/modules/import_file.py", line 132, in import_doc
    doc.insert()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py", line 241, in insert
    d.db_insert()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/model/base_document.py", line 303, in db_insert
    ), list(d.values()))
  File "/home/frappe/frappe-bench/apps/frappe/frappe/database.py", line 195, in sql
    self._cursor.execute(query, values)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/cursors.py", line 165, in execute
    result = self._query(query)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/cursors.py", line 321, in _query
    conn.query(q)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py", line 860, in query
    self._affected_rows = self._read_query_result(unbuffered=unbuffered)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py", line 1061, in _read_query_result
    result.read()
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py", line 1349, in read
    first_packet = self.connection._read_packet()
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py", line 1018, in _read_packet
    packet.check_error()
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py", line 384, in check_error
    err.raise_mysql_exception(self._data)
  File "/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/err.py", line 107, in raise_mysql_exception
    raise errorclass(errno, errval)
pymysql.err.IntegrityError: (1048, u"Column 'translatable' cannot be null")

I have the same issue with(1048, u"Column ‘translatable’ cannot be null")

I don’t think this is the best/recommended option in your case, but from this link … you could change the NOT NULL status

alter table tabWarehouse modify column translatable int(1) NULL default 0;

and then run

bench update --patch

$ sudo bench migrate
Migrating site1.local
Updating DocTypes for frappe : [= ]Traceback (most recent call last):
File “/usr/lib/python2.7/runpy.py”, line 174, in _run_module_as_main
main”, fname, loader, pkg_name)
File “/usr/lib/python2.7/runpy.py”, line 72, in _run_code
exec code in run_globals
File “/home/frappe/frappe-bench/apps/frappe/frappe/utils/bench_helper.py”, line 97, in
main()
File “/home/frappe/frappe-bench/apps/frappe/frappe/utils/bench_helper.py”, line 18, in main
click.Group(commands=commands)(prog_name=‘bench’)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py”, line 764, in call
return self.main(*args, **kwargs)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py”, line 717, in main
rv = self.invoke(ctx)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py”, line 1137, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py”, line 1137, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py”, line 956, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/core.py”, line 555, in invoke
return callback(*args, **kwargs)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/click/decorators.py”, line 17, in new_func
return f(get_current_context(), *args, **kwargs)
File “/home/frappe/frappe-bench/apps/frappe/frappe/commands/init.py”, line 25, in _func
ret = f(frappe._dict(ctx.obj), *args, **kwargs)
File “/home/frappe/frappe-bench/apps/frappe/frappe/commands/site.py”, line 227, in migrate
migrate(context.verbose, rebuild_website=rebuild_website)
File “/home/frappe/frappe-bench/apps/frappe/frappe/migrate.py”, line 40, in migrate
frappe.model.sync.sync_all(verbose=verbose)
File “/home/frappe/frappe-bench/apps/frappe/frappe/model/sync.py”, line 19, in sync_all
sync_for(app, force, verbose=verbose, reset_permissions=reset_permissions)
File “/home/frappe/frappe-bench/apps/frappe/frappe/model/sync.py”, line 56, in sync_for
reset_permissions=reset_permissions, for_sync=True)
File “/home/frappe/frappe-bench/apps/frappe/frappe/modules/import_file.py”, line 65, in import_file_by_path
ignore_version=ignore_version, reset_permissions=reset_permissions)
File “/home/frappe/frappe-bench/apps/frappe/frappe/modules/import_file.py”, line 132, in import_doc
doc.insert()
File “/home/frappe/frappe-bench/apps/frappe/frappe/model/document.py”, line 241, in insert
d.db_insert()
File “/home/frappe/frappe-bench/apps/frappe/frappe/model/base_document.py”, line 312, in db_insert
), list(d.values()))
File “/home/frappe/frappe-bench/apps/frappe/frappe/database.py”, line 199, in sql
self._cursor.execute(query, values)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/cursors.py”, line 170, in execute
result = self._query(query)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/cursors.py”, line 328, in _query
conn.query(q)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py”, line 517, in query
self._affected_rows = self._read_query_result(unbuffered=unbuffered)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py”, line 732, in _read_query_result
result.read()
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py”, line 1075, in read
first_packet = self.connection._read_packet()
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/connections.py”, line 684, in _read_packet
packet.check_error()
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/protocol.py”, line 220, in check_error
err.raise_mysql_exception(self._data)
File “/home/frappe/frappe-bench/env/local/lib/python2.7/site-packages/pymysql/err.py”, line 109, in raise_mysql_exception
raise errorclass(errno, errval)
pymysql.err.IntegrityError: (1048, u"Column ‘fetch_if_empty’ cannot be null")

even i did fetch_if_empty is 0 only