From ea3b439b5cb831d2e333ac0b7cb10d0411416e76 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 31 May 2010 16:00:12 +0200 Subject: [PATCH] [FIX] manual backport of http://bazaar.launchpad.net/~openerp/openobject-server/5.0/revision/chs@openerp.com-20100503080002-4128xzlmtcty0o3s lp bug: https://launchpad.net/bugs/534769 fixed bzr revid: chs@openerp.com-20100531140012-cugn1lasuhszhias --- bin/addons/base/__openerp__.py | 10 +++++++++- bin/addons/base/base_data.xml | 13 ++++++++++++- bin/addons/base/test/test_context.xml | 20 ++++++++++++++++++++ bin/import_xml.rng | 4 ++++ 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 bin/addons/base/test/test_context.xml diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py index 531c66909ad..827ac3263ae 100644 --- a/bin/addons/base/__openerp__.py +++ b/bin/addons/base/__openerp__.py @@ -66,7 +66,15 @@ 'security/ir.model.access.csv' ], - 'demo_xml': ['base_demo.xml', 'res/partner/partner_demo.xml', 'res/partner/crm_demo.xml','test/base_test.xml'], + 'demo_xml': [ + 'base_demo.xml', + 'res/partner/partner_demo.xml', + 'res/partner/crm_demo.xml', + ], + 'test': [ + 'test/base_test.xml', + 'test/test_context.xml', + ], 'installable': True, 'active': True, 'certificate': '0076807797149', diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml index ca211b4a6d5..3bc6e4d6322 100644 --- a/bin/addons/base/base_data.xml +++ b/bin/addons/base/base_data.xml @@ -1293,7 +1293,18 @@ - + + + 0.631 + + 2001-01-01 + + + 0.632 + + 2002-01-01 + + AUD AUD diff --git a/bin/addons/base/test/test_context.xml b/bin/addons/base/test/test_context.xml new file mode 100644 index 00000000000..f9a6f2055a5 --- /dev/null +++ b/bin/addons/base/test/test_context.xml @@ -0,0 +1,20 @@ + + + + + + + 0.631 + + + 0.632 + + + diff --git a/bin/import_xml.rng b/bin/import_xml.rng index e139238acfe..3a698f4a897 100644 --- a/bin/import_xml.rng +++ b/bin/import_xml.rng @@ -32,6 +32,7 @@ + @@ -51,6 +52,7 @@ + @@ -70,6 +72,7 @@ + @@ -205,6 +208,7 @@ +