diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2012-09-13 14:44:48 +0200 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2012-09-13 14:44:48 +0200 |
| commit | 7d1d7affc5ff9fa5cc09f802cad5a16bdd51ea06 (patch) | |
| tree | c2b52c163afbd891659c2dc1542701472637a19b | |
| parent | 1c85cb8b783f746b3dcc95d95594d213e207120a (diff) | |
| parent | eb4a94681121ee633b6605a612bbdf0053f48625 (diff) | |
[MERGE] fix: renamed thousand_sep to thousands_sep in test_impex, removed rml_footer1 and rml_footer2 from data as the fields were removed.
bzr revid: vmt@openerp.com-20120913124448-ba4kgi0brmyldkaf
| -rw-r--r-- | openerp/addons/base/base_data.xml | 2 | ||||
| -rw-r--r-- | openerp/tests/addons/test_impex/tests/test_export.py | 2 | ||||
| -rw-r--r-- | openerp/tests/addons/test_impex/tests/test_import.py | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index 2fa9910758d..4c429fe56ff 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -62,8 +62,6 @@ <field name="name">Your Company</field> <field name="partner_id" ref="main_partner"/> <field name="rml_header1">Your Company Slogan</field> - <field name="rml_footer1">Web: http://www.yourcompany.com - Tel: +33 1 49 51 23 94</field> - <field name="rml_footer2">Bank Accounts... to be configured in menu Settings > Accounting/Invoicing.</field> <field name="currency_id" ref="base.EUR"/> </record> diff --git a/openerp/tests/addons/test_impex/tests/test_export.py b/openerp/tests/addons/test_impex/tests/test_export.py index 7e67ba581a1..26219b36d3b 100644 --- a/openerp/tests/addons/test_impex/tests/test_export.py +++ b/openerp/tests/addons/test_impex/tests/test_export.py @@ -245,7 +245,7 @@ class test_selection(CreatorCase): 'translatable': True, 'date_format': '%d.%m.%Y', 'decimal_point': ',', - 'thousand_sep': ' ', + 'thousands_sep': ' ', }) Translations = self.registry('ir.translation') for source, value in self.translations_fr: diff --git a/openerp/tests/addons/test_impex/tests/test_import.py b/openerp/tests/addons/test_impex/tests/test_import.py index 03507ee7012..9aff3704f8b 100644 --- a/openerp/tests/addons/test_impex/tests/test_import.py +++ b/openerp/tests/addons/test_impex/tests/test_import.py @@ -393,7 +393,7 @@ class test_selection(ImporterCase): 'translatable': True, 'date_format': '%d.%m.%Y', 'decimal_point': ',', - 'thousand_sep': ' ', + 'thousands_sep': ' ', }) Translations = self.registry('ir.translation') for source, value in self.translations_fr: @@ -466,7 +466,7 @@ class test_selection_function(ImporterCase): 'translatable': True, 'date_format': '%d.%m.%Y', 'decimal_point': ',', - 'thousand_sep': ' ', + 'thousands_sep': ' ', }) Translations = self.registry('ir.translation') for source, value in self.translations_fr: |