merge

bzr revid: nch@tinyerp.com-20090505052112-hhux615hbmgssyiw
2009-05-05 10:51:12 +05:30
parent 056a492f9f 61993e43fc
commit b545f1e90c
2 changed files with 2 additions and 0 deletions
@@ -144,6 +144,7 @@ CREATE TABLE res_users (
    context_tz varchar(64) default null,
    signature text,
 --  action_id int references ir_act_window on delete set null,
+    context_lang varchar(64) default '',
    action_id int,
    primary key(id)
 );
@@ -178,6 +178,7 @@ setup(name             = name,
                          'openerp-server.report.render.rml2pdf',
                          'openerp-server.report.render.rml2html',
                          'openerp-server.wizard', 
+                          'openerp-server.report.render.odt2odt',
                          'openerp-server.workflow'] + \
                         list(find_addons()),
      package_dir      = {'openerp-server': 'bin'},