diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fc94fa03d16..aa6b94b06a2 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -806,7 +806,7 @@ - +
diff --git a/doc/cla/individual/rakete.md b/doc/cla/individual/rakete.md new file mode 100644 index 00000000000..72fa2bcea7c --- /dev/null +++ b/doc/cla/individual/rakete.md @@ -0,0 +1,11 @@ +Germany, 2017-11-24 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Andreas Raster lazor@affenbande.org https://github.com/rakete diff --git a/doc/cla/individual/zoggy444.md b/doc/cla/individual/zoggy444.md new file mode 100644 index 00000000000..46f8490f973 --- /dev/null +++ b/doc/cla/individual/zoggy444.md @@ -0,0 +1,11 @@ +FRANCE, 2018-09-26 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +zoggy 43614933+zoggy444@users.noreply.github.com https://github.com/zoggy444 diff --git a/odoo/addons/base/base.sql b/odoo/addons/base/base.sql index 57d57a1389b..4951456f9e8 100644 --- a/odoo/addons/base/base.sql +++ b/odoo/addons/base/base.sql @@ -106,6 +106,7 @@ CREATE TABLE res_company ( name varchar NOT NULL, partner_id integer, currency_id integer, + sequence integer, primary key(id) ); diff --git a/odoo/service/server.py b/odoo/service/server.py index be38f221a16..8ea187c6771 100644 --- a/odoo/service/server.py +++ b/odoo/service/server.py @@ -135,6 +135,8 @@ class FSWatcher(object): try: source = open(path, 'rb').read() + b'\n' compile(source, path, 'exec') + except FileNotFoundError: + _logger.error('autoreload: python code change detected, FileNotFound for %s', path) except SyntaxError: _logger.error('autoreload: python code change detected, SyntaxError in %s', path) else: