Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_browser.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_browser.py	(revision 12765)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_browser.py	(revision 12766)
@@ -17,5 +17,5 @@
 ##
 """
-Test the customer-related UI components.
+Test the document-related UI components.
 """
 import shutil
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser.py	(revision 12765)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser.py	(revision 12766)
@@ -1,3 +1,3 @@
-## $Id: browser.py 12760 2015-03-14 05:46:24Z henrik $
+## $Id$
 ##
 ## Copyright (C) 2015 Uli Fouquet & Henrik Bettermann
@@ -147,5 +147,5 @@
     pnav = 5
     label = _('Manage payment section')
-    search_button = _('Find payments(s)')
+    search_button = _('Find payment(s)')
     remove_button = _('Remove selected')
 
@@ -192,3 +192,6 @@
             self.flash(_('Successfully removed: ${a}',
                 mapping={'a': ','.join(deleted)}))
+            ob_class = self.__implemented__.__name__.replace('waeup.ikoba.','')
+            self.context.logger.info(
+                '%s - removed: %s' % (ob_class, ','.join(deleted)))
         return
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/container.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/container.py	(revision 12765)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/container.py	(revision 12766)
@@ -23,11 +23,15 @@
 from waeup.ikoba.payments.interfaces import IPaymentsContainer
 from waeup.ikoba.utils.helpers import attrs_to_fields
+from waeup.ikoba.utils.logger import Logger
 
 
-class PaymentsContainer(grok.Container):
+class PaymentsContainer(grok.Container, Logger):
     """This is a container for all kind of payments.
     """
     grok.implements(IPaymentsContainer)
     grok.provides(IPaymentsContainer)
+
+    logger_name = 'waeup.ikoba.${sitename}.payments'
+    logger_filename = 'payments.log'
 
     def __init__(self):
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/payment.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/payment.py	(revision 12765)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/payment.py	(revision 12766)
@@ -28,5 +28,4 @@
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.utils.helpers import attrs_to_fields
-from waeup.ikoba.utils.logger import Logger
 from waeup.ikoba.payments.interfaces import (
     IPayment, STATE_UNPAID, STATE_FAILED, STATE_PAID,
@@ -167,13 +166,9 @@
 
 @attrs_to_fields
-class Payment(grok.Model, Logger):
+class Payment(grok.Model):
     """This is a payment.
     """
     grok.implements(IPayment)
     grok.provides(IPayment)
-
-    logger_name = 'waeup.ikoba.${sitename}.payments'
-    logger_filename = 'payments.log'
-    logger_format_str = '"%(asctime)s","%(user)s",%(message)s'
 
     def __init__(self, payer, payable, payee=None):
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/tests/test_browser.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/tests/test_browser.py	(revision 12766)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/tests/test_browser.py	(revision 12766)
@@ -0,0 +1,91 @@
+## $Id: test_browser.py 12762 2015-03-14 13:49:29Z henrik $
+## 
+## Copyright (C) 2015 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""
+Test the payments-related UI components.
+"""
+
+import os
+from decimal import Decimal
+from waeup.ikoba.testing import FunctionalLayer, FunctionalTestCase
+from waeup.ikoba.payments.payment import Payment
+from waeup.ikoba.payments.interfaces import IPayer, IPayable
+from waeup.ikoba.browser.tests.test_pdf import samples_dir
+from waeup.ikoba.products.productoptions import ProductOption
+from waeup.ikoba.customers.tests.test_browser import CustomersFullSetup
+
+
+class PaymentsUITests(CustomersFullSetup):
+    # Tests for payments related views and pages
+
+    layer = FunctionalLayer
+
+    def setup_payment(self):
+        payer = IPayer(self.customer)
+        payable = IPayable(self.contract)
+        self.payment = Payment(payer, payable)
+        self.payment.gateway_service = 'demo_creditcard'
+        self.app['payments'][self.payment.payment_id] = self.payment
+        self.payments_path = 'http://localhost/app/payments'
+
+    def add_product_option(self, contract):
+        prodoption = ProductOption()
+        prodoption.title = u'Any product option'
+        prodoption.fee = Decimal('88.8')
+        prodoption.currency = 'EUR'
+        contract.product_options = [prodoption, ]
+
+    def test_manage_payments(self):
+
+        self.add_product_option(self.contract)
+        self.setup_payment()
+
+        # Managers can access the pages of payments section
+        # and can remove payments
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open('http://localhost/app')
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.browser.getLink("Payments").click()
+        self.assertEqual(self.browser.url, self.payments_path)
+        self.browser.getLink("Manage").click()
+        self.assertEqual(self.browser.url, self.payments_path + '/manage')
+        # Payment can be found
+
+        self.browser.getControl("Find payment(s)").click()
+        self.assertTrue('Empty search string' in self.browser.contents)
+        self.browser.getControl(name="searchtype").value = ['payment_id']
+        self.browser.getControl(name="searchterm").value = self.payment.payment_id
+        self.browser.getControl("Find payment(s)").click()
+        self.assertTrue(
+            '<a href="http://localhost/app/customers/K1000000/contracts/CON1">'
+            in self.browser.contents)
+
+        # Payments can be removed
+        ctrl = self.browser.getControl(name='entries')
+        ctrl.getControl(value=self.payment.payment_id).selected = True
+        self.browser.getControl("Remove selected", index=0).click()
+        self.assertTrue('Successfully removed' in self.browser.contents)
+
+
+        # All actions are being logged
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'payments.log')
+        logcontent = open(logfile).read()
+        self.assertTrue(
+            'INFO - zope.mgr - payments.browser.PaymentsContainerManagePage - removed: %s'
+            % self.payment.payment_id in logcontent)
+
