Changeset 12489


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed

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

    r12335 r12489  
    6969    """
    7070
    71     product_object = schema.Choice(
    72         title = _(u'Product'),
    73         source = ConCatProductSource(),
    74         required = True,
    75         )
    76 
    7771    document_object = schema.Choice(
    7872        title = _(u'Document'),

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

    r12367 r12489  
    3939    def setup_for_export(self):
    4040        product = SkeletonProduct()
    41         product.product_id = u'LIC'
     41        product.product_id = u'SAM'
     42        product.contract_category = u'sample'
    4243        product.valid_from = datetime.date(2015, 12, 4)
    4344        self.app['products'][product.product_id] = self.product = product
    … …  
    5455        self.assertEqual(result,
    5556            'contract_category,contract_title,options,'
    56             'product_id,terms_and_conditions,title,valid_from,valid_to,users_with_local_roles\r\n'
    57             'license,,[],LIC,,Unnamed,2015-12-04#,,[]\r\n')
     57            'product_id,terms_and_conditions,title,valid_from,valid_to,'
     58            'users_with_local_roles\r\n'
     59            'sample,,[],SAM,,Unnamed,2015-12-04#,,[]\r\n')
    5860        # We can import the same file.
    5961        processor = SkeletonProductProcessor()
    … …  
    6163            self.outfile,
    6264            ['contract_category','contract_title', 'options,', 'product_id',
    63             'terms_and_conditions','title','valid_from','valid_to','users_with_local_roles'],
     65            'terms_and_conditions','title','valid_from','valid_to',
     66            'users_with_local_roles'],
    6467            mode='create')
    6568        num, num_fail, finished_path, failed_path = result
    … …  
    6871        self.assertEqual(num_fail,1)
    6972        # We remove the original product.
    70         del self.app['products']['LIC']
     73        del self.app['products']['SAM']
    7174        result = processor.doImport(
    7275            self.outfile,
    7376            ['contract_category','contract_title', 'options,', 'product_id',
    74             'terms_and_conditions','title','valid_from','valid_to','users_with_local_roles'],
     77            'terms_and_conditions','title','valid_from','valid_to',
     78            'users_with_local_roles'],
    7579            mode='create')
    7680        num, num_fail, finished_path, failed_path = result
    … …  
    8185            self.outfile,
    8286            ['contract_category','contract_title', 'options,', 'product_id',
    83             'terms_and_conditions','title','valid_from','valid_to','users_with_local_roles'],
     87            'terms_and_conditions','title','valid_from','valid_to',
     88            'users_with_local_roles'],
    8489            mode='update')
    8590        num, num_fail, finished_path, failed_path = result

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

    r12411 r12489  
    4747    CON_CATS_DICT = {
    4848        'sample': 'Sample Category',
    49         'license': 'License',
    5049        'no': 'no contract',
    5150        }
Note: See TracChangeset for help on using the changeset viewer.