0034122: Remittance File is created without business partner's Mandate Information although it is mandatory

diff -ru org.openbravo.sepa.iso20022.ori/src/org/openbravo/sepa/iso20022/util/SEPA_RemittanceCreateFile.java org.openbravo.sepa.iso20022/src/org/openbravo/sepa/iso20022/util/SEPA_RemittanceCreateFile.java
--- org.openbravo.sepa.iso20022.ori/src/org/openbravo/sepa/iso20022/util/SEPA_RemittanceCreateFile.java	2016-02-17 20:51:57.000000000 +0100
+++ org.openbravo.sepa.iso20022/src/org/openbravo/sepa/iso20022/util/SEPA_RemittanceCreateFile.java	2016-05-18 16:43:57.492158835 +0200
@@ -8,12 +8,18 @@
 package org.openbravo.sepa.iso20022.util;
 
 import java.io.File;
+import java.util.List;
 
 import javax.xml.bind.JAXBElement;
 
 import org.apache.commons.lang.StringUtils;
+import org.hibernate.criterion.Restrictions;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
+import org.openbravo.model.common.businesspartner.BusinessPartner;
 import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.module.remittance.Instruction;
 import org.openbravo.module.remittance.Remittance;
 import org.openbravo.module.remittance.utility.REM_RemittanceCreateFile;
 import org.openbravo.sepa.iso20022.constant.SEPAConstant;
@@ -81,6 +88,25 @@
       return Boolean.FALSE;
     }
 
+    final OBCriteria<Instruction> criteria = OBDal.getInstance().createCriteria(Instruction.class);
+    criteria.createAlias(Instruction.PROPERTY_BUSINESSPARTNER, "bp");
+    criteria.add(
+        Restrictions.or(Restrictions.isNull("bp." + BusinessPartner.PROPERTY_OBSEPADMANDATEDATE),
+            Restrictions.isNull("bp." + BusinessPartner.PROPERTY_OBSEPADMANDATEIDENTIFIER)));
+    criteria.add(Restrictions.eq(Instruction.PROPERTY_REMITTANCE, remittance));
+    final List<Instruction> results = criteria.list();
+
+    if (results.size() > 0) {
+      setMyError(String.format(OBMessageUtils.messageBD("OBSEPA_BUSINESSPARTNER_NOSEPAINFO"),
+          results.get(0).getBusinessPartner().getIdentifier()));
+      return Boolean.FALSE;
+    }
+
+    if (StringUtils.isBlank(orgTaxId)) {
+      setMyError("NIFError");
+      return Boolean.FALSE;
+    }
+
     strFinancialAccountIBAN = remittance.getFinancialAccount().getIBAN();
     if (StringUtils.isBlank(strFinancialAccountIBAN)) {
       setMyError(String.format(OBMessageUtils.messageBD("OBSEPA_FINANCIALACCOUNT_NOIBAN"),
 
diff -ru org.openbravo.sepa.iso20022.ori/src-db/database/sourcedata/AD_MESSAGE.xml org.openbravo.sepa.iso20022/src-db/database/sourcedata/AD_MESSAGE.xml
--- org.openbravo.sepa.iso20022.ori/src-db/database/sourcedata/AD_MESSAGE.xml	2016-02-17 20:51:57.000000000 +0100
+++ org.openbravo.sepa.iso20022/src-db/database/sourcedata/AD_MESSAGE.xml	2016-05-18 16:35:19.444156332 +0200
@@ -48,6 +48,18 @@
 <!--4423CD636CC54D05B0D3590504CE1A91-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--4423CD636CC54D05B0D3590504CE1A91--></AD_MESSAGE>
 
+<!--493853CE644C4EBAADF3E8082421A2D8--><AD_MESSAGE>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <AD_MESSAGE_ID><![CDATA[493853CE644C4EBAADF3E8082421A2D8]]></AD_MESSAGE_ID>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <VALUE><![CDATA[OBSEPA_BUSINESSPARTNER_NOSEPAINFO]]></VALUE>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <MSGTEXT><![CDATA[No SEPA info defined for business partner %s]]></MSGTEXT>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <AD_MODULE_ID><![CDATA[01B694D083CD497885FD378173913694]]></AD_MODULE_ID>
+<!--493853CE644C4EBAADF3E8082421A2D8-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--493853CE644C4EBAADF3E8082421A2D8--></AD_MESSAGE>
+
 <!--4DE8FEA45D9749FD8EBA879A4E0023A2--><AD_MESSAGE>
 <!--4DE8FEA45D9749FD8EBA879A4E0023A2-->  <AD_MESSAGE_ID><![CDATA[4DE8FEA45D9749FD8EBA879A4E0023A2]]></AD_MESSAGE_ID>
 <!--4DE8FEA45D9749FD8EBA879A4E0023A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>