Vo Minh Thu (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-remove-warnings-server-installation
into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-remove-warnings-server-installation/+merge/124180
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-remove-warnings-server-installation/+merge/124180
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-remove-warnings-server-installation.
=== modified file 'openerp/addons/base/base_data.xml'
--- openerp/addons/base/base_data.xml 2012-09-11 15:07:24 +0000
+++ openerp/addons/base/base_data.xml 2012-09-13 12:18:20 +0000
@@ -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>
=== modified file 'openerp/tests/addons/test_impex/tests/test_export.py'
--- openerp/tests/addons/test_impex/tests/test_export.py 2012-08-07 14:45:19 +0000
+++ openerp/tests/addons/test_impex/tests/test_export.py 2012-09-13 12:18:20 +0000
@@ -245,7 +245,7 @@
'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:
=== modified file 'openerp/tests/addons/test_impex/tests/test_import.py'
--- openerp/tests/addons/test_impex/tests/test_import.py 2012-09-06 15:39:41 +0000
+++ openerp/tests/addons/test_impex/tests/test_import.py 2012-09-13 12:18:20 +0000
@@ -393,7 +393,7 @@
'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 @@
'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:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
