0039833: It should be possible to make the SEUR configuration at organization level instead of at client level

Description

It should be possible to make the SEUR configuration at organization level instead of at client level

Steps To Reproduce

As group admin role:
Go to 'Configuracion Integracion Seur' window and check you can only create one record on it and you cannot select the organization. If you try to save a second record you will get the following error message:

Saving failed. ERROR: duplicate key value violates unique constraint "obeuses_seur_conf_client_idx" Detail: Key (ad_client_id)=(...) already exists.

Tags

No tags attached.

Attached Files

seur.diff [^] (8,016 bytes) 2018-12-18 13:29 [Show Content] [Hide Content]

diff -ru org.openbravo.erputil.carrierintegration.seurspain/src/org/openbravo/erputil/carrierintegration/seurspain/SeurIntegration.java org.openbravo.erputil.carrierintegration.seurspain/src/org/openbravo/erputil/carrierintegration/seurspain/SeurIntegration.java
--- a/src/org/openbravo/erputil/carrierintegration/seurspain/SeurIntegration.java	2018-12-17 12:57:05.000000000 +0100
+++ b/src/org/openbravo/erputil/carrierintegration/seurspain/SeurIntegration.java	2018-12-17 17:52:46.329471000 +0100
@@ -33,14 +33,17 @@
 import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
+import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.util.Check;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.security.OrganizationStructureProvider;
+import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBDao;
 import org.openbravo.erputil.carrierintegration.CarrierIntegration;
 import org.openbravo.model.ad.access.User;
+import org.openbravo.model.ad.system.Client;
 import org.openbravo.model.common.businesspartner.BusinessPartner;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.model.common.geography.Location;
@@ -58,8 +61,7 @@
 
   public void init(Packing _pack) {
     super.init(_pack);
-    seurConf = pack.getOBEUCIFreight().getCarrier().getOBEUCICarrierIntegration()
-        .getOBEUSESSeurConfList().get(0);
+    seurConf = getSeurConf(pack.getOrganization(), pack.getClient());
 
   }
 
@@ -323,4 +325,18 @@
     }
     return delNotesBuffer.toString();
   }
+
+  private SeurConf getSeurConf(Organization org, Client client) {
+    OBCriteria<SeurConf> obcConf = OBDal.getInstance().createCriteria(SeurConf.ENTITY_NAME);
+    obcConf.add(Restrictions.eq(SeurConf.PROPERTY_ORGANIZATION, org));
+    obcConf.add(Restrictions.eq(SeurConf.PROPERTY_CLIENT, client));
+    obcConf.setFilterOnReadableClients(false);
+    obcConf.setFilterOnReadableOrganization(false);
+    obcConf.setMaxResults(1);
+    if (obcConf.uniqueResult() == null) {
+      return getSeurConf(new OrganizationStructureProvider().getParentOrg(org), client);
+    } else {
+      return (SeurConf) obcConf.uniqueResult();
+    }
+  }
 }
diff -ru org.openbravo.erputil.carrierintegration.seurspain/src-db/database/model/tables/OBEUSES_SEUR_CONF.xml org.openbravo.erputil.carrierintegration.seurspain/src-db/database/model/tables/OBEUSES_SEUR_CONF.xml
--- a/src-db/database/model/tables/OBEUSES_SEUR_CONF.xml	2018-12-17 12:57:05.000000000 +0100
+++ b/src-db/database/model/tables/OBEUSES_SEUR_CONF.xml	2018-12-18 08:22:52.568211000 +0100
@@ -98,9 +98,6 @@
       <foreign-key foreignTable="AD_ORG" name="OBEUSES_SEUR_CONF_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <index name="OBEUSES_SEUR_CONF_CLIENT_IDX" unique="true">
-        <index-column name="AD_CLIENT_ID"/>
-      </index>
       <check name="OBEUSES_SEUR_CONF_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
diff -ru org.openbravo.erputil.carrierintegration.seurspain/src-db/database/sourcedata/AD_FIELD.xml org.openbravo.erputil.carrierintegration.seurspain/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml	2018-12-17 12:57:05.000000000 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	2018-12-18 08:22:58.928194000 +0100
@@ -90,13 +90,14 @@
 <!--E5127A786D3224B1E040007F010011D0-->  <AD_TAB_ID><![CDATA[EAAF3C99321246A2B3A8EE5EB3A72A88]]></AD_TAB_ID>
 <!--E5127A786D3224B1E040007F010011D0-->  <AD_COLUMN_ID><![CDATA[E5014D4DA91FE43EE040007F01005F94]]></AD_COLUMN_ID>
 <!--E5127A786D3224B1E040007F010011D0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--E5127A786D3224B1E040007F010011D0-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--E5127A786D3224B1E040007F010011D0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--E5127A786D3224B1E040007F010011D0-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--E5127A786D3224B1E040007F010011D0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E5127A786D3224B1E040007F010011D0-->  <SEQNO><![CDATA[5]]></SEQNO>
 <!--E5127A786D3224B1E040007F010011D0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--E5127A786D3224B1E040007F010011D0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--E5127A786D3224B1E040007F010011D0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E5127A786D3224B1E040007F010011D0-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E5127A786D3224B1E040007F010011D0-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--E5127A786D3224B1E040007F010011D0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E5127A786D3224B1E040007F010011D0-->  <AD_MODULE_ID><![CDATA[413A85CB524442EA9EEAE00B4BD7EEB6]]></AD_MODULE_ID>
 <!--E5127A786D3224B1E040007F010011D0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
diff -ru org.openbravo.erputil.carrierintegration.seurspain/src-db/database/sourcedata/AD_MODULE.xml org.openbravo.erputil.carrierintegration.seurspain/src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml	2018-12-17 12:57:05.000000000 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	2018-12-18 08:22:58.924194000 +0100
@@ -21,7 +21,6 @@
 <!--413A85CB524442EA9EEAE00B4BD7EEB6-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--413A85CB524442EA9EEAE00B4BD7EEB6-->  <UPDATEINFO><![CDATA[Fixes issue 36677: Compilation error]]></UPDATEINFO>
 <!--413A85CB524442EA9EEAE00B4BD7EEB6-->  <ISCOMMERCIAL><![CDATA[Y]]></ISCOMMERCIAL>
-<!--413A85CB524442EA9EEAE00B4BD7EEB6-->  <COMMERCIAL_TIER><![CDATA[1]]></COMMERCIAL_TIER>
 <!--413A85CB524442EA9EEAE00B4BD7EEB6-->  <ISTRIALALLOWED><![CDATA[Y]]></ISTRIALALLOWED>
 <!--413A85CB524442EA9EEAE00B4BD7EEB6--></AD_MODULE>
 
diff -ru org.openbravo.erputil.carrierintegration.seurspain/src-db/database/sourcedata/AD_TABLE.xml org.openbravo.erputil.carrierintegration.seurspain/src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml	2018-12-17 12:57:05.000000000 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml	2018-12-18 08:22:58.932194000 +0100
@@ -9,7 +9,7 @@
 <!--3385A41D82A445B38D875A3377FD1240-->  <TABLENAME><![CDATA[OBEUSES_Seur_Conf]]></TABLENAME>
 <!--3385A41D82A445B38D875A3377FD1240-->  <CLASSNAME><![CDATA[SeurConf]]></CLASSNAME>
 <!--3385A41D82A445B38D875A3377FD1240-->  <ISVIEW><![CDATA[N]]></ISVIEW>
-<!--3385A41D82A445B38D875A3377FD1240-->  <ACCESSLEVEL><![CDATA[6]]></ACCESSLEVEL>
+<!--3385A41D82A445B38D875A3377FD1240-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--3385A41D82A445B38D875A3377FD1240-->  <AD_WINDOW_ID><![CDATA[00930AD3D8CE4FFA82F57CF341DA59CF]]></AD_WINDOW_ID>
 <!--3385A41D82A445B38D875A3377FD1240-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
 <!--3385A41D82A445B38D875A3377FD1240-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
diff -ru org.openbravo.erputil.carrierintegration.seurspain/src-db/database/sourcedata/AD_TAB.xml org.openbravo.erputil.carrierintegration.seurspain/src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml	2018-12-17 12:57:05.000000000 +0100
+++ b/src-db/database/sourcedata/AD_TAB.xml	2018-12-18 08:22:58.928194000 +0100
@@ -10,7 +10,7 @@
 <!--EAAF3C99321246A2B3A8EE5EB3A72A88-->  <AD_WINDOW_ID><![CDATA[00930AD3D8CE4FFA82F57CF341DA59CF]]></AD_WINDOW_ID>
 <!--EAAF3C99321246A2B3A8EE5EB3A72A88-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--EAAF3C99321246A2B3A8EE5EB3A72A88-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
-<!--EAAF3C99321246A2B3A8EE5EB3A72A88-->  <ISSINGLEROW><![CDATA[Y]]></ISSINGLEROW>
+<!--EAAF3C99321246A2B3A8EE5EB3A72A88-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
 <!--EAAF3C99321246A2B3A8EE5EB3A72A88-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
 <!--EAAF3C99321246A2B3A8EE5EB3A72A88-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
 <!--EAAF3C99321246A2B3A8EE5EB3A72A88-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>

Relationships [ Relation Graph ] [ Dependency Graph ]

related to

feature request

0031157

new

Triage Omni OMS

It would be nice to be able to define CCC per organization

Notes
(0108668) ngarcia (developer) 2018-12-18 13:29	Attached a possible patch provided by a partner

Issue History
Date Modified	Username	Field	Change
2018-12-18 13:29	ngarcia	New Issue
2018-12-18 13:29	ngarcia	Assigned To	=> Triage Finance
2018-12-18 13:29	ngarcia	File Added: seur.diff
2018-12-18 13:29	ngarcia	Note Added: 0108668
2018-12-18 13:30	ngarcia	Relationship added	related to 0031157
2018-12-18 13:34	ngarcia	Steps to Reproduce Updated	View Revisions
2018-12-18 13:37	ngarcia	Issue Monitored: networkb
2018-12-18 15:36	Practics	Issue Monitored: Practics