summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2014-11-18 11:52:25 +0100
committerJeremy Kersten <jke@odoo.com>2014-11-18 11:52:25 +0100
commiteea50670fa6f53949594bfc8e3b1eb8eb3c0cee9 (patch)
treec54c3dd1b12b088aa71ede20783ff32b4a715ea3 /doc
parent7a7bf11e92ffdd2de06e444ddc77aeb528ed4764 (diff)
parentfc329b6eeb5652487c67e7b558fccaf46c3dad43 (diff)
[MERGE] forward port of branch 8.0 up to fc329b6
Diffstat (limited to 'doc')
-rw-r--r--doc/_themes/odoodoc/layout.html2
-rw-r--r--doc/reference/orm.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/_themes/odoodoc/layout.html b/doc/_themes/odoodoc/layout.html
index 1a68d31814a..5235137eddd 100644
--- a/doc/_themes/odoodoc/layout.html
+++ b/doc/_themes/odoodoc/layout.html
@@ -87,7 +87,7 @@
{%- if show_copyright %}
<li>
{%- if hasdoc('copyright') %}
- {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> <a href="https://odoo.com">{{ copyright }}</a>.{% endtrans %}
+ {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> <a href="https://odoo.com">{{ copyright }}</a>{% endtrans %}
{%- else %}
{% trans copyright=copyright|e %}&copy; Copyright <a href="https://odoo.com">{{ copyright }}</a>.{% endtrans %}
{%- endif %}
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index cfc465078b1..474f0eee895 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -18,7 +18,7 @@ set of records of the same model.
Methods defined on a model are executed on a recordset, and their ``self`` is
a recordset::
- class AModel(Model):
+ class AModel(models.Model):
_name = 'a.model'
def a_method(self):
# self can be anywhere between 0 records and all records in the
@@ -279,7 +279,7 @@ Creating Models
Model fields are defined as attributes on the model itself::
from openerp import models, fields
- class AModel(Model):
+ class AModel(models.Model):
_name = 'a.model.name'
field1 = fields.Char()