[MERGE] Merge with addons

[odoo/odoo.git] / addons / account / res_config.py

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 45383c4..b9bceb3 100644 (file)
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -105,8 +105,8 @@ class account_config_settings(osv.osv_memory):
         'module_account_followup': fields.boolean('Manage customer payment follow-ups',
             help='This allows to automate letters for unpaid invoices, with multi-level recalls.\n'
                  '-This installs the module account_followup.'),
-        'module_account_product_template': fields.boolean('Send products tools and information at the invoice confirmation',
-            help='Whith this module, link your products to a template to send complete information and tools to your customer.\n'
+        'module_product_email_template': fields.boolean('Send products tools and information at the invoice confirmation',
+            help='With this module, link your products to a template to send complete information and tools to your customer.\n'
                  'For instance when invoicing a training, the training agenda and materials will automatically be send to your customers.'),
         'group_proforma_invoices': fields.boolean('Allow pro-forma invoices',
             implied_group='account.group_proforma_invoices',
@@ -259,6 +259,11 @@ class account_config_settings(osv.osv_memory):
     def onchange_tax_rate(self, cr, uid, ids, rate, context=None):
         return {'value': {'purchase_tax_rate': rate or False}}
 
+    def onchange_multi_currency(self, cr, uid, ids, group_multi_currency, context=None):
+        if not group_multi_currency:
+            return {'value': {'income_currency_exchange_account_id': False, 'expense_currency_exchange_account_id': False}}
+        return {}
+    
     def onchange_start_date(self, cr, uid, id, start_date):
         if start_date:
             start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")