[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101015122702-i8dkaxlajqwp4gbp

addons/account/account_bank_statement.py

@@ -377,7 +377,7 @@ class account_bank_statement(osv.osv):
                 self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
 
             self.write(cr, uid, [st.id], {'name': st_number}, context=context)
-            self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st_number)
+            self.log(cr, uid, st.id, _('Statement %s is confirmed and entries are created.') % st_number)
             done.append(st.id)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
@@ -500,4 +500,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/invoice.py

@@ -375,6 +375,9 @@ class account_invoice(osv.osv):
 
     def confirm_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'}, context=context)
+        for inv_id, name in self.name_get(cr, uid, ids, context=context):
+            message = _('Invoice ') + " '" + name + "' "+ _("is marked as paid.")
+            self.log(cr, uid, inv_id, message)
         return True
 
     def unlink(self, cr, uid, ids, context=None):

addons/crm/crm_meeting_menu.xml

@@ -111,7 +111,7 @@
     <menuitem id="menu_attendee_invitations"
             name="Meeting Invitations" parent="crm.menu_meeting_sale"
             sequence="10" action="action_view_attendee_form"
-            groups="base.group_extended,base.group_sale_salesman" />
+            groups="base.group_no_one" />
 
 </data>
 </openerp>