Hi, there is my error :
remote: Counting objects: 31, done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 31 (delta 10), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (31/31), done.
Depuis https://github.com/frappe/frappe
d01dc8c..12ee803 develop -> upstream/develop
Already up-to-date.
Depuis https://github.com/frappe/frappe
* branch develop -> FETCH_HEAD
Mise à jour d01dc8c..12ee803
Fast-forward
frappe/core/doctype/page/page.py | 12 ++++++++++++
frappe/patches.txt | 2 +-
frappe/public/js/frappe/ui/page.js | 2 +-
frappe/public/js/frappe/views/reports/query_report.js | 2 +-
4 files changed, 15 insertions(+), 3 deletions(-)
remote: Counting objects: 66, done.
remote: Total 66 (delta 58), reused 58 (delta 58), pack-reused 8
Unpacking objects: 100% (66/66), done.
Depuis https://github.com/frappe/erpnext
* branch develop -> FETCH_HEAD
f7e6eb4..b6ec680 develop -> upstream/develop
Mise à jour f7e6eb4..b6ec680
Fast-forward
.../payment_reconciliation.js | 6 +-
.../payment_reconciliation.json | 4 +-
.../payment_reconciliation.py | 12 +++-
.../payment_reconciliation_payment.json | 64 ++++------------------
.../accounts/doctype/payment_tool/payment_tool.py | 2 +-
erpnext/accounts/utils.py | 10 ++--
.../doctype/purchase_order/purchase_order_list.js | 8 +--
erpnext/controllers/accounts_controller.py | 3 +
erpnext/hr/doctype/employee/employee.py | 2 +-
.../patches/v4_0/reset_permissions_for_masters.py | 2 +-
erpnext/patches/v5_0/execute_on_doctype_update.py | 2 +-
erpnext/patches/v5_4/fix_missing_item_images.py | 14 ++---
.../doctype/sales_order/sales_order_list.js | 10 ++--
.../material_request/material_request_list.js | 4 +-
14 files changed, 56 insertions(+), 87 deletions(-)
Depuis https://github.com/saurabh6790/loyalty_point
* branch master -> FETCH_HEAD
Already up-to-date.
Depuis https://github.com/frappe/shopping_cart
* branch develop -> FETCH_HEAD
Already up-to-date.
Database backed up /home/phil/frappe-bench/sites/www.boutiquextension.com/privat e/backups/20150922_45342076_database.sql.gz
Database backed up /home/phil/frappe-bench/sites/www.liquidationdrummond.com/pri vate/backups/20150922_23800087_database.sql.gz
Migrating www.boutiquextension.com
Executing frappe.patches.v6_1.rename_file_data in www.boutiquextension.com (a460 03081c)
Traceback (most recent call last):
File "/usr/lib/python2.7/runpy.py", line 162, 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/phil/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 79, in <module>
main()
File "/home/phil/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 16, in main
click.Group(commands=commands)(prog_name='bench')
File "/home/phil/frappe-bench/env/local/lib/python2.7/site-packages/click/core .py", line 610, in __call__
return self.main(*args, **kwargs)
File "/home/phil/frappe-bench/env/local/lib/python2.7/site-packages/click/core .py", line 590, in main
rv = self.invoke(ctx)
File "/home/phil/frappe-bench/env/local/lib/python2.7/site-packages/click/core .py", line 936, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/home/phil/frappe-bench/env/local/lib/python2.7/site-packages/click/core .py", line 936, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/home/phil/frappe-bench/env/local/lib/python2.7/site-packages/click/core .py", line 782, in invoke
return ctx.invoke(self.callback, **ctx.params)
File "/home/phil/frappe-bench/env/local/lib/python2.7/site-packages/click/core .py", line 416, in invoke
return callback(*args, **kwargs)
File "/home/phil/frappe-bench/apps/frappe/frappe/commands.py", line 29, in _fu nc
ret = f(frappe._dict(ctx.obj), *args, **kwargs)
File "/home/phil/frappe-bench/apps/frappe/frappe/commands.py", line 214, in mi grate
frappe.modules.patch_handler.run_all()
File "/home/phil/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", li ne 25, in run_all
if not run_single(patchmodule = patch):
File "/home/phil/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", li ne 52, in run_single
return execute_patch(patchmodule, method, methodargs)
File "/home/phil/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", li ne 74, in execute_patch
frappe.db.rollback()
File "/home/phil/frappe-bench/apps/frappe/frappe/database.py", line 683, in ro llback
obj.on_rollback()
File "/home/phil/frappe-bench/apps/frappe/frappe/core/doctype/file/file.py", l ine 140, in on_rollback
self.on_trash()
File "/home/phil/frappe-bench/apps/frappe/frappe/core/doctype/file/file.py", l ine 109, in on_trash
super(File, self).on_trash()
File "/home/phil/frappe-bench/apps/frappe/frappe/utils/nestedset.py", line 194 , in on_trash
frappe.throw(_("Root {0} cannot be deleted").format(_(self.doctype)))
File "/home/phil/frappe-bench/apps/frappe/frappe/__init__.py", line 257, in th row
msgprint(msg, raise_exception=exc)
File "/home/phil/frappe-bench/apps/frappe/frappe/__init__.py", line 250, in ms gprint
_raise_exception()
File "/home/phil/frappe-bench/apps/frappe/frappe/__init__.py", line 235, in _r aise_exception
raise raise_exception, encode(msg)
frappe.exceptions.ValidationError: Root File cannot be deleted
Traceback (most recent call last):
File "/usr/local/bin/bench", line 9, in <module>
load_entry_point('bench==0.1', 'console_scripts', 'bench')()
File "/home/phil/bench-repo/bench/cli.py", line 60, in cli
bench()
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 610, in __ca ll__
return self.main(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 590, in main
rv = self.invoke(ctx)
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 936, in invo ke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 782, in invo ke
return ctx.invoke(self.callback, **ctx.params)
File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 416, in invo ke
return callback(*args, **kwargs)
File "/home/phil/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/phil/bench-repo/bench/cli.py", line 270, in update
patch_sites(bench=bench_path)
File "/home/phil/bench-repo/bench/utils.py", line 158, in patch_sites
run_frappe_cmd('--site', 'all', 'migrate', bench=bench)
File "/home/phil/bench-repo/bench/utils.py", line 489, in run_frappe_cmd
raise CommandFailedError(args)
bench.utils.CommandFailedError: ('--site', 'all', 'migrate')
