But I got this output on update process.
ro…@erpnext-VirtualBox:/var/www/erpnext# sudo lib/wnf.py --update origin master From git://github.com/webnotes/wnframework
* branch master -> FETCH_HEAD
Already up-to-date.
From git://github.com/webnotes/erpnext
* branch master -> FETCH_HEAD
Updating cb6cf71…8f14824
error: Your local changes to the following files would be overwritten by merge:
selling/doctype/sales_and_purchase_return_item/locale/es-doc.json
stock/doctype/sales_and_purchase_return_tool/locale/es-doc.json
Please, commit your changes or stash them before you can merge.
Aborting
core | page | desktop
core | page | messages
core | page | modules_setup
core | page | todo
utilities | page | messages
utilities | page | todo
setup | page | modules_setup
home | page | desktop
Building js and css files…
Wrote public/js/report-legacy.min.js - 43k
Wrote public/css/all-web.css - 150k
Wrote public/css/all-app.css - 196k
Wrote public/js/all-web.min.js - 28k
Wrote public/js/all-app.min.js - 539k
Wrote public/js/slickgrid.min.js - 98k
ro…@erpnext-VirtualBox:/var/www/erpnext# sudo lib/wnf.py --update origin master From git://github.com/webnotes/wnframework
* branch master -> FETCH_HEAD
Already up-to-date.
From git://github.com/webnotes/erpnext
* branch master -> FETCH_HEAD
Updating cb6cf71…8f14824
error: Your local changes to the following files would be overwritten by merge:
selling/doctype/sales_and_purchase_return_item/locale/es-doc.json
stock/doctype/sales_and_purchase_return_tool/locale/es-doc.json
Please, commit your changes or stash them before you can merge.
Aborting
core | page | desktop
core | page | messages
core | page | modules_setup
core | page | todo
utilities | page | messages
utilities | page | todo
setup | page | modules_setup
home | page | desktop
Building js and css files…
Wrote public/js/report-legacy.min.js - 43k
Wrote public/css/all-web.css - 150k
Wrote public/css/all-app.css - 196k
Wrote public/js/all-web.min.js - 28k
Wrote public/js/all-app.min.js - 539k
Wrote public/js/slickgrid.min.js - 98k
Thanks,
Ali
16 Nisan 2013 Salı 15:08:49 UTC+3 tarihinde Anand Doshi yazdı:
Hi,
There might be a merge conflict.
Can you update again and send us the output of the update process via
pastebin.com
Thanks,
Anand.
Hi,
When I update erpnext with “sudo lib/wnf.py --update origin master” in /var/www/erpnext, I got this error on login page.
I use Virtualbox images of erpnext.
<type ‘exceptions.ImportError’> | Python 2.7.3: /usr/bin/python
Tue Apr 16 13:56:37 2013 |
A problem occurred in a Python script. Here is the sequence of function calls leading up to the error, in the order they occurred.
| /var/www/erpnext/public/web.py in () |
43 return webnotes.webutils.render(webnotes.form_dict.get(‘page’))
|
44
|
45 if name==“main”:
|
46 init()
|
=> 47 respond()
|
| respond = <function respond> |
| /var/www/erpnext/public/web.py in respond() |
40 def respond():
|
41 import webnotes
|
=> 42 import webnotes.webutils
|
43 return webnotes.webutils.render(webnotes.form_dict.get(‘page’))
|
44
|
| webnotes = <module ‘webnotes’ from ‘…/lib/webnotes/init.pyc’>, webnotes.webutils undefined |
<type ‘exceptions.ImportError’>: No module named website
args = (‘No module named website’,)
message = ‘No module named website’
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to erpnext-dev…@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msg/erpnext-developer-forum/-/8tORfXx9ItwJ.
For more options, visit https://groups.google.com/groups/opt_out.