odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Vo Minh Thu 2012-09-13 14:44:48 +02:00
parent 1c85cb8b78 eb4a946811
commit 7d1d7affc5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/base_data.xml
View File

@ -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>

2
openerp/tests/addons/test_impex/tests/test_export.py
View File

@ -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:

4
openerp/tests/addons/test_impex/tests/test_import.py
View File

@ -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: