diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-08 12:28:16 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-08 12:28:16 +0200 |
| commit | 7306e888a65cab60bf8348eb5672fc254ba7dd79 (patch) | |
| tree | b93e07546e3e390bd86dc15a7f9171b01b28781b /doc/reference | |
| parent | a199988c996065acaf7a8d1dd0f8d6e6141ba92f (diff) | |
| parent | ac5023060c1cd356ceb39dd1b17de7df7f2eaf43 (diff) | |
[MERGE] forward port of branch saas-11 up to ac50230
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/orm.rst | 2 | ||||
| -rw-r--r-- | doc/reference/upgrade_api.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst index af5c3cb267f..4511410fee2 100644 --- a/doc/reference/orm.rst +++ b/doc/reference/orm.rst @@ -348,9 +348,9 @@ Default values are defined as parameters on fields, either a value:: or a function called to compute the default value, which should return that value:: - a_field = fields.Char(default=compute_default_value) def compute_default_value(self): return self.get_value() + a_field = fields.Char(default=compute_default_value) Computed fields --------------- diff --git a/doc/reference/upgrade_api.rst b/doc/reference/upgrade_api.rst index 40d76d9a05d..dd03f4f3f5d 100644 --- a/doc/reference/upgrade_api.rst +++ b/doc/reference/upgrade_api.rst @@ -395,7 +395,7 @@ database upgrade request. KEY="Aw7pItGVKFuZ_FOR3U8VFQ==" REQUEST_ID="10534" URL_PARAMS="key=${KEY}&request=${REQUEST_ID}" - curl -sS "${PROCESS_URL}?${URL_PARAMS}" + curl -sS "${STATUS_URL}?${URL_PARAMS}" Sample output ------------- |