Odoo Server (MOVED TO GITHUB)

lp://staging/~openerp-dev/openobject-server/trunk-website-al

Created by Martin Trigaux (OpenERP) on 2013-06-26 and last modified on 2014-01-31

Get this branch:: bzr branch lp://staging/~openerp-dev/openobject-server/trunk-website-al

Members of OpenERP R&D Team can upload to this branch. Log in for directions.

Branch merges

1 branch proposed for merging into this one.

No branches dependent on this one.

Merged into lp://staging/openobject-server at revision 5047

OpenERP Core Team: Pending requested 2013-06-28

Diff: 7823 lines (+4240/-1385)

66 files modified

doc/03_module_dev_01.rst (+74/-34)
doc/06_ir_qweb.rst (+98/-0)
doc/06_misc.rst (+1/-0)
doc/conf.py (+0/-1)
doc/ir_actions.rst (+4/-10)
openerp/addons/base/base.sql (+1/-13)
openerp/addons/base/base_data.xml (+35/-0)
openerp/addons/base/base_demo.xml (+19/-2)
openerp/addons/base/ir/__init__.py (+1/-0)
openerp/addons/base/ir/ir_actions.py (+3/-3)
openerp/addons/base/ir/ir_attachment.py (+1/-0)
openerp/addons/base/ir/ir_fields.py (+6/-2)
openerp/addons/base/ir/ir_http.py (+27/-30)
openerp/addons/base/ir/ir_model.py (+62/-28)
openerp/addons/base/ir/ir_qweb.py (+849/-0)
openerp/addons/base/ir/ir_translation.py (+16/-16)
openerp/addons/base/ir/ir_ui_view.py (+695/-105)
openerp/addons/base/ir/ir_ui_view_view.xml (+6/-3)
openerp/addons/base/module/module_data.xml (+6/-0)
openerp/addons/base/res/res_company.py (+2/-2)
openerp/addons/base/res/res_config.py (+16/-10)
openerp/addons/base/res/res_currency.py (+9/-8)
openerp/addons/base/res/res_lang.py (+22/-21)
openerp/addons/base/res/res_partner.py (+12/-10)
openerp/addons/base/res/res_partner_demo.xml (+152/-22)
openerp/addons/base/res/res_partner_demo.yml (+28/-85)
openerp/addons/base/res/res_users.py (+6/-10)
openerp/addons/base/security/base_security.xml (+10/-0)
openerp/addons/base/security/ir.model.access.csv (+4/-3)
openerp/addons/base/tests/test_views.py (+432/-72)
openerp/http.py (+97/-45)
openerp/import_xml.rng (+28/-0)
openerp/modules/loading.py (+3/-0)
openerp/osv/fields.py (+41/-8)
openerp/osv/orm.py (+76/-530)
openerp/tests/__init__.py (+4/-2)
openerp/tests/addons/test_convert/__openerp__.py (+5/-0)
openerp/tests/addons/test_convert/test_file.txt (+1/-0)
openerp/tests/addons/test_convert/tests/__init__.py (+6/-0)
openerp/tests/addons/test_convert/tests/test_convert.py (+83/-0)
openerp/tests/addons/test_converter/__init__.py (+2/-0)
openerp/tests/addons/test_converter/__openerp__.py (+15/-0)
openerp/tests/addons/test_converter/ir.model.access.csv (+4/-0)
openerp/tests/addons/test_converter/models.py (+46/-0)
openerp/tests/addons/test_converter/tests/__init__.py (+12/-0)
openerp/tests/addons/test_converter/tests/test_html.py (+387/-0)
openerp/tests/test_acl.py (+1/-2)
openerp/tests/test_func.py (+22/-0)
openerp/tests/test_ir_filters.py (+86/-71)
openerp/tests/test_mail.py (+40/-3)
openerp/tests/test_mail_examples.py (+148/-0)
openerp/tests/test_misc.py (+6/-1)
openerp/tests/test_qweb.py (+80/-0)
openerp/tests/test_uninstall.py (+0/-89)
openerp/tests/test_view_validation.py (+9/-7)
openerp/tools/cache.py (+40/-13)
openerp/tools/convert.py (+44/-1)
openerp/tools/func.py (+15/-0)
openerp/tools/mail.py (+118/-26)
openerp/tools/misc.py (+102/-1)
openerp/tools/safe_eval.py (+31/-23)
openerp/tools/view_validation.py (+3/-4)
openerp/tools/yaml_import.py (+8/-2)
openerp/workflow/instance.py (+1/-1)
openerpcommand/common.py (+4/-4)
openerpcommand/run_tests.py (+75/-62)

Related bugs

Link a bug report

Related blueprints

Branch information

Owner:: OpenERP R&D Team

Project:: Odoo Server (MOVED TO GITHUB)

Status:: Merged

Recent revisions

5224. By Dimitri del Marmol on 2014-01-31

Merge trunk

5223. By Fabien (Open ERP) on 2014-01-31

[FIX] removing test that commits and small fix

5222. By Fabien Meghazi (OpenERP) on 2014-01-30

[IMP] QWeb exceptions shall not shadow original exceptions

5221. By Fabien Meghazi (OpenERP) on 2014-01-30

[REM] outdated disable_db

5220. By Fabien Meghazi (OpenERP) on 2014-01-30

[FIX] ir_ui_view#read_template() bring back old behavious, raises ValueError if xmlid not found

5219. By Olivier Dony (Odoo) on 2014-01-30

[FIX] res.partner: properly (re)compute display_name and commercial_partner_id on inactive partners

5218. By Christophe Simonis (OpenERP) on 2014-01-30

[FIX] allow "none" route to be accessible when logged in

5217. By Christophe Simonis (OpenERP) on 2014-01-30

[REVERT] revert commit 5210 <email address hidden>: bring back magic

5216. By Olivier Dony (Odoo) on 2014-01-30

[IMP] res.partner: more selective child_of _search() hack

Makes the conditions for disabling the `active` test
on res.partner.search() more selective, to avoid
triggering it when we are not actually searching for
the children of specific parents.
(Broke base tests now that data includes an deactivated
partner)

5215. By Olivier Dony (Odoo) on 2014-01-30

[FIX] ir.ui.view: fix tests after refactoring of ir.ui.view/qweb view processing