[MERGE] Merge with main branch

bzr revid: mra@tinyerp.com-20100503064056-0c0ngzarsyjhdglo

addons/account_payment/payment_view.xml

@@ -2,6 +2,7 @@
 <openerp>
     <data>
 
+		<wizard id="wizard_populate_statement" menu="False" model="account.bank.statement" name="populate_statement" string="Populate Statement with Payment lines"/>
         <!-- View used in the wizard -->
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form.inherit</field>

addons/smtpclient/smtpclient.py

@@ -542,7 +542,7 @@ class smtpclient(osv.osv):
             sids = queue.search(cr, uid, [('state','not in',['send','sending']), ('server_id','in',ids)], order="priority", limit=30)
         
         message = ""
-        if len(ids) > 0:
+        if len(ids) > 1:
             message = "sending %s emails from message queuq !" % (len(ids))
             logger.notifyChannel('smtp', netsvc.LOG_INFO, message)