Add Direct Debit Business to Business scheme

issue3921
review7361002

CHANGELOG

@@ -1,2 +1,4 @@
+* Add Direct Debit Business to Business scheme
+
 Version 3.2.0 - 2014-04-21
-* Initial release
+* Initial release

doc/index.rst

@@ -40,6 +40,9 @@ The Mandate stores information for the Direct Debit. It is mainly defined by:
 - Type:
   - Recurrent
   - One-off
+- Scheme:
+  - CORE
+  - Business to Business
 - Signature Date
 
 The mandate can be in one of this states:

payment.py

@@ -154,6 +154,7 @@ class Group:
         key = (('date', payment.date),)
         if self.kind == 'receivable':
             key += (('sequence_type', payment.sepa_mandate.sequence_type),)
+            key += (('scheme', payment.sepa_mandate.scheme),)
         return key
 
     def sepa_group_payment_id(self, key):
@@ -256,6 +257,10 @@ class Mandate(Workflow, ModelSQL, ModelView):
             'readonly': Eval('state').in_(['validated', 'canceled']),
             },
         depends=['state'])
+    scheme = fields.Selection([
+            ('CORE', 'Core'),
+            ('B2B', 'Business to Business'),
+            ], 'Scheme', required=True)
     signature_date = fields.Date('Signature Date',
         states={
             'readonly': Eval('state').in_(['validated', 'canceled']),
@@ -310,6 +315,10 @@ class Mandate(Workflow, ModelSQL, ModelView):
     def default_type():
         return 'recurrent'
 
+    @staticmethod
+    def default_scheme():
+        return 'CORE'
+
     @staticmethod
     def default_state():
         return 'draft'

template/pain.008.001.02.xml

@@ -53,7 +53,7 @@ this repository contains the full copyright notices and license terms. -->
                     <!-- Prtry -->
                 </SvcLvl>
                 <LclInstrm>
-                    <Cd>CORE</Cd>
+                    <Cd>${key['scheme']}</Cd>
                     <!-- Prtry -->
                 </LclInstrm>
                 <SeqTp>${key['sequence_type']}</SeqTp>

template/pain.008.001.04.xml

@@ -34,7 +34,7 @@ this repository contains the full copyright notices and license terms. -->
                     <!-- Prtry -->
                 </SvcLvl>
                 <LclInstrm>
-                    <Cd>CORE</Cd>
+                    <Cd>${key['scheme']}</Cd>
                     <!-- Prtry -->
                 </LclInstrm>
                 <SeqTp>${key['sequence_type']}</SeqTp>

view/mandate_form.xml

@@ -11,10 +11,12 @@ this repository contains the full copyright notices and license terms. -->
     <newline/>
     <label name="identification"/>
     <field name="identification"/>
-    <label name="type"/>
-    <field name="type"/>
     <label name="signature_date"/>
     <field name="signature_date"/>
+    <label name="type"/>
+    <field name="type"/>
+    <label name="scheme"/>
+    <field name="scheme"/>
     <newline/>
     <label name="state"/>
     <field name="state"/>