[MERGE]

bzr revid: hmo@tinyerp.com-20101028113641-vhuqs53ocp930zi5

7 files changed, 43 insertions, 43 deletions

diff --git a/addons/account/account.py b/addons/account/account.py
index 50b922d723b..f0142e205e5 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 5db7538d952..73ef005c9f2 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 7d88425c13f..8cf6cfac0c4 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):
@@ -309,7 +309,7 @@ class marketing_campaign_segment(osv.osv):
         for segment in self.browse(cr, uid, segment_ids, context=context):
             if segment.campaign_id.state != 'running':
                 continue
-            
+
             campaigns.add(segment.campaign_id.id)
             act_ids = self.pool.get('marketing.campaign.activity').search(cr,
                   uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)], context=context)
@@ -377,7 +377,7 @@ class marketing_campaign_activity(osv.osv):
                                  help="Python expression to decide whether the activity can be executed, otherwise it will be deleted or cancelled."
                                  "The expression may use the following [browsable] variables:\n"
                                  "   - activity: the campaign activity\n"
-                                 "   - workitem: the campaign workitem\n" 
+                                 "   - workitem: the campaign workitem\n"
                                  "   - resource: the resource object this campaign item represents\n"
                                  "   - transitions: list of campaign transitions outgoing from this activity\n"
                                  "...- re: Python regular expression module"),
@@ -539,9 +539,9 @@ 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 = [
         ('interval_positive', 'CHECK(interval_nbr >= 0)', 'The interval must be positive or zero')
     ]
@@ -638,7 +638,7 @@ class marketing_campaign_workitem(osv.osv):
             'activity': activity,
             'workitem': workitem,
             'object': object_id,
-            'resource': object_id, 
+            'resource': object_id,
             'transitions': activity.to_ids,
             're': re,
         }
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 4831123e07c..758f0a27abc 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -129,9 +129,9 @@ class product_pricelist(osv.osv):
     #def price_get_multi(self, cr, uid, product_ids, context=None):
     def price_get_multi(self, cr, uid, pricelist_ids, products_by_qty_by_partner, context=None):
         """multi products 'price_get'.
-           @param pricelist_ids: 
-           @param products_by_qty: 
-           @param partner: 
+           @param pricelist_ids:
+           @param products_by_qty:
+           @param partner:
            @param context: {
              'date': Date of the pricelist (%Y-%m-%d),}
            @return: a dict of dict with product_id as key and a dict 'price by pricelist' as value
@@ -371,7 +371,7 @@ class product_pricelist(osv.osv):
                 'ORDER BY sequence',
                 (tmpl_id, prod_id, plversion['id'], qty))
             res1 = cr.dictfetchall()
-            
+
             for res in res1:
                 item_id = 0
                 if res:
@@ -386,7 +386,7 @@ class product_pricelist(osv.osv):
                                     res['base_pricelist_id']).currency_id.id
                             price = currency_obj.compute(cr, uid, ptype_src,
                                     res['currency_id'], price_tmp, round=False)
-                            break    
+                            break
                     elif res['base'] == -2:
                         where = []
                         if partner:
@@ -413,7 +413,7 @@ class product_pricelist(osv.osv):
 
                     if price:
                         price_limit = price
-        
+
                         price = price * (1.0+(res['price_discount'] or 0.0))
                         price = rounding(price, res['price_round'])
                         price += (res['price_surcharge'] or 0.0)
@@ -422,14 +422,14 @@ class product_pricelist(osv.osv):
                         if res['price_max_margin']:
                             price = min(price, price_limit+res['price_max_margin'])
                         item_id = res['id']
-                        break    
+                        break
 
                 else:
                     # False means no valid line found ! But we may not raise an
                     # exception here because it breaks the search
                     price = False
             result[id] = price
-            result['item_id'] = {id: item_id}    
+            result['item_id'] = {id: item_id}
             if context and ('uom' in context):
                 product = product_obj.browse(cr, uid, prod_id)
                 uom = product.uos_id or product.uom_id
@@ -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 6c9f66dd009..3a18ea231cf 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -86,7 +86,7 @@ class project(osv.osv):
         cr.execute('''SELECT
                 project_id, sum(planned_hours), sum(total_hours), sum(effective_hours), SUM(remaining_hours)
             FROM
-                project_task 
+                project_task
             WHERE
                 project_id in %s AND
                 state<>'cancelled'
@@ -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/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index 7cb253a2bfb..74fb95b19f7 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -24,13 +24,13 @@
     picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.shop
-- 
+-
   I confirm the Sale Order.
-- 
+-
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
 -
   I click on Create Invoice button to create the invoice.
-- 
+-
   !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0}
 
 -
@@ -38,7 +38,7 @@
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0" 
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
 -
   I open the Invoice for the SO.
 -
@@ -69,7 +69,7 @@
     assert inv_brw.move_id, "Journal Entries has not been created"
 -
   Assign analytic journal into bank journal
-- 
+-
   !record {model: account.journal, id: sale.account_journal_bankjournal0}:
     analytic_journal_id: account.cose_journal_sale
 -
@@ -85,7 +85,7 @@
         ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
         name='test')
 -
-  I verify the invoice is in done state. 
+  I verify the invoice is in done state.
 -
   !python {model: account.invoice}: |
     sale_order_obj = self.pool.get('sale.order')
@@ -98,9 +98,9 @@
   !python {model: sale.order}: |
     sale_id=self.browse(cr, uid, ref("sale_order_so0"))
     assert(sale_id.invoiced == True), "Paid has not been set to true"
--   
+-
   I verify that the picking has been generated for the sale order
-- 
+-
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so0"))
     assert so.picking_ids,"Picking has not been generated for sale_order_so0"
@@ -111,7 +111,7 @@
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
    picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   assert (picking_id),"Delivery order has not been generated"
+   assert(picking_id),"Delivery order has not been generated"
 -
   I verify that a procurement has been generated for so
 -
@@ -120,7 +120,7 @@
     sale_order_obj = self.pool.get('sale.order')
     so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
     proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    assert proc_ids, _('No Procurements!')
+    assert(proc_ids),"No Procurements!"
 -
   Then I click on the "Run Procurement" button
 -
@@ -144,7 +144,7 @@
         sale_order_obj = self.pool.get('sale.order')
         so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
         proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
-        assert proc_ids, _('Procurement is not in the running state!')
+        assert(proc_ids),"Procurement is not in the running state!"
 -
   I verify that a purchase order has been generated
 -
@@ -157,8 +157,8 @@
         so = self.browse(cr, uid, ref("sale_order_so0"))
         pur_obj=self.pool.get('purchase.order')
         pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
-        assert pur_id, _('Purchase order has not been generated')
-    
+        assert(pur_id),"Purchase order has not been generated"
+
 -
   I click on the "Confirm" button to confirm the purchase order
 -
@@ -175,7 +175,7 @@
         pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
-- 
+-
   I click on the "Approved by supplier" button to approve the purchase order
 -
   !python {model: sale.order}: |
@@ -192,7 +192,7 @@
         for pur in pur_ids:
           wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
 -
-  I verify that a picking related to purchase order has been generated. 
+  I verify that a picking related to purchase order has been generated.
 -
   !python {model: sale.order}: |
     modules = self.pool.get('ir.module.module')
@@ -204,7 +204,7 @@
         pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
         po = pur_obj.browse(cr, uid, pur_id)[0]
         assert(po.picking_ids),"Picking for purchase order has not been generated"
--  
+-
   Then I click on the "Products Received" button of Incoming Shipments
 -
   !record {model: stock.partial.picking, id: stock_partial_picking_0}:
@@ -242,10 +242,10 @@
         po = pur_obj.browse(cr, uid, pur_id)[0]
         picking_obj = self.pool.get('stock.picking')
         ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
-        assert ids, _('Picking is not in the done state!')
+        assert(ids),"Picking is not in the done state!"
 -
   Then I done the picking
-- 
+-
   !python {model: stock.picking }: |
    import time
    sale_order_obj = self.pool.get('sale.order')
@@ -264,7 +264,7 @@
           'product_id': move.product_id.id,
           'product_qty': move.product_qty,
           'product_uom': move.product_uom.id,
-      } 
+      }
       self.do_partial(cr, uid, [pick.id],partial_datas)
 -
   I verify that picking for sale order is in done state.
@@ -274,7 +274,7 @@
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    pick = self.browse(cr,uid,picking_id[0])
-   assert (pick.state) =='done', "Picking for SO is not in done state." 
+   assert (pick.state) =='done', "Picking for SO is not in done state."
 -
   Then I done the delivery order
 -
@@ -296,8 +296,8 @@
           'product_id': move.product_id.id,
           'product_qty': move.product_qty,
           'product_uom': move.product_uom.id,
-      } 
-      self.do_partial(cr, uid, [pick.id],partial_datas)  
+      }
+      self.do_partial(cr, uid, [pick.id],partial_datas)
 -
   I verify that delivery state is done
 -
@@ -308,7 +308,7 @@
    pick = self.browse(cr,uid,picking_id[0])
    assert (pick.state) =='done', "Picking for SO is not in done state."
 -
-  I verify that a "Picked" has been set to true 
+  I verify that a "Picked" has been set to true
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so0"))
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4b3aa5d1667..24c96fff1fd 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