Xavier Morel 5c75678f94 [FIX] broken merge hidden by leftover pyc file ... bzr revid: xmo@openerp.com-20131014121319-ry0s5tnpz5f21aw0		2013-10-14 14:13:19 +02:00
..
__init__.py	[FIX] broken merge hidden by leftover pyc file	2013-10-14 14:13:19 +02:00
ir_qweb.py	[ADD] conversion back from HTML to monetary field	2013-10-11 16:25:28 +02:00
ir_rule.py	[IMP] website: ir.rule: add the http secure session in the eval context for access rules evaluation.	2013-10-10 11:02:29 +02:00
ir_ui_view.py	[MERGE] from trunk	2013-10-14 10:54:59 +02:00
test_models.py	[FIX] move conversion code from ir.fields.converter into website.qweb structures	2013-10-09 15:31:12 +02:00
website.py	[MERGE] from trunk	2013-10-14 10:54:59 +02:00