Changeset 12502

Timestamp:

20 Jan 2015, 18:09:03 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes made in base package.

Location:

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

Files:

• browser.py (added)
• contracts.py (modified) (2 diffs)
• export.py (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -28 +28 @@
 from ikobacustom.skeleton.interfaces import MessageFactory as _
 from ikobacustom.skeleton.customers.interfaces import (
-    ISkeletonContract, ISkeletonContractEdit, ISkeletonContractProcess)
+    ISkeletonContract, ISkeletonContractEdit, ISkeletonContractProcess,
+    ISkeletonContractOfficialUse)
 
 
@@ -46 +47 @@
 
     edit_form_fields_interface = ISkeletonContractEdit
+
+    ou_form_fields_interface = ISkeletonContractOfficialUse
 
     check_docs_interface = ISkeletonContract

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

@@ -22 +22 @@
     CustomerExporter, CustomerDocumentExporterBase, ContractExporterBase)
 from ikobacustom.skeleton.customers.interfaces import (
-    ISkeletonCustomer, ISkeletonCustomerDocument, ISkeletonContract)
+    ISkeletonCustomer, ISkeletonCustomerDocument, ISkeletonContractProcess)
 from ikobacustom.skeleton.interfaces import MessageFactory as _
 
@@ -45 +45 @@
     """
     grok.name('skeletoncontracts')
-    iface = ISkeletonContract
+    iface = ISkeletonContractProcess
     title = _(u'Skeleton Customer Contracts')
     class_name = 'SkeletonContract'

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

@@ -18 +18 @@
 
 from zope import schema
+from waeup.ikoba.interfaces import IIkobaObject
 from waeup.ikoba.customers.interfaces import (
     ICustomer, ICustomerDocument, IContract)
@@ -52 +53 @@
         )
 
-class ISkeletonContractProcess(ISkeletonContract):
+class ISkeletonContractOfficialUse(IIkobaObject):
+    """Interface for editing official use data.
+
+    """
+
+    comment = schema.Text(
+        title= _('Reason for rejection'),
+        required = False,
+        )
+
+class ISkeletonContractProcess(ISkeletonContract, ISkeletonContractOfficialUse):
     """Interface for processing contract data.
     """

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

@@ -164 +164 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(result,
-            'class_name,contract_category,contract_id,document_object,'
+            'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,product_object,product_options,'
             'state,tc_dict,title,user_id\r\n'
-            'SkeletonContract,sample,%s,,'
+            'SkeletonContract,,sample,%s,,'
             '[u\'2014-12-21 22:26:00 WAT - Contract created by system\']'
             ',,,[],created,{\'en\': u\'Hello World\'},,K1000000\r\n'