Fixes Issue 33650:Add columns in AD_Org table to persist data in order
authorAtul Gaware <atul.gaware@openbravo.com>
Thu, 26 Apr 2018 18:54:30 +0530
changeset 33886 55af0c670202
parent 33885 f3cb10dc3207
child 33887 793f3d0ba3f5
Fixes Issue 33650:Add columns in AD_Org table to persist data in order
to improve performance

** Add columns to store calendar owner org, period control allowed org,
legal entity org, business unit org and calendar of the period
control allowed org of the organization, Add field group and ready only
fields in organization window tab to show persist org information.
Field group is collapse by default.
** Added new function AD_ORG_GETCALENDAROWNERTN and
AD_ORG_GETPERIODCONTROLALLOWTN, AD_GET_ORG_LE_BU_TREENODE
from the original one with performance issues notes in it to only use
when organization are not set ready else use persist info from AD_Org
directly.
** Refactor AD_ORG_GETCALENDAROWNER, AD_ORG_GETPERIODCONTROLALLOW and
AD_GET_ORG_LE_BU to make use of respective new columns to use
AD_CALENDAROWNER_ORG_ID, AD_PERIODCONTROLALLOWED_ORG_ID,
AD_LEGALENTITY_ORG_ID or AD_BUSINESSUNIT_ORG_ID from AD_ORG directly.
** Modified AD_ORG_READY to set persist info columns in AD_ORG.
** To avoid triggers mutating error in oracle instance, instead of
calling directly functions to get persist org info in
update query, variables are used to get persist org info from ad_org
and then ad_org is updated.
** Modified AD_GET_ORG_LE_BU_TREENODE, remove condition
v_org_header_id<>'0' from while clause in p_type='BU' block.
src-db/database/model/functions/AD_GET_ORG_LE_BU.xml
src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml
src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml
src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml
src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml
src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml
src-db/database/model/functions/AD_ORG_READY.xml
src-db/database/model/tables/AD_ORG.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_FIELDGROUP.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/model/functions/AD_GET_ORG_LE_BU.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/model/functions/AD_GET_ORG_LE_BU.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -19,72 +19,43 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012-2014 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_org_header_id ad_org.ad_org_id%TYPE;
-  v_isbusinessunit ad_orgtype.isbusinessunit%TYPE := 'N';
-  v_islegalentity ad_orgtype.islegalentity%TYPE := 'N';
 
 BEGIN
-  v_org_header_id := p_org_id;
-  --Check if given org is legal entity or business unit
-  SELECT ot.islegalentity, ot.isbusinessunit
-    INTO v_islegalentity, v_isbusinessunit
-  FROM ad_org o JOIN ad_orgtype ot ON o.ad_orgtype_id = ot.ad_orgtype_id
-  WHERE o.ad_org_id = p_org_id;
-  -- Gets recursively the organization parent until finding a Business Unit or a Legal Entity
+  -- Gets a Business Unit or a Legal Entity from organization itself
   IF (p_type IS NULL) THEN
-    WHILE (v_isbusinessunit='N' AND v_islegalentity='N') LOOP
-      SELECT hh.parent_id, ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
-        INTO v_org_header_id, v_isbusinessunit, v_islegalentity
-      FROM ad_org
-          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
-          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
-                                 AND hh.ad_tree_id = pp.ad_tree_id
-      WHERE hh.node_id=v_org_header_id
-        AND ad_org.isready='Y'
-        AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.ad_table_id='155'
-                      AND hh.ad_tree_id=ad_tree.ad_tree_id
-                      AND hh.ad_client_id=ad_tree.ad_client_id);
-    END LOOP;
-  -- Gets recursively the organization parent until finding a Legal Entity
+    BEGIN
+      SELECT COALESCE(AD_BUSINESSUNIT_ORG_ID, AD_LEGALENTITY_ORG_ID)
+      INTO v_org_header_id
+      FROM AD_Org
+      WHERE AD_Org_ID = p_org_id;
+    EXCEPTION WHEN NO_DATA_FOUND THEN
+      v_org_header_id := NULL;
+    END;
+  -- Gets legal entity from the organization itself
   ELSIF (p_type='LE') THEN
-    WHILE (v_islegalentity='N') LOOP
-      SELECT hh.parent_id, ad_orgtype.islegalentity
-        INTO v_org_header_id, v_islegalentity
-      FROM ad_org
-          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
-          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
-                                 AND hh.ad_tree_id = pp.ad_tree_id
-      WHERE hh.node_id=v_org_header_id
-        AND ad_org.isready='Y'
-        AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.ad_table_id='155'
-                      AND hh.ad_tree_id=ad_tree.ad_tree_id
-                      AND hh.ad_client_id=ad_tree.ad_client_id);
-    END LOOP;
-    -- Gets recursively the organization parent until finding a Business Unit
+    BEGIN
+      SELECT AD_LEGALENTITY_ORG_ID
+      INTO v_org_header_id
+      FROM AD_Org
+      WHERE AD_Org_ID = p_org_id;
+    EXCEPTION WHEN NO_DATA_FOUND THEN
+      v_org_header_id := NULL;
+    END;
+    -- Gets a Business Unit from the organizartioh itself
   ELSIF (p_type='BU') THEN
-    WHILE (v_isbusinessunit='N' AND v_org_header_id<>'0') LOOP
-      SELECT hh.parent_id, ad_orgtype.isbusinessunit
-        INTO v_org_header_id, v_isbusinessunit
-      FROM ad_org
-          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
-          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
-                                 AND hh.ad_tree_id = pp.ad_tree_id
-      WHERE hh.node_id=v_org_header_id
-        AND ad_org.isready='Y'
-        AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.ad_table_id='155'
-                      AND hh.ad_tree_id=ad_tree.ad_tree_id
-                      AND hh.ad_client_id=ad_tree.ad_client_id);
-    END LOOP;
+    BEGIN
+      SELECT AD_BUSINESSUNIT_ORG_ID
+      INTO v_org_header_id
+      FROM AD_Org
+      WHERE AD_Org_ID = p_org_id;
+    EXCEPTION WHEN NO_DATA_FOUND THEN
+      v_org_header_id := NULL;
+    END;
   END IF;
 
   RETURN v_org_header_id;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION AD_GET_ORG_LE_BU_TREENODE">
+    <function name="AD_GET_ORG_LE_BU_TREENODE" type="VARCHAR">
+      <parameter name="p_org_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_type" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+/*
+* This function has very important performance issues and it should only
+* be used in flows involving organizations not set as ready yet.
+* For other flows it is highly recommended to use ad_legalentity_org_id or
+* ad_business_unit_id from ad_org directly as required.
+*/
+
+  v_org_header_id ad_org.ad_org_id%TYPE;
+  v_isbusinessunit ad_orgtype.isbusinessunit%TYPE := 'N';
+  v_islegalentity ad_orgtype.islegalentity%TYPE := 'N';
+
+BEGIN
+  v_org_header_id := p_org_id;
+  --Check if given org is legal entity or business unit
+  SELECT ot.islegalentity, ot.isbusinessunit
+    INTO v_islegalentity, v_isbusinessunit
+  FROM ad_org o JOIN ad_orgtype ot ON o.ad_orgtype_id = ot.ad_orgtype_id
+  WHERE o.ad_org_id = p_org_id;
+  -- Gets recursively the organization parent until finding a Business Unit or a Legal Entity
+  IF (p_type IS NULL) THEN
+    WHILE (v_isbusinessunit='N' AND v_islegalentity='N') LOOP
+      SELECT hh.parent_id, ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
+        INTO v_org_header_id, v_isbusinessunit, v_islegalentity
+      FROM ad_org
+          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
+          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
+          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
+                                 AND hh.ad_tree_id = pp.ad_tree_id
+      WHERE hh.node_id=v_org_header_id
+        AND ad_org.isready='Y'
+        AND EXISTS (SELECT 1 FROM ad_tree
+                    WHERE ad_tree.ad_table_id='155'
+                      AND hh.ad_tree_id=ad_tree.ad_tree_id
+                      AND hh.ad_client_id=ad_tree.ad_client_id);
+    END LOOP;
+  -- Gets recursively the organization parent until finding a Legal Entity
+  ELSIF (p_type='LE') THEN
+    WHILE (v_islegalentity='N') LOOP
+      SELECT hh.parent_id, ad_orgtype.islegalentity
+        INTO v_org_header_id, v_islegalentity
+      FROM ad_org
+          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
+          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
+          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
+                                 AND hh.ad_tree_id = pp.ad_tree_id
+      WHERE hh.node_id=v_org_header_id
+        AND ad_org.isready='Y'
+        AND EXISTS (SELECT 1 FROM ad_tree
+                    WHERE ad_tree.ad_table_id='155'
+                      AND hh.ad_tree_id=ad_tree.ad_tree_id
+                      AND hh.ad_client_id=ad_tree.ad_client_id);
+    END LOOP;
+    -- Gets recursively the organization parent until finding a Business Unit
+  ELSIF (p_type='BU') THEN
+    WHILE (v_isbusinessunit='N') LOOP
+      SELECT hh.parent_id, ad_orgtype.isbusinessunit
+        INTO v_org_header_id, v_isbusinessunit
+      FROM ad_org
+          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
+          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
+          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
+                                 AND hh.ad_tree_id = pp.ad_tree_id
+      WHERE hh.node_id=v_org_header_id
+        AND ad_org.isready='Y'
+        AND EXISTS (SELECT 1 FROM ad_tree
+                    WHERE ad_tree.ad_table_id='155'
+                      AND hh.ad_tree_id=ad_tree.ad_tree_id
+                      AND hh.ad_client_id=ad_tree.ad_client_id);
+    END LOOP;
+  END IF;
+
+  RETURN v_org_header_id;
+END AD_GET_ORG_LE_BU_TREENODE
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -16,56 +16,30 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2014 Openbravo SLU
+* All portions are Copyright (C) 2008-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
 /*
-* It returns the organization that owns the calendar for the p_organization Organization.
-* If no calendar is found, it returns NULL.
+* It returns the calendar owner organization of the p_organization Organization.
+* If calendar owner organization is not set, it returns NULL.
 */
 
-  v_calendar_id AD_Org.C_Calendar_ID%TYPE;  
-  v_parent_id ad_treenode.parent_id%TYPE;
-  v_node_id ad_treenode.parent_id%TYPE;
+  v_CalendarOwner_Org_ID AD_Org.AD_CalendarOwner_Org_ID%TYPE;
 
 BEGIN
-  SELECT C_Calendar_ID, AD_Org_ID
-  INTO v_calendar_id, v_parent_id
-  FROM AD_Org
-  WHERE AD_Org_ID=p_organization;
+
+  BEGIN
+    SELECT AD_CalendarOwner_Org_ID
+    INTO v_CalendarOwner_Org_ID
+    FROM AD_Org
+    WHERE AD_Org_ID=p_organization;
+  EXCEPTION WHEN NO_DATA_FOUND THEN
+    v_CalendarOwner_Org_ID := NULL;
+  END;
   
-  IF (v_calendar_id IS NOT NULL) THEN
-    RETURN v_parent_id;
-  ELSE
-    v_node_id:=p_organization;
-    WHILE ( v_parent_id <> '0' AND v_node_id <> '0' ) LOOP      
-      SELECT parent_id
-      INTO v_parent_id
-      FROM ad_treenode t
-      WHERE node_id=v_node_id
-      AND EXISTS (SELECT 1 
-                  FROM ad_tree, ad_org
-                  WHERE ad_tree.ad_client_id = ad_org.ad_client_id
-                  AND ad_tree.ad_client_id=t.ad_client_id
-                  AND ad_tree.ad_table_id='155'
-                  AND t.ad_tree_id=ad_tree.ad_tree_id
-                  );
-
-      SELECT C_Calendar_ID, AD_Org_ID
-      INTO v_calendar_id, v_parent_id
-      FROM AD_Org
-      WHERE AD_Org_ID=v_parent_id;
-      
-      IF (v_calendar_id IS NOT NULL) THEN
-        RETURN v_parent_id;
-      END IF;
-      
-      v_node_id:=v_parent_id;
-   END LOOP;
-END IF;
-RETURN NULL;
+  RETURN v_CalendarOwner_Org_ID;
 END AD_ORG_GETCALENDAROWNER
 ]]></body>
     </function>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION AD_ORG_GETCALENDAROWNERTN">
+    <function name="AD_ORG_GETCALENDAROWNERTN" type="VARCHAR">
+      <parameter name="p_organization" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2008-2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+/*
+* It returns the organization that owns the calendar for the p_organization Organization.
+* If no calendar is found, it returns NULL.
+*
+* This function has very important performance issues and it should only
+* be used in flows involving organizations not set as ready yet.
+* For other flows it is highly recommended to use ad_calendarowner_org_id
+* from ad_org directly.
+*/
+
+  v_calendar_id AD_Org.C_Calendar_ID%TYPE;
+  v_parent_id ad_treenode.parent_id%TYPE;
+  v_node_id ad_treenode.parent_id%TYPE;
+
+BEGIN
+  SELECT C_Calendar_ID, AD_Org_ID
+  INTO v_calendar_id, v_parent_id
+  FROM AD_Org
+  WHERE AD_Org_ID=p_organization;
+
+  IF (v_calendar_id IS NOT NULL) THEN
+    RETURN v_parent_id;
+  ELSE
+    v_node_id:=p_organization;
+    WHILE ( v_parent_id <> '0' AND v_node_id <> '0' ) LOOP
+      SELECT parent_id
+      INTO v_parent_id
+      FROM ad_treenode t
+      WHERE node_id=v_node_id
+      AND EXISTS (SELECT 1
+                  FROM ad_tree, ad_org
+                  WHERE ad_tree.ad_client_id = ad_org.ad_client_id
+                  AND ad_tree.ad_client_id=t.ad_client_id
+                  AND ad_tree.ad_table_id='155'
+                  AND t.ad_tree_id=ad_tree.ad_tree_id
+                  );
+
+      SELECT C_Calendar_ID, AD_Org_ID
+      INTO v_calendar_id, v_parent_id
+      FROM AD_Org
+      WHERE AD_Org_ID=v_parent_id;
+
+      IF (v_calendar_id IS NOT NULL) THEN
+        RETURN v_parent_id;
+      END IF;
+
+      v_node_id:=v_parent_id;
+   END LOOP;
+END IF;
+RETURN NULL;
+END AD_ORG_GETCALENDAROWNERTN
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -16,18 +16,17 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2009-2016 Openbravo SLU
+* All portions are Copyright (C) 2009-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
 /*
-* It returns the organization that is period control allowed for the p_organization Organization.
-* If no organization is found, it returns NULL.
+* It returns the period allowed organization of the p_organization Organization.
+* If period allowed organization is not set, it returns NULL.
 */
 
-  v_isperiodcontrolallowed AD_Org.IsPeriodControlAllowed%TYPE;  
-  v_parent_id ad_treenode.parent_id%TYPE;
+  v_periodcontrolallowed_org_id AD_Org.AD_periodcontrolallowed_org_id%TYPE;
 
 BEGIN
 
@@ -35,25 +34,16 @@
     RETURN NULL;
   END IF;
 
-  SELECT IsPeriodControlAllowed
-  INTO v_isperiodcontrolallowed
-  FROM AD_Org
-  WHERE AD_Org_ID=p_organization;
+  BEGIN
+    SELECT AD_periodcontrolallowed_org_id
+    INTO v_periodcontrolallowed_org_id
+    FROM AD_Org
+    WHERE AD_Org_ID = p_organization;
+  EXCEPTION WHEN NO_DATA_FOUND THEN
+    v_periodcontrolallowed_org_id := NULL;
+  END;
   
-  IF (v_isperiodcontrolallowed='Y') THEN
-    RETURN p_organization;
-  ELSIF (p_organization='0') THEN
-    RETURN NULL;
-  ELSE
-    SELECT tn.parent_id
-    INTO v_parent_id
-    FROM ad_tree t JOIN ad_treenode tn
-    ON t.ad_tree_id = tn.ad_tree_id
-    WHERE tn.node_id=p_organization
-    AND t.ad_table_id='155';
-    RETURN ad_org_getperiodcontrolallow(v_parent_id);
-  END IF;
-RETURN NULL;
+RETURN v_periodcontrolallowed_org_id;
 END AD_ORG_GETPERIODCONTROLALLOW
 ]]></body>
     </function>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION AD_ORG_GETPERIODCONTROLALLOWTN">
+    <function name="AD_ORG_GETPERIODCONTROLALLOWTN" type="VARCHAR">
+      <parameter name="p_organization" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2009-2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+/*
+* It returns the organization that is period control allowed for the p_organization Organization.
+* If no organization is found, it returns NULL.
+*
+* This function has very important performance issues and it should only
+* be used in flows involving organizations not set as ready yet.
+* For other flows it is highly recommended to use ad_periodcontrolallowed_org_id
+* from AD_ORG directly.
+*/
+
+  v_isperiodcontrolallowed AD_Org.IsPeriodControlAllowed%TYPE;
+  v_parent_id ad_treenode.parent_id%TYPE;
+
+BEGIN
+
+  IF (p_organization IS NULL) THEN
+    RETURN NULL;
+  END IF;
+
+  SELECT IsPeriodControlAllowed
+  INTO v_isperiodcontrolallowed
+  FROM AD_Org
+  WHERE AD_Org_ID=p_organization;
+
+  IF (v_isperiodcontrolallowed='Y') THEN
+    RETURN p_organization;
+  ELSIF (p_organization='0') THEN
+    RETURN NULL;
+  ELSE
+    SELECT tn.parent_id
+    INTO v_parent_id
+    FROM ad_tree t JOIN ad_treenode tn
+    ON t.ad_tree_id = tn.ad_tree_id
+    WHERE tn.node_id=p_organization
+    AND t.ad_table_id='155';
+    RETURN ad_org_getperiodcontrolallowtn(v_parent_id);
+  END IF;
+RETURN NULL;
+END AD_ORG_GETPERIODCONTROLALLOWTN
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/functions/AD_ORG_READY.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/model/functions/AD_ORG_READY.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2017 Openbravo SLU
+* All portions are Copyright (C) 2008-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -30,6 +30,12 @@
   v_isperiodcontrol AD_Org.IsPeriodControlAllowed%TYPE;
   v_calendar_id AD_Org.C_Calendar_ID%TYPE;
 
+  v_PeriodControlAllowed_Org_ID AD_Org.AD_PeriodControlAllowed_Org_ID%TYPE;
+  v_CalendarOwner_Org_ID AD_Org.AD_CalendarOwner_Org_ID%TYPE;
+  v_InheritedCalendar_ID AD_Org.AD_InheritedCalendar_ID%TYPE;
+  v_LegalEntity_Org_ID AD_Org.AD_LegalEntity_Org_ID%TYPE;
+  v_BusinessUnit_Org_ID AD_Org.AD_BusinessUnit_Org_ID%TYPE;
+
   v_num NUMBER; 
   TYPE RECORD IS REF CURSOR;
   Cur_Parameter RECORD;
@@ -149,6 +155,49 @@
         where (oc.ad_client_id = op.ad_client_id or op.ad_org_id = '0')
         and oc.ad_org_id = Cur_Org.AD_Org_ID
         and ad_isorgincluded_treenode(oc.ad_org_id, op.ad_org_id, oc.ad_client_id) > 0;
+
+        -- Get Persist Information for organization
+        BEGIN
+          v_PeriodControlAllowed_Org_ID := ad_org_getperiodcontrolallowtn(Cur_Org.AD_Org_ID);
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_PeriodControlAllowed_Org_ID := NULL;
+        END;
+        BEGIN
+          v_CalendarOwner_Org_ID := ad_org_getcalendarownertn(Cur_Org.AD_Org_ID);
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_CalendarOwner_Org_ID := NULL;
+        END;
+        IF(v_CalendarOwner_Org_ID IS NOT NULL) THEN
+          BEGIN
+            SELECT c_calendar_id
+            INTO v_InheritedCalendar_ID
+            FROM AD_ORG
+            WHERE AD_ORG_ID = v_CalendarOwner_Org_ID;
+          EXCEPTION WHEN NO_DATA_FOUND THEN
+            v_InheritedCalendar_ID := NULL;
+          END;
+        ELSE
+          v_InheritedCalendar_ID := NULL;
+        END IF;
+        BEGIN
+          v_LegalEntity_Org_ID := ad_get_org_le_bu_treenode(Cur_Org.AD_Org_ID, 'LE');
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_LegalEntity_Org_ID := NULL;
+        END;
+        BEGIN
+          v_BusinessUnit_Org_ID := ad_get_org_le_bu_treenode(Cur_Org.AD_Org_ID, 'BU');
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_BusinessUnit_Org_ID := NULL;
+        END;
+
+        -- Set Persist Org Information
+        UPDATE AD_ORG
+        SET AD_PeriodControlAllowed_Org_ID = v_PeriodControlAllowed_Org_ID,
+            AD_CalendarOwner_Org_ID = v_CalendarOwner_Org_ID,
+            AD_InheritedCalendar_ID = v_InheritedCalendar_ID,
+            AD_LegalEntity_Org_ID = v_LegalEntity_Org_ID,
+            AD_BusinessUnit_Org_ID = v_BusinessUnit_Org_ID
+        WHERE AD_ORG_ID=Cur_Org.AD_Org_ID;
       END LOOP;
     ELSE 
       INSERT INTO ad_org_tree
@@ -167,6 +216,49 @@
       where (oc.ad_client_id = op.ad_client_id or op.ad_org_id = '0')
       and oc.ad_org_id = v_Record_ID
       and ad_isorgincluded_treenode(oc.ad_org_id, op.ad_org_id, oc.ad_client_id) > 0;
+
+      -- Get Persist Information for organization
+      BEGIN
+        v_PeriodControlAllowed_Org_ID := ad_org_getperiodcontrolallowtn(v_Record_ID);
+      EXCEPTION WHEN NO_DATA_FOUND THEN
+        v_PeriodControlAllowed_Org_ID := NULL;
+      END;
+      BEGIN
+        v_CalendarOwner_Org_ID := ad_org_getcalendarownertn(v_Record_ID);
+      EXCEPTION WHEN NO_DATA_FOUND THEN
+        v_CalendarOwner_Org_ID := NULL;
+      END;
+      IF(v_CalendarOwner_Org_ID IS NOT NULL) THEN
+        BEGIN
+          SELECT c_calendar_id
+          INTO v_InheritedCalendar_ID
+          FROM AD_ORG
+          WHERE AD_ORG_ID = v_CalendarOwner_Org_ID;
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_InheritedCalendar_ID := NULL;
+        END;
+      ELSE
+        v_InheritedCalendar_ID := NULL;
+      END IF;
+      BEGIN
+        v_LegalEntity_Org_ID := ad_get_org_le_bu_treenode(v_Record_ID, 'LE');
+      EXCEPTION WHEN NO_DATA_FOUND THEN
+        v_LegalEntity_Org_ID := NULL;
+      END;
+      BEGIN
+        v_BusinessUnit_Org_ID := ad_get_org_le_bu_treenode(v_Record_ID, 'BU');
+      EXCEPTION WHEN NO_DATA_FOUND THEN
+        v_BusinessUnit_Org_ID := NULL;
+      END;
+
+      -- Set Persist Org Information
+      UPDATE AD_ORG
+      SET AD_PeriodControlAllowed_Org_ID = v_PeriodControlAllowed_Org_ID,
+          AD_CalendarOwner_Org_ID = v_CalendarOwner_Org_ID,
+          AD_InheritedCalendar_ID = v_InheritedCalendar_ID,
+          AD_LegalEntity_Org_ID = v_LegalEntity_Org_ID,
+          AD_BusinessUnit_Org_ID = v_BusinessUnit_Org_ID
+      WHERE AD_ORG_ID = v_Record_ID;
     END IF;
     
     -- Create PeriodControl for the organization
--- a/src-db/database/model/tables/AD_ORG.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/model/tables/AD_ORG.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -73,12 +73,35 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="AD_PERIODCONTROLALLOWED_ORG_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CALENDAROWNER_ORG_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_LEGALENTITY_ORG_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_INHERITEDCALENDAR_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_BUSINESSUNIT_ORG_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_ORG_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_ORGTYPE" name="AD_ORG_AD_ORGTYPE">
         <reference local="AD_ORGTYPE_ID" foreign="AD_ORGTYPE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_BUSINESSUNIT_ORG">
+        <reference local="AD_BUSINESSUNIT_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="AD_ORG_C_ACCTSCHEMA_">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
@@ -88,6 +111,18 @@
       <foreign-key foreignTable="C_CURRENCY" name="AD_ORG_C_CURRENCY">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_CALENDAROWNER_ORG">
+        <reference local="AD_CALENDAROWNER_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_CALENDAR" name="AD_ORG_INHERITEDCALENDAR">
+        <reference local="AD_INHERITEDCALENDAR_ID" foreign="C_CALENDAR_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_LEGALENTITY_ORG">
+        <reference local="AD_LEGALENTITY_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_PERIODCNTRLALLOWED_ORG">
+        <reference local="AD_PERIODCONTROLALLOWED_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <unique name="AD_ORG_VALUE">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="VALUE"/>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -258575,6 +258575,45 @@
 <!--3243D34AA7E9477A95A5AFF70824363B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3243D34AA7E9477A95A5AFF70824363B--></AD_COLUMN>
 
+<!--3244C11EC50745D092859E2545903F63--><AD_COLUMN>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_COLUMN_ID><![CDATA[3244C11EC50745D092859E2545903F63]]></AD_COLUMN_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3244C11EC50745D092859E2545903F63-->  <NAME><![CDATA[Calendar Owner Organization]]></NAME>
+<!--3244C11EC50745D092859E2545903F63-->  <DESCRIPTION><![CDATA[Organization that owns Calendar.]]></DESCRIPTION>
+<!--3244C11EC50745D092859E2545903F63-->  <HELP><![CDATA[Organization that owns Calendar.]]></HELP>
+<!--3244C11EC50745D092859E2545903F63-->  <COLUMNNAME><![CDATA[AD_Calendarowner_Org_ID]]></COLUMNNAME>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_REFERENCE_VALUE_ID><![CDATA[61CACA7F5C61466BB42C391BBD6156A0]]></AD_REFERENCE_VALUE_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--3244C11EC50745D092859E2545903F63-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3244C11EC50745D092859E2545903F63-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3244C11EC50745D092859E2545903F63-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3244C11EC50745D092859E2545903F63-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3244C11EC50745D092859E2545903F63-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3244C11EC50745D092859E2545903F63-->  <SEQNO><![CDATA[101]]></SEQNO>
+<!--3244C11EC50745D092859E2545903F63-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3244C11EC50745D092859E2545903F63-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3244C11EC50745D092859E2545903F63-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_ELEMENT_ID><![CDATA[863D7D80A3F04CC484A19C35985C1D8B]]></AD_ELEMENT_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3244C11EC50745D092859E2545903F63-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3244C11EC50745D092859E2545903F63-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3244C11EC50745D092859E2545903F63-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <POSITION><![CDATA[21]]></POSITION>
+<!--3244C11EC50745D092859E2545903F63-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3244C11EC50745D092859E2545903F63-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3244C11EC50745D092859E2545903F63-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3244C11EC50745D092859E2545903F63-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3244C11EC50745D092859E2545903F63-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3244C11EC50745D092859E2545903F63-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3244C11EC50745D092859E2545903F63-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3244C11EC50745D092859E2545903F63-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3244C11EC50745D092859E2545903F63--></AD_COLUMN>
+
 <!--3244FF12369C49EE94E566544632B322--><AD_COLUMN>
 <!--3244FF12369C49EE94E566544632B322-->  <AD_COLUMN_ID><![CDATA[3244FF12369C49EE94E566544632B322]]></AD_COLUMN_ID>
 <!--3244FF12369C49EE94E566544632B322-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -260194,6 +260233,45 @@
 <!--3751D2030B554E19B2D10ADB4A0CB4E3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3751D2030B554E19B2D10ADB4A0CB4E3--></AD_COLUMN>
 
+<!--37569B3F7BE447F3ACB229779A6E95EB--><AD_COLUMN>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_COLUMN_ID><![CDATA[37569B3F7BE447F3ACB229779A6E95EB]]></AD_COLUMN_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <NAME><![CDATA[Business Unit Organization]]></NAME>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <DESCRIPTION><![CDATA[Business Unit Organization.]]></DESCRIPTION>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <HELP><![CDATA[Business Unit Organization.]]></HELP>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <COLUMNNAME><![CDATA[AD_Businessunit_Org_ID]]></COLUMNNAME>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_REFERENCE_VALUE_ID><![CDATA[61CACA7F5C61466BB42C391BBD6156A0]]></AD_REFERENCE_VALUE_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <SEQNO><![CDATA[131]]></SEQNO>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_ELEMENT_ID><![CDATA[2F541B681F3C4E088CADA65E873B6223]]></AD_ELEMENT_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <POSITION><![CDATA[24]]></POSITION>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--37569B3F7BE447F3ACB229779A6E95EB--></AD_COLUMN>
+
 <!--375A28ECA5344160A8656D0D368ADC2D--><AD_COLUMN>
 <!--375A28ECA5344160A8656D0D368ADC2D-->  <AD_COLUMN_ID><![CDATA[375A28ECA5344160A8656D0D368ADC2D]]></AD_COLUMN_ID>
 <!--375A28ECA5344160A8656D0D368ADC2D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -265951,7 +266029,7 @@
 <!--4A0964E5760F4746B324BDBA16B8D1CB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4A0964E5760F4746B324BDBA16B8D1CB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4A0964E5760F4746B324BDBA16B8D1CB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4A0964E5760F4746B324BDBA16B8D1CB-->  <POSITION><![CDATA[19]]></POSITION>
+<!--4A0964E5760F4746B324BDBA16B8D1CB-->  <POSITION><![CDATA[18]]></POSITION>
 <!--4A0964E5760F4746B324BDBA16B8D1CB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4A0964E5760F4746B324BDBA16B8D1CB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4A0964E5760F4746B324BDBA16B8D1CB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -297846,6 +297924,45 @@
 <!--70C8CAD9B93245F6AE219E6075017CE9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--70C8CAD9B93245F6AE219E6075017CE9--></AD_COLUMN>
 
+<!--7172CA9FB18A4BEAA9E0594891BE2A35--><AD_COLUMN>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <AD_COLUMN_ID><![CDATA[7172CA9FB18A4BEAA9E0594891BE2A35]]></AD_COLUMN_ID>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <NAME><![CDATA[Inherited Calendar]]></NAME>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <DESCRIPTION><![CDATA[Inerited Calendar from the organization that owns it.]]></DESCRIPTION>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <HELP><![CDATA[Inerited Calendar from the organization that owns it.]]></HELP>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <COLUMNNAME><![CDATA[AD_Inheritedcalendar_ID]]></COLUMNNAME>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <AD_REFERENCE_VALUE_ID><![CDATA[82C7F2AD834B493083D5DDAE50A01D0D]]></AD_REFERENCE_VALUE_ID>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <SEQNO><![CDATA[121]]></SEQNO>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <AD_ELEMENT_ID><![CDATA[9D3B8EABD25B4E4CBA29AAED63E0E94D]]></AD_ELEMENT_ID>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <POSITION><![CDATA[23]]></POSITION>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--7172CA9FB18A4BEAA9E0594891BE2A35--></AD_COLUMN>
+
 <!--71AFEF88D0834FC385C7BC6ABD4F25A2--><AD_COLUMN>
 <!--71AFEF88D0834FC385C7BC6ABD4F25A2-->  <AD_COLUMN_ID><![CDATA[71AFEF88D0834FC385C7BC6ABD4F25A2]]></AD_COLUMN_ID>
 <!--71AFEF88D0834FC385C7BC6ABD4F25A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -334204,6 +334321,45 @@
 <!--987BF58466FB407EA4A5EB7F7F1B11CC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--987BF58466FB407EA4A5EB7F7F1B11CC--></AD_COLUMN>
 
+<!--9883DA921CEC4A71A2F76D0DDD4813F2--><AD_COLUMN>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <AD_COLUMN_ID><![CDATA[9883DA921CEC4A71A2F76D0DDD4813F2]]></AD_COLUMN_ID>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <NAME><![CDATA[Legal Entity Organization]]></NAME>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <DESCRIPTION><![CDATA[Legal Entity Organization.]]></DESCRIPTION>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <HELP><![CDATA[Legal Entity Organization.]]></HELP>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <COLUMNNAME><![CDATA[AD_Legalentity_Org_ID]]></COLUMNNAME>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <AD_REFERENCE_VALUE_ID><![CDATA[61CACA7F5C61466BB42C391BBD6156A0]]></AD_REFERENCE_VALUE_ID>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <SEQNO><![CDATA[111]]></SEQNO>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <AD_ELEMENT_ID><![CDATA[00CCD57E93CE4D9AB39988F36EDD9983]]></AD_ELEMENT_ID>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <POSITION><![CDATA[22]]></POSITION>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9883DA921CEC4A71A2F76D0DDD4813F2--></AD_COLUMN>
+
 <!--988DDF8878424BE68943B53276219D7C--><AD_COLUMN>
 <!--988DDF8878424BE68943B53276219D7C-->  <AD_COLUMN_ID><![CDATA[988DDF8878424BE68943B53276219D7C]]></AD_COLUMN_ID>
 <!--988DDF8878424BE68943B53276219D7C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -382128,6 +382284,45 @@
 <!--F910957537C54ECDAABA85427DEFFF4F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F910957537C54ECDAABA85427DEFFF4F--></AD_COLUMN>
 
+<!--F93CEC78B36548BABBBAB704B9CE9866--><AD_COLUMN>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <AD_COLUMN_ID><![CDATA[F93CEC78B36548BABBBAB704B9CE9866]]></AD_COLUMN_ID>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <NAME><![CDATA[Period Control Allowed Organization]]></NAME>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <DESCRIPTION><![CDATA[Organizarion that has Period Control Allowed flag true.]]></DESCRIPTION>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <HELP><![CDATA[Organizarion that has Period Control Allowed flag true.]]></HELP>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <COLUMNNAME><![CDATA[AD_Periodcontrolallowed_Org_ID]]></COLUMNNAME>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <AD_REFERENCE_VALUE_ID><![CDATA[61CACA7F5C61466BB42C391BBD6156A0]]></AD_REFERENCE_VALUE_ID>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <SEQNO><![CDATA[91]]></SEQNO>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <AD_ELEMENT_ID><![CDATA[1BCD267810A349B085E52A26C11F4768]]></AD_ELEMENT_ID>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <POSITION><![CDATA[20]]></POSITION>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F93CEC78B36548BABBBAB704B9CE9866-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--F93CEC78B36548BABBBAB704B9CE9866--></AD_COLUMN>
+
 <!--F9AFAE3531384151BCC1008E5160108E--><AD_COLUMN>
 <!--F9AFAE3531384151BCC1008E5160108E-->  <AD_COLUMN_ID><![CDATA[F9AFAE3531384151BCC1008E5160108E]]></AD_COLUMN_ID>
 <!--F9AFAE3531384151BCC1008E5160108E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -20665,6 +20665,20 @@
 <!--005AE3B9D4E73F7BE050007F010019F4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--005AE3B9D4E73F7BE050007F010019F4--></AD_ELEMENT>
 
+<!--00CCD57E93CE4D9AB39988F36EDD9983--><AD_ELEMENT>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <AD_ELEMENT_ID><![CDATA[00CCD57E93CE4D9AB39988F36EDD9983]]></AD_ELEMENT_ID>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <COLUMNNAME><![CDATA[AD_Legalentity_Org_ID]]></COLUMNNAME>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <NAME><![CDATA[Legal Entity Organization]]></NAME>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <PRINTNAME><![CDATA[Legal Entity Organization]]></PRINTNAME>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <DESCRIPTION><![CDATA[Legal Entity Organization.]]></DESCRIPTION>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <HELP><![CDATA[Legal Entity Organization.]]></HELP>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--00CCD57E93CE4D9AB39988F36EDD9983-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--00CCD57E93CE4D9AB39988F36EDD9983--></AD_ELEMENT>
+
 <!--00FC088B51CB944FE050007F01001D28--><AD_ELEMENT>
 <!--00FC088B51CB944FE050007F01001D28-->  <AD_ELEMENT_ID><![CDATA[00FC088B51CB944FE050007F01001D28]]></AD_ELEMENT_ID>
 <!--00FC088B51CB944FE050007F01001D28-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21809,6 +21823,20 @@
 <!--1B0CF5AAAD40140FE0530100007F2562-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--1B0CF5AAAD40140FE0530100007F2562--></AD_ELEMENT>
 
+<!--1BCD267810A349B085E52A26C11F4768--><AD_ELEMENT>
+<!--1BCD267810A349B085E52A26C11F4768-->  <AD_ELEMENT_ID><![CDATA[1BCD267810A349B085E52A26C11F4768]]></AD_ELEMENT_ID>
+<!--1BCD267810A349B085E52A26C11F4768-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1BCD267810A349B085E52A26C11F4768-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1BCD267810A349B085E52A26C11F4768-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1BCD267810A349B085E52A26C11F4768-->  <COLUMNNAME><![CDATA[AD_Periodcontrolallowed_Org_ID]]></COLUMNNAME>
+<!--1BCD267810A349B085E52A26C11F4768-->  <NAME><![CDATA[Period Control Allowed Organization]]></NAME>
+<!--1BCD267810A349B085E52A26C11F4768-->  <PRINTNAME><![CDATA[Period Control Allowed Organization]]></PRINTNAME>
+<!--1BCD267810A349B085E52A26C11F4768-->  <DESCRIPTION><![CDATA[Organizarion that has Period Control Allowed flag true.]]></DESCRIPTION>
+<!--1BCD267810A349B085E52A26C11F4768-->  <HELP><![CDATA[Organizarion that has Period Control Allowed flag true.]]></HELP>
+<!--1BCD267810A349B085E52A26C11F4768-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1BCD267810A349B085E52A26C11F4768-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--1BCD267810A349B085E52A26C11F4768--></AD_ELEMENT>
+
 <!--1C5C8314A52C45819097381E72843369--><AD_ELEMENT>
 <!--1C5C8314A52C45819097381E72843369-->  <AD_ELEMENT_ID><![CDATA[1C5C8314A52C45819097381E72843369]]></AD_ELEMENT_ID>
 <!--1C5C8314A52C45819097381E72843369-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22479,6 +22507,20 @@
 <!--2F2385413E274261B676F03418827B81-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--2F2385413E274261B676F03418827B81--></AD_ELEMENT>
 
+<!--2F541B681F3C4E088CADA65E873B6223--><AD_ELEMENT>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <AD_ELEMENT_ID><![CDATA[2F541B681F3C4E088CADA65E873B6223]]></AD_ELEMENT_ID>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <COLUMNNAME><![CDATA[AD_Businessunit_Org_ID]]></COLUMNNAME>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <NAME><![CDATA[Business Unit Organization]]></NAME>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <PRINTNAME><![CDATA[Business Unit Organization]]></PRINTNAME>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <DESCRIPTION><![CDATA[Business Unit Organization.]]></DESCRIPTION>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <HELP><![CDATA[Business Unit Organization.]]></HELP>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2F541B681F3C4E088CADA65E873B6223-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--2F541B681F3C4E088CADA65E873B6223--></AD_ELEMENT>
+
 <!--2F6F56A8E2D54146958358312EB2CDD7--><AD_ELEMENT>
 <!--2F6F56A8E2D54146958358312EB2CDD7-->  <AD_ELEMENT_ID><![CDATA[2F6F56A8E2D54146958358312EB2CDD7]]></AD_ELEMENT_ID>
 <!--2F6F56A8E2D54146958358312EB2CDD7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -29187,6 +29229,20 @@
 <!--85CB18B5AB81403889F19977C22B5561-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--85CB18B5AB81403889F19977C22B5561--></AD_ELEMENT>
 
+<!--863D7D80A3F04CC484A19C35985C1D8B--><AD_ELEMENT>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <AD_ELEMENT_ID><![CDATA[863D7D80A3F04CC484A19C35985C1D8B]]></AD_ELEMENT_ID>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <COLUMNNAME><![CDATA[AD_Calendarowner_Org_ID]]></COLUMNNAME>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <NAME><![CDATA[Calendar Owner Organization]]></NAME>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <PRINTNAME><![CDATA[Calendar Owner Organization]]></PRINTNAME>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <DESCRIPTION><![CDATA[Organization that owns Calendar.]]></DESCRIPTION>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <HELP><![CDATA[Organization that owns Calendar.]]></HELP>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--863D7D80A3F04CC484A19C35985C1D8B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--863D7D80A3F04CC484A19C35985C1D8B--></AD_ELEMENT>
+
 <!--86DF1B3B331B03FEE040007F0101757D--><AD_ELEMENT>
 <!--86DF1B3B331B03FEE040007F0101757D-->  <AD_ELEMENT_ID><![CDATA[86DF1B3B331B03FEE040007F0101757D]]></AD_ELEMENT_ID>
 <!--86DF1B3B331B03FEE040007F0101757D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30834,6 +30890,20 @@
 <!--9D376EF8B99B40C88E4D2D2A172DE6A8-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9D376EF8B99B40C88E4D2D2A172DE6A8--></AD_ELEMENT>
 
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D--><AD_ELEMENT>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <AD_ELEMENT_ID><![CDATA[9D3B8EABD25B4E4CBA29AAED63E0E94D]]></AD_ELEMENT_ID>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <COLUMNNAME><![CDATA[AD_Inheritedcalendar_ID]]></COLUMNNAME>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <NAME><![CDATA[Inherited Calendar]]></NAME>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <PRINTNAME><![CDATA[Inherited Calendar]]></PRINTNAME>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <DESCRIPTION><![CDATA[Inerited Calendar from the organization that owns it.]]></DESCRIPTION>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <HELP><![CDATA[Inerited Calendar from the organization that owns it.]]></HELP>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--9D3B8EABD25B4E4CBA29AAED63E0E94D--></AD_ELEMENT>
+
 <!--9D7068CB699374C8E040007F01004A16--><AD_ELEMENT>
 <!--9D7068CB699374C8E040007F01004A16-->  <AD_ELEMENT_ID><![CDATA[9D7068CB699374C8E040007F01004A16]]></AD_ELEMENT_ID>
 <!--9D7068CB699374C8E040007F01004A16-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -210491,6 +210491,36 @@
 <!--4C130F137CB840559B2B372342B535AA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4C130F137CB840559B2B372342B535AA--></AD_FIELD>
 
+<!--4C19EB548FE342E18BB22B673FBF534D--><AD_FIELD>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <AD_FIELD_ID><![CDATA[4C19EB548FE342E18BB22B673FBF534D]]></AD_FIELD_ID>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <NAME><![CDATA[Calendar Owner Organization]]></NAME>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <DESCRIPTION><![CDATA[Organization that owns Calendar.]]></DESCRIPTION>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <HELP><![CDATA[Organization that owns Calendar.]]></HELP>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <AD_COLUMN_ID><![CDATA[3244C11EC50745D092859E2545903F63]]></AD_COLUMN_ID>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <AD_FIELDGROUP_ID><![CDATA[DD3AC8569DF44BA0A192B2A88AE50E71]]></AD_FIELDGROUP_ID>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <DISPLAYLOGIC><![CDATA[@IsReady@='Y']]></DISPLAYLOGIC>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <SEQNO><![CDATA[126]]></SEQNO>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4C19EB548FE342E18BB22B673FBF534D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4C19EB548FE342E18BB22B673FBF534D--></AD_FIELD>
+
 <!--4C37F163BA0845D5B082D039FA3D6DCE--><AD_FIELD>
 <!--4C37F163BA0845D5B082D039FA3D6DCE-->  <AD_FIELD_ID><![CDATA[4C37F163BA0845D5B082D039FA3D6DCE]]></AD_FIELD_ID>
 <!--4C37F163BA0845D5B082D039FA3D6DCE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -233751,6 +233781,36 @@
 <!--6D545E73EBA747568F7F2C8FBBD1EFB3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6D545E73EBA747568F7F2C8FBBD1EFB3--></AD_FIELD>
 
+<!--6D5BDDAB88C7497FB27E65CA274311C6--><AD_FIELD>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <AD_FIELD_ID><![CDATA[6D5BDDAB88C7497FB27E65CA274311C6]]></AD_FIELD_ID>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <NAME><![CDATA[Business Unit Organization]]></NAME>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <DESCRIPTION><![CDATA[Business Unit Organization.]]></DESCRIPTION>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <HELP><![CDATA[Business Unit Organization.]]></HELP>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <AD_COLUMN_ID><![CDATA[37569B3F7BE447F3ACB229779A6E95EB]]></AD_COLUMN_ID>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <AD_FIELDGROUP_ID><![CDATA[DD3AC8569DF44BA0A192B2A88AE50E71]]></AD_FIELDGROUP_ID>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <DISPLAYLOGIC><![CDATA[@IsReady@='Y']]></DISPLAYLOGIC>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <SEQNO><![CDATA[156]]></SEQNO>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6D5BDDAB88C7497FB27E65CA274311C6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6D5BDDAB88C7497FB27E65CA274311C6--></AD_FIELD>
+
 <!--6D5E467705E94EAFBCCB1E33EF199BEF--><AD_FIELD>
 <!--6D5E467705E94EAFBCCB1E33EF199BEF-->  <AD_FIELD_ID><![CDATA[6D5E467705E94EAFBCCB1E33EF199BEF]]></AD_FIELD_ID>
 <!--6D5E467705E94EAFBCCB1E33EF199BEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -265161,6 +265221,36 @@
 <!--9ED2829B9F3848CF9627B1551866AB7B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9ED2829B9F3848CF9627B1551866AB7B--></AD_FIELD>
 
+<!--9ED97C3F927347D7BFC4375D919BFAEA--><AD_FIELD>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <AD_FIELD_ID><![CDATA[9ED97C3F927347D7BFC4375D919BFAEA]]></AD_FIELD_ID>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <NAME><![CDATA[Period Control Allowed Organization]]></NAME>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <DESCRIPTION><![CDATA[Organizarion that has Period Control Allowed flag true.]]></DESCRIPTION>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <HELP><![CDATA[Organizarion that has Period Control Allowed flag true.]]></HELP>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <AD_COLUMN_ID><![CDATA[F93CEC78B36548BABBBAB704B9CE9866]]></AD_COLUMN_ID>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <AD_FIELDGROUP_ID><![CDATA[DD3AC8569DF44BA0A192B2A88AE50E71]]></AD_FIELDGROUP_ID>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <DISPLAYLOGIC><![CDATA[@IsReady@='Y']]></DISPLAYLOGIC>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <SEQNO><![CDATA[116]]></SEQNO>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9ED97C3F927347D7BFC4375D919BFAEA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9ED97C3F927347D7BFC4375D919BFAEA--></AD_FIELD>
+
 <!--9EDB7E1D73A64E1F98E9586F895A42C4--><AD_FIELD>
 <!--9EDB7E1D73A64E1F98E9586F895A42C4-->  <AD_FIELD_ID><![CDATA[9EDB7E1D73A64E1F98E9586F895A42C4]]></AD_FIELD_ID>
 <!--9EDB7E1D73A64E1F98E9586F895A42C4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -266093,6 +266183,36 @@
 <!--A0C386D266E44E0C9D53190AEA7211A9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A0C386D266E44E0C9D53190AEA7211A9--></AD_FIELD>
 
+<!--A0C504C68F094EC388AE177C0B5A393D--><AD_FIELD>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <AD_FIELD_ID><![CDATA[A0C504C68F094EC388AE177C0B5A393D]]></AD_FIELD_ID>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <NAME><![CDATA[Legal Entity Organization]]></NAME>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <DESCRIPTION><![CDATA[Legal Entity Organization.]]></DESCRIPTION>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <HELP><![CDATA[Legal Entity Organization.]]></HELP>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <AD_COLUMN_ID><![CDATA[9883DA921CEC4A71A2F76D0DDD4813F2]]></AD_COLUMN_ID>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <AD_FIELDGROUP_ID><![CDATA[DD3AC8569DF44BA0A192B2A88AE50E71]]></AD_FIELDGROUP_ID>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <DISPLAYLOGIC><![CDATA[@IsReady@='Y']]></DISPLAYLOGIC>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <SEQNO><![CDATA[136]]></SEQNO>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A0C504C68F094EC388AE177C0B5A393D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A0C504C68F094EC388AE177C0B5A393D--></AD_FIELD>
+
 <!--A0F64442A0A34F50BA762BC85AEF6836--><AD_FIELD>
 <!--A0F64442A0A34F50BA762BC85AEF6836-->  <AD_FIELD_ID><![CDATA[A0F64442A0A34F50BA762BC85AEF6836]]></AD_FIELD_ID>
 <!--A0F64442A0A34F50BA762BC85AEF6836-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -290999,6 +291119,36 @@
 <!--C6D604A9A93D41D6AADFF5EB3F52D1EE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--C6D604A9A93D41D6AADFF5EB3F52D1EE--></AD_FIELD>
 
+<!--C70EFBBEC87A4332866CB5D89BCF61A9--><AD_FIELD>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <AD_FIELD_ID><![CDATA[C70EFBBEC87A4332866CB5D89BCF61A9]]></AD_FIELD_ID>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <NAME><![CDATA[Inherited Calendar]]></NAME>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <DESCRIPTION><![CDATA[Inerited Calendar from the organization that owns it.]]></DESCRIPTION>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <HELP><![CDATA[Inerited Calendar from the organization that owns it.]]></HELP>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <AD_COLUMN_ID><![CDATA[7172CA9FB18A4BEAA9E0594891BE2A35]]></AD_COLUMN_ID>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <AD_FIELDGROUP_ID><![CDATA[DD3AC8569DF44BA0A192B2A88AE50E71]]></AD_FIELDGROUP_ID>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <DISPLAYLOGIC><![CDATA[@IsReady@='Y']]></DISPLAYLOGIC>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <SEQNO><![CDATA[146]]></SEQNO>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C70EFBBEC87A4332866CB5D89BCF61A9--></AD_FIELD>
+
 <!--C735FCAB0B774098AE26E949F69ADA13--><AD_FIELD>
 <!--C735FCAB0B774098AE26E949F69ADA13-->  <AD_FIELD_ID><![CDATA[C735FCAB0B774098AE26E949F69ADA13]]></AD_FIELD_ID>
 <!--C735FCAB0B774098AE26E949F69ADA13-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELDGROUP.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/sourcedata/AD_FIELDGROUP.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -599,6 +599,16 @@
 <!--D2A0D89EDB884813B6833F6880777C27-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D2A0D89EDB884813B6833F6880777C27--></AD_FIELDGROUP>
 
+<!--DD3AC8569DF44BA0A192B2A88AE50E71--><AD_FIELDGROUP>
+<!--DD3AC8569DF44BA0A192B2A88AE50E71-->  <AD_FIELDGROUP_ID><![CDATA[DD3AC8569DF44BA0A192B2A88AE50E71]]></AD_FIELDGROUP_ID>
+<!--DD3AC8569DF44BA0A192B2A88AE50E71-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DD3AC8569DF44BA0A192B2A88AE50E71-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DD3AC8569DF44BA0A192B2A88AE50E71-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DD3AC8569DF44BA0A192B2A88AE50E71-->  <NAME><![CDATA[Persisted Information]]></NAME>
+<!--DD3AC8569DF44BA0A192B2A88AE50E71-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DD3AC8569DF44BA0A192B2A88AE50E71-->  <ISCOLLAPSED><![CDATA[Y]]></ISCOLLAPSED>
+<!--DD3AC8569DF44BA0A192B2A88AE50E71--></AD_FIELDGROUP>
+
 <!--DED752CA2E4D49DB9B1232C707FD2622--><AD_FIELDGROUP>
 <!--DED752CA2E4D49DB9B1232C707FD2622-->  <AD_FIELDGROUP_ID><![CDATA[DED752CA2E4D49DB9B1232C707FD2622]]></AD_FIELDGROUP_ID>
 <!--DED752CA2E4D49DB9B1232C707FD2622-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -5400,6 +5400,20 @@
 <!--60E231391A7348DDA7171E780F62EF99-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--60E231391A7348DDA7171E780F62EF99--></AD_REFERENCE>
 
+<!--61CACA7F5C61466BB42C391BBD6156A0--><AD_REFERENCE>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <AD_REFERENCE_ID><![CDATA[61CACA7F5C61466BB42C391BBD6156A0]]></AD_REFERENCE_ID>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <NAME><![CDATA[Organization Selector for Persist Information]]></NAME>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <DESCRIPTION><![CDATA[Organization Selector for Persist Information]]></DESCRIPTION>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <HELP><![CDATA[Organization Selector for Persist Information]]></HELP>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--61CACA7F5C61466BB42C391BBD6156A0-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--61CACA7F5C61466BB42C391BBD6156A0--></AD_REFERENCE>
+
 <!--64522A2F925244F282036B827E8FA3D0--><AD_REFERENCE>
 <!--64522A2F925244F282036B827E8FA3D0-->  <AD_REFERENCE_ID><![CDATA[64522A2F925244F282036B827E8FA3D0]]></AD_REFERENCE_ID>
 <!--64522A2F925244F282036B827E8FA3D0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5770,6 +5784,20 @@
 <!--8238E1DF040B4641877766194CD1EF33-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--8238E1DF040B4641877766194CD1EF33--></AD_REFERENCE>
 
+<!--82C7F2AD834B493083D5DDAE50A01D0D--><AD_REFERENCE>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <AD_REFERENCE_ID><![CDATA[82C7F2AD834B493083D5DDAE50A01D0D]]></AD_REFERENCE_ID>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <NAME><![CDATA[Calendar Simple Selector]]></NAME>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <DESCRIPTION><![CDATA[Calendar Simple Selector.]]></DESCRIPTION>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <HELP><![CDATA[Calendar Simple Selector.]]></HELP>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--82C7F2AD834B493083D5DDAE50A01D0D-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--82C7F2AD834B493083D5DDAE50A01D0D--></AD_REFERENCE>
+
 <!--83AD04A0C49E4801BF276B690265A3D1--><AD_REFERENCE>
 <!--83AD04A0C49E4801BF276B690265A3D1-->  <AD_REFERENCE_ID><![CDATA[83AD04A0C49E4801BF276B690265A3D1]]></AD_REFERENCE_ID>
 <!--83AD04A0C49E4801BF276B690265A3D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Mon Apr 23 09:17:37 2018 +0200
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Thu Apr 26 18:54:30 2018 +0530
@@ -201,6 +201,24 @@
 <!--26FA611719154B5E808140E04BD58AB0-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--26FA611719154B5E808140E04BD58AB0--></OBUISEL_SELECTOR>
 
+<!--2B9E5CB801824F6DA7D2A16812DF861D--><OBUISEL_SELECTOR>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <OBUISEL_SELECTOR_ID><![CDATA[2B9E5CB801824F6DA7D2A16812DF861D]]></OBUISEL_SELECTOR_ID>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <NAME><![CDATA[Organization Selector for Persist Information]]></NAME>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <DESCRIPTION><![CDATA[Organization Selector for Persist Information]]></DESCRIPTION>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <HELP><![CDATA[Organization Selector for Persist Information]]></HELP>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <AD_REFERENCE_ID><![CDATA[61CACA7F5C61466BB42C391BBD6156A0]]></AD_REFERENCE_ID>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <WHERECLAUSE><![CDATA[AD_ISORGINCLUDED(e.id, @inpadOrgId@,e.client.id)<>-1]]></WHERECLAUSE>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--2B9E5CB801824F6DA7D2A16812DF861D-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--2B9E5CB801824F6DA7D2A16812DF861D--></OBUISEL_SELECTOR>
+
 <!--2E64F551C7C4470C80C29DBA24B34A5F--><OBUISEL_SELECTOR>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <OBUISEL_SELECTOR_ID><![CDATA[2E64F551C7C4470C80C29DBA24B34A5F]]></OBUISEL_SELECTOR_ID>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1164,6 +1182,23 @@
 <!--EB3C41F0973A4EDA91E475833792A6D4-->  <CUSTOM_QUERY><![CDATA[Y]]></CUSTOM_QUERY>
 <!--EB3C41F0973A4EDA91E475833792A6D4--></OBUISEL_SELECTOR>
 
+<!--EBE0615996484135B061F2E15C2E3174--><OBUISEL_SELECTOR>
+<!--EBE0615996484135B061F2E15C2E3174-->  <OBUISEL_SELECTOR_ID><![CDATA[EBE0615996484135B061F2E15C2E3174]]></OBUISEL_SELECTOR_ID>
+<!--EBE0615996484135B061F2E15C2E3174-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EBE0615996484135B061F2E15C2E3174-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EBE0615996484135B061F2E15C2E3174-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EBE0615996484135B061F2E15C2E3174-->  <NAME><![CDATA[Calendar Selector]]></NAME>
+<!--EBE0615996484135B061F2E15C2E3174-->  <DESCRIPTION><![CDATA[Calendar Simple Selector.]]></DESCRIPTION>
+<!--EBE0615996484135B061F2E15C2E3174-->  <HELP><![CDATA[Calendar Simple Selector.]]></HELP>
+<!--EBE0615996484135B061F2E15C2E3174-->  <AD_REFERENCE_ID><![CDATA[82C7F2AD834B493083D5DDAE50A01D0D]]></AD_REFERENCE_ID>
+<!--EBE0615996484135B061F2E15C2E3174-->  <AD_TABLE_ID><![CDATA[139]]></AD_TABLE_ID>
+<!--EBE0615996484135B061F2E15C2E3174-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--EBE0615996484135B061F2E15C2E3174-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EBE0615996484135B061F2E15C2E3174-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--EBE0615996484135B061F2E15C2E3174-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--EBE0615996484135B061F2E15C2E3174-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--EBE0615996484135B061F2E15C2E3174--></OBUISEL_SELECTOR>
+
 <!--EBFFA9D8B4FE4F9F8E591D0AB79D8343--><OBUISEL_SELECTOR>
 <!--EBFFA9D8B4FE4F9F8E591D0AB79D8343-->  <OBUISEL_SELECTOR_ID><![CDATA[EBFFA9D8B4FE4F9F8E591D0AB79D8343]]></OBUISEL_SELECTOR_ID>
 <!--EBFFA9D8B4FE4F9F8E591D0AB79D8343-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>