From https://github.com/frappe/shopping-cart
* branch HEAD -> FETCH_HEAD
Already up-to-date.
From https://github.com/frappe/frappe
* branch HEAD -> FETCH_HEAD
Updating 1b93c8e..506e885
Fast-forward
.travis.yml | 5 +-
frappe/__version__.py | 2 +-
frappe/core/doctype/communication/communication.py | 4 +-
frappe/core/doctype/customize_form/test_customize_form.py | 2 +-
frappe/core/doctype/event/event.py | 9 +-
frappe/core/doctype/print_format/print_format.json | 302 +++----
frappe/core/doctype/todo/todo.py | 3 +-
frappe/core/doctype/user/user.json | 54 +-
frappe/data/languages.txt | 1 +
frappe/hooks.py | 2 +-
frappe/model/base_document.py | 2 +-
frappe/model/db_query.py | 2 +-
frappe/public/css/font/noto_sans/NotoSans-Bold-webfont.eot | Bin 0 -> 21553 bytes
frappe/public/css/font/noto_sans/NotoSans-Bold-webfont.svg | 1825 ++++++++++++++++++++++++++++++++++++++++++
frappe/public/css/font/noto_sans/NotoSans-Bold-webfont.ttf | Bin 0 -> 45440 bytes
frappe/public/css/font/noto_sans/NotoSans-Bold-webfont.woff | Bin 0 -> 25216 bytes
frappe/public/css/font/noto_sans/NotoSans-BoldItalic-webfont.eot | Bin 0 -> 22342 bytes
frappe/public/css/font/noto_sans/NotoSans-BoldItalic-webfont.svg | 1810 +++++++++++++++++++++++++++++++++++++++++
frappe/public/css/font/noto_sans/NotoSans-BoldItalic-webfont.ttf | Bin 0 -> 48072 bytes
frappe/public/css/font/noto_sans/NotoSans-BoldItalic-webfont.woff | Bin 0 -> 26108 bytes
frappe/public/css/font/noto_sans/NotoSans-Italic-webfont.eot | Bin 0 -> 22452 bytes
frappe/public/css/font/noto_sans/NotoSans-Italic-webfont.svg | 914 +++++++++++++++++++++
frappe/public/css/font/noto_sans/NotoSans-Italic-webfont.ttf | Bin 0 -> 48688 bytes
frappe/public/css/font/noto_sans/NotoSans-Italic-webfont.woff | Bin 0 -> 26248 bytes
frappe/public/css/font/noto_sans/NotoSans-Regular-webfont.eot | Bin 0 -> 20798 bytes
frappe/public/css/font/noto_sans/NotoSans-Regular-webfont.svg | 1825 ++++++++++++++++++++++++++++++++++++++++++
frappe/public/css/font/noto_sans/NotoSans-Regular-webfont.ttf | Bin 0 -> 44124 bytes
frappe/public/css/font/noto_sans/NotoSans-Regular-webfont.woff | Bin 0 -> 24372 bytes
frappe/public/css/font/noto_sans/noto_sans.css | 51 ++
frappe/public/js/frappe/form/control.js | 7 +-
frappe/public/js/frappe/views/calendar.js | 2 +-
frappe/public/js/lib/slickgrid/images/arrow_redo.png | Bin 625 -> 572 bytes
frappe/public/js/lib/slickgrid/images/arrow_right_peppermint.png | Bin 240 -> 128 bytes
frappe/public/js/lib/slickgrid/images/arrow_right_spearmint.png | Bin 240 -> 128 bytes
frappe/public/js/lib/slickgrid/images/arrow_undo.png | Bin 631 -> 578 bytes
frappe/public/js/lib/slickgrid/images/bullet_blue.png | Bin 289 -> 241 bytes
frappe/public/js/lib/slickgrid/images/bullet_star.png | Bin 347 -> 279 bytes
frappe/public/js/lib/slickgrid/images/bullet_toggle_minus.png | Bin 207 -> 154 bytes
frappe/public/js/lib/slickgrid/images/bullet_toggle_plus.png | Bin 209 -> 156 bytes
frappe/public/js/lib/slickgrid/images/drag-handle.png | Bin 1223 -> 1130 bytes
frappe/public/js/lib/slickgrid/images/help.png | Bin 510 -> 345 bytes
frappe/public/js/lib/slickgrid/images/sort-asc.png | Bin 163 -> 105 bytes
frappe/public/js/lib/slickgrid/images/sort-desc.png | Bin 161 -> 107 bytes
frappe/public/js/lib/slickgrid/images/stripes.png | Bin 1238 -> 1125 bytes
frappe/public/js/lib/slickgrid/images/tag_red.png | Bin 592 -> 537 bytes
frappe/public/js/lib/slickgrid/images/tick.png | Bin 537 -> 484 bytes
frappe/public/js/lib/slickgrid/plugins/slick.autotooltips.js | 63 +-
frappe/public/js/lib/slickgrid/plugins/slick.cellrangedecorator.js | 4 +-
frappe/public/js/lib/slickgrid/plugins/slick.cellrangeselector.js | 2 +
frappe/public/js/lib/slickgrid/plugins/slick.cellselectionmodel.js | 15 +-
frappe/public/js/lib/slickgrid/plugins/slick.headerbuttons.css | 3 +-
frappe/public/js/lib/slickgrid/plugins/slick.headermenu.css | 1 +
frappe/public/js/lib/slickgrid/plugins/slick.headermenu.js | 13 +-
frappe/public/js/lib/slickgrid/plugins/slick.rowselectionmodel.js | 46 +-
frappe/public/js/lib/slickgrid/slick-default-theme.css | 228 +-----
frappe/public/js/lib/slickgrid/slick.core.js | 11 +-
frappe/public/js/lib/slickgrid/slick.dataview.js | 171 ++--
frappe/public/js/lib/slickgrid/slick.editors.js | 6 +-
frappe/public/js/lib/slickgrid/slick.formatters.js | 59 ++
frappe/public/js/lib/slickgrid/slick.grid.css | 2 +
frappe/public/js/lib/slickgrid/slick.grid.js | 265 ++++--
frappe/public/js/lib/slickgrid/slick.groupitemmetadataprovider.js | 20 +-
frappe/public/js/lib/slickgrid/slick.remotemodel.js | 173 ++++
frappe/templates/styles/standard.css | 13 +-
frappe/test_runner.py | 4 +-
frappe/translations/de.csv | 446 +++++------
frappe/translations/el.csv | 24 +-
frappe/translations/es.csv | 80 +-
frappe/translations/fr.csv | 73 +-
frappe/translations/hr.csv | 208 ++---
frappe/translations/id.csv | 47 +-
frappe/translations/is.csv | 1698 +++++++++++++++++++++++++++++++++++++++
frappe/translations/it.csv | 60 +-
frappe/translations/ja.csv | 42 +-
frappe/translations/nl.csv | 68 +-
frappe/translations/pl.csv | 94 +--
frappe/translations/pt.csv | 26 +-
frappe/translations/ru.csv | 114 +--
frappe/translations/tr.csv | 4 +-
frappe/website/website_generator.py | 2 +-
frappe/widgets/calendar.py | 2 +-
frappe/widgets/query_report.py | 2 +-
frappe/widgets/reportview.py | 4 +-
frappe/widgets/search.py | 1 +
setup.py | 2 +-
85 files changed, 9657 insertions(+), 1261 deletions(-)
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Bold-webfont.eot
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Bold-webfont.svg
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Bold-webfont.ttf
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Bold-webfont.woff
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-BoldItalic-webfont.eot
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-BoldItalic-webfont.svg
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-BoldItalic-webfont.ttf
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-BoldItalic-webfont.woff
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Italic-webfont.eot
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Italic-webfont.svg
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Italic-webfont.ttf
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Italic-webfont.woff
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Regular-webfont.eot
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Regular-webfont.svg
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Regular-webfont.ttf
create mode 100755 frappe/public/css/font/noto_sans/NotoSans-Regular-webfont.woff
create mode 100644 frappe/public/css/font/noto_sans/noto_sans.css
create mode 100644 frappe/public/js/lib/slickgrid/slick.formatters.js
create mode 100644 frappe/public/js/lib/slickgrid/slick.remotemodel.js
create mode 100644 frappe/translations/is.csv
remote: Counting objects: 369, done.
remote: Compressing objects: 100% (222/222), done.
Receiving objects: 100% (369/369), 1.19 MiB | 662 KiB/s, done.
remote: Total 369 (delta 190), reused 218 (delta 139)
Resolving deltas: 100% (190/190), done.
From https://github.com/frappe/erpnext
* branch HEAD -> FETCH_HEAD
Updating 9e95e78..282695f
error: Your local changes to the following files would be overwritten by merge:
erpnext/selling/doctype/quotation/quotation.json
erpnext/selling/doctype/sales_order/sales_order.json
Please, commit your changes or stash them before you can merge.
Aborting
Error: None
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/erpnext/bench-repo/bench/cli.py", line 29, in cli
return bench()
File "/usr/local/lib/python2.7/dist-packages/click-3.3-py2.7.egg/click/core.py", line 610, in __call__
return self.main(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/click-3.3-py2.7.egg/click/core.py", line 590, in main
rv = self.invoke(ctx)
File "/usr/local/lib/python2.7/dist-packages/click-3.3-py2.7.egg/click/core.py", line 936, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/usr/local/lib/python2.7/dist-packages/click-3.3-py2.7.egg/click/core.py", line 782, in invoke
return ctx.invoke(self.callback, **ctx.params)
File "/usr/local/lib/python2.7/dist-packages/click-3.3-py2.7.egg/click/core.py", line 416, in invoke
return callback(*args, **kwargs)
File "/home/erpnext/bench-repo/bench/cli.py", line 113, in update
pull_all_apps()
File "/home/erpnext/bench-repo/bench/app.py", line 57, in pull_all_apps
exec_cmd("git pull {rebase} upstream HEAD".format(rebase=rebase), cwd=app_dir)
File "/home/erpnext/bench-repo/bench/utils.py", line 59, in exec_cmd
subprocess.check_call(cmd, cwd=cwd, shell=True)
File "/usr/lib/python2.7/subprocess.py", line 511, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command 'git pull upstream HEAD' returned non-zero exit status 1
root@erpnext-vm:/home/erpnext/frappe-bench#
This is the newest error xD