Changeset 12489 for main/ikobacustom.skeleton/trunk/src/ikobacustom/skeleton

Timestamp:

18 Jan 2015, 16:11:43 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/ikobacustom.skeleton/trunk/src/ikobacustom/skeleton

Files:

• customers/interfaces.py (modified) (1 diff)
• products/tests/test_browser.py (modified) (5 diffs)
• utils/utils.py (modified) (1 diff)

main/ikobacustom.skeleton/trunk/src/ikobacustom/skeleton/customers/interfaces.py

@@ -69 +69 @@
     """
 
-    product_object = schema.Choice(
-        title = _(u'Product'),
-        source = ConCatProductSource(),
-        required = True,
-        )
-
     document_object = schema.Choice(
         title = _(u'Document'),

main/ikobacustom.skeleton/trunk/src/ikobacustom/skeleton/products/tests/test_browser.py

@@ -39 +39 @@
     def setup_for_export(self):
         product = SkeletonProduct()
-        product.product_id = u'LIC'
+        product.product_id = u'SAM'
+        product.contract_category = u'sample'
         product.valid_from = datetime.date(2015, 12, 4)
         self.app['products'][product.product_id] = self.product = product
@@ -54 +55 @@
         self.assertEqual(result,
             'contract_category,contract_title,options,'
-            'product_id,terms_and_conditions,title,valid_from,valid_to,users_with_local_roles\r\n'
-            'license,,[],LIC,,Unnamed,2015-12-04#,,[]\r\n')
+            'product_id,terms_and_conditions,title,valid_from,valid_to,'
+            'users_with_local_roles\r\n'
+            'sample,,[],SAM,,Unnamed,2015-12-04#,,[]\r\n')
         # We can import the same file.
         processor = SkeletonProductProcessor()
@@ -61 +63 @@
             self.outfile,
             ['contract_category','contract_title', 'options,', 'product_id',
-            'terms_and_conditions','title','valid_from','valid_to','users_with_local_roles'],
+            'terms_and_conditions','title','valid_from','valid_to',
+            'users_with_local_roles'],
             mode='create')
         num, num_fail, finished_path, failed_path = result
@@ -68 +71 @@
         self.assertEqual(num_fail,1)
         # We remove the original product.
-        del self.app['products']['LIC']
+        del self.app['products']['SAM']
         result = processor.doImport(
             self.outfile,
             ['contract_category','contract_title', 'options,', 'product_id',
-            'terms_and_conditions','title','valid_from','valid_to','users_with_local_roles'],
+            'terms_and_conditions','title','valid_from','valid_to',
+            'users_with_local_roles'],
             mode='create')
         num, num_fail, finished_path, failed_path = result
@@ -81 +85 @@
             self.outfile,
             ['contract_category','contract_title', 'options,', 'product_id',
-            'terms_and_conditions','title','valid_from','valid_to','users_with_local_roles'],
+            'terms_and_conditions','title','valid_from','valid_to',
+            'users_with_local_roles'],
             mode='update')
         num, num_fail, finished_path, failed_path = result

main/ikobacustom.skeleton/trunk/src/ikobacustom/skeleton/utils/utils.py

@@ -47 +47 @@
     CON_CATS_DICT = {
         'sample': 'Sample Category',
-        'license': 'License',
         'no': 'no contract',
         }