diff options
| author | Raphael Collet <rco@openerp.com> | 2014-07-06 16:44:26 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2014-07-06 17:05:41 +0200 |
| commit | cbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch) | |
| tree | d6ff62b719fce32392397783c961b734b1e4c50e /addons/website_hr | |
| parent | d78192c489d3be66cd6487b39f5ce7ba4733a187 (diff) | |
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
Diffstat (limited to 'addons/website_hr')
| -rw-r--r-- | addons/website_hr/controllers/main.py | 4 | ||||
| -rw-r--r-- | addons/website_hr/models/hr.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/website_hr/controllers/main.py b/addons/website_hr/controllers/main.py index fcc66e6bae8..430c47b5dfa 100644 --- a/addons/website_hr/controllers/main.py +++ b/addons/website_hr/controllers/main.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from openerp.addons.web import http -from openerp.addons.web.http import request +from openerp import http +from openerp.http import request class website_hr(http.Controller): diff --git a/addons/website_hr/models/hr.py b/addons/website_hr/models/hr.py index 4cacc56dba4..2927993a6d4 100644 --- a/addons/website_hr/models/hr.py +++ b/addons/website_hr/models/hr.py @@ -6,7 +6,7 @@ from openerp.osv import osv, fields class hr(osv.osv): _inherit = 'hr.employee' _columns = { - 'website_published': fields.boolean('Available in the website'), + 'website_published': fields.boolean('Available in the website', copy=False), 'public_info': fields.text('Public Info'), } _defaults = { |