Changeset 12490 for main/waeup.ikoba/trunk/src

Timestamp:

19 Jan 2015, 06:50:16 (10 years ago)

Author:

Henrik Bettermann

Message:

Modify slips.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• customers/browser.py (modified) (1 diff)
• customers/utils.py (modified) (3 diffs)
• products/tests/test_batching.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -1532 +1532 @@
     def label(self):
         portal_language = getUtility(IIkobaUtils).PORTAL_LANGUAGE
-        return '%s of %s\nTitle: %s' % (
-            self.context.translated_class_name,
-            self.context.customer.display_fullname,
-            self.context.title)
+        return self.context.title
 
     def render(self):

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py

@@ -370 +370 @@
         # Insert customer data table
         if customer is not None:
-            bd_translation = trans(_('Base Data'), portal_language)
-            data.append(Paragraph(bd_translation, HEADING_STYLE))
+            #bd_translation = trans(_('Customer'), portal_language)
+            #data.append(Paragraph(bd_translation, HEADING_STYLE))
             data.append(render_customer_data(
                 customerview, view.context, omit_fields, lang=portal_language,
@@ -378 +378 @@
         # Insert widgets
         if view.form_fields:
-            data.append(Paragraph(view.title, HEADING_STYLE))
+            data_header = trans(_('${a} Data',
+                mapping = {'a':view.context.translated_class_name}),
+                portal_language)
+            data.append(Paragraph(data_header, HEADING_STYLE))
             separators = getattr(self, 'SEPARATORS_DICT', {})
             table = creator.getWidgetsTable(
@@ -392 +395 @@
         if show_history:
             if getattr(view.context, 'history', None):
-                hist_translation = trans(_('${a} Workflow History',
-                                           mapping = {'a':view.context.translated_class_name}),
-                                        portal_language)
+                hist_translation = trans(_('Transaction History'),
+                    portal_language)
                 data.append(Paragraph(hist_translation, HEADING_STYLE))
-                data.extend(creator.fromStringList(view.context.history.messages))
+                data.extend(
+                    creator.fromStringList(view.context.history.messages))
             else:
-                hist_translation = trans(_('Customer Workflow History'), portal_language)
+                hist_translation = trans(_('Registration History'),
+                    portal_language)
                 data.append(Paragraph(hist_translation, HEADING_STYLE))
                 data.extend(creator.fromStringList(customer.history.messages))

main/waeup.ikoba/trunk/src/waeup/ikoba/products/tests/test_batching.py

@@ -59 +59 @@
     layer = FunctionalLayer
 
-    _contract_category = u'license'
-
     def setUp(self):
         super(ProductImportExportSetup, self).setUp()
@@ -85 +83 @@
         product = Product()
         product.product_id = u'LIC'
-        product.contract_category = self._contract_category
+        product.contract_category = u'license'
         options = ProductOption()
         options.title = u'Base Fee'