From 54f46060dcd3ef400eacfa8b9464d5d8ebb13f88 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 28 Oct 2010 17:10:19 +0530
Subject: [PATCH] [MERGE]

bzr revid: hmo@tinyerp.com-20101028114019-5qkatqamaxhx6k0u
---
 addons/account/account.py                       | 2 +-
 addons/email_template/email_template.py         | 2 +-
 addons/marketing_campaign/marketing_campaign.py | 4 ++--
 addons/product/pricelist.py                     | 2 +-
 addons/project/project.py                       | 2 +-
 addons/stock/stock.py                           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f0142e205e5..5a98c1e10f5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -130,7 +130,7 @@ class account_payment_term_line(osv.osv):
         return True
 
     _constraints = [
-        (_check_percent,('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']),
+        (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% ', ['value_amount']),
     ]
 
 account_payment_term_line()
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 73ef005c9f2..3c0b4931286 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -267,7 +267,7 @@ This is useful for CRM leads for example"),
     }
 
     _sql_constraints = [
-        ('name', 'unique (name)',('The template name must be unique !'))
+        ('name', 'unique (name)','The template name must be unique !')
     ]
 
     def create_action(self, cr, uid, ids, context):
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 8cf6cfac0c4..d0d18c043db 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -257,7 +257,7 @@ class marketing_campaign_segment(osv.osv):
         return True
 
     _constraints = [
-        (_check_model,('Model of filter must be same as resource model of Campaign '), ['ir_filter_id,campaign_id']),
+        (_check_model, 'Model of filter must be same as resource model of Campaign ', ['ir_filter_id,campaign_id']),
     ]
 
     def onchange_campaign_id(self, cr, uid, ids, campaign_id):
@@ -539,7 +539,7 @@ class marketing_campaign_transition(osv.osv):
         return True
 
     _constraints = [
-            (_check_campaign,('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']),
+            (_check_campaign, 'The To/From Activity of transition must be of the same Campaign ', ['activity_from_id,activity_to_id']),
         ]
 
     _sql_constraints = [
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 758f0a27abc..a7532423165 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -559,7 +559,7 @@ class product_pricelist_item(osv.osv):
     }
 
     _constraints = [
-        (_check_recursion,('Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!'), ['base_pricelist_id'])
+        (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id'])
     ]
 
     def product_id_change(self, cr, uid, ids, product_id, context={}):
diff --git a/addons/project/project.py b/addons/project/project.py
index 3a18ea231cf..994b082eb30 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -475,7 +475,7 @@ class task(osv.osv):
         return True
 
     _constraints = [
-        (_check_recursion,('Error ! You cannot create recursive tasks.'), ['parent_ids'])
+        (_check_recursion, 'Error ! You cannot create recursive tasks.', ['parent_ids'])
     ]
     #
     # Override view according to the company definition
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 24c96fff1fd..735fb47dde8 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1368,7 +1368,7 @@ class stock_production_lot(osv.osv):
         'product_id': lambda x, y, z, c: c.get('product_id', False),
     }
     _sql_constraints = [
-        ('name_ref_uniq', 'unique (name, ref)',('The combination of serial number and internal reference must be unique !')),
+        ('name_ref_uniq', 'unique (name, ref)', 'The combination of serial number and internal reference must be unique !'),
     ]
     def action_traceability(self, cr, uid, ids, context={}):
         """ It traces the information of a product