diff --git a/trytond/trytond/backend/postgresql/init.sql b/trytond/trytond/backend/postgresql/init.sql index 92faa1bfb8..f329698304 100644 --- a/trytond/trytond/backend/postgresql/init.sql +++ b/trytond/trytond/backend/postgresql/init.sql @@ -102,6 +102,8 @@ CREATE TABLE ir_lang ( PRIMARY KEY(id) ); +INSERT INTO ir_lang (name, code, translatable, active, direction) VALUES ('English', 'en', False, True, 'ltr'); + CREATE TABLE res_user ( id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 2) NOT NULL CONSTRAINT res_user_id_positive CHECK(id >= 0), diff --git a/trytond/trytond/backend/sqlite/init.sql b/trytond/trytond/backend/sqlite/init.sql index 948f4dd4fb..831df7d81b 100644 --- a/trytond/trytond/backend/sqlite/init.sql +++ b/trytond/trytond/backend/sqlite/init.sql @@ -83,6 +83,8 @@ CREATE TABLE ir_lang ( direction VARCHAR NOT NULL ); +INSERT INTO ir_lang (name, code, translatable, active, direction) VALUES ('English', 'en', False, True, 'ltr'); + CREATE TABLE res_user ( id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR, diff --git a/trytond/trytond/convert.py b/trytond/trytond/convert.py index 43933025c2..c0fcd7f712 100644 --- a/trytond/trytond/convert.py +++ b/trytond/trytond/convert.py @@ -566,8 +566,8 @@ class TrytondXmlHandler(sax.handler.ContentHandler): field_names=(), noupdate=self.noupdate, ) + mdata.save() self.fs2db.set(module, fs_id, mdata) - self.grouped_model_data.add(mdata) exists = True if exists: diff --git a/trytond/trytond/ir/ir.xml b/trytond/trytond/ir/ir.xml deleted file mode 100644 index 9a2416fa1e..0000000000 --- a/trytond/trytond/ir/ir.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - en - English - - n != 1 - %m/%d/%Y - AM - PM - [3, 3, 0] - . - , - [3, 3, 0] - . - , - - - - - - - - - - - - diff --git a/trytond/trytond/ir/lang.xml b/trytond/trytond/ir/lang.xml index b3e3a919f5..4da39cd3c7 100644 --- a/trytond/trytond/ir/lang.xml +++ b/trytond/trytond/ir/lang.xml @@ -102,9 +102,29 @@ this repository contains the full copyright notices and license terms. --> - + + en + English + + n != 1 + %m/%d/%Y + AM + PM + [3, 3, 0] + . + , + [3, 3, 0] + . + , + + + + - + + + + + es Spanish diff --git a/trytond/trytond/ir/tryton.cfg b/trytond/trytond/ir/tryton.cfg index cae99f9ff7..259169307c 100644 --- a/trytond/trytond/ir/tryton.cfg +++ b/trytond/trytond/ir/tryton.cfg @@ -1,6 +1,5 @@ [tryton] xml: - ir.xml ui/ui.xml ui/icon.xml ui/menu.xml