details:   /erp/devel/pi/rev/965b96738de4
changeset: 7911:965b96738de4
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jul 23 10:51:43 2010 +0200
summary:   fixed bug 13983: Add new table to core dataset not possible without 
core in dev

  The module checked to be in development was the one in parent AD_Dataset, not
  the one in the record itself.

  This has been fixed for AD_Dataset_Table and AD_Dataset_Column.

diffstat:

 src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml |  17 ++++-------
 src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml  |  15 +++-------
 2 files changed, 11 insertions(+), 21 deletions(-)

diffs (85 lines):

diff -r bba492491e7e -r 965b96738de4 
src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml
--- a/src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml      Fri Jul 
23 13:41:02 2010 +0530
+++ b/src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml      Fri Jul 
23 10:51:43 2010 +0200
@@ -15,13 +15,12 @@
 * 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-2009 Openbravo SLU
+* All portions are Copyright (C) 2008-2010 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,19 +50,15 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Dataset_Column_ID;
-    cuerrentModuleID := :new.AD_Dataset_Table_ID;
+    cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Dataset_Column_ID;
-    cuerrentModuleID := :old.AD_Dataset_Table_ID;
+    cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
-   SELECT M.IsInDevelopment
+  SELECT M.IsInDevelopment
     INTO devModule
-    FROM AD_MODULE M, AD_DATASET T, AD_DATASET_TABLE T1
-   WHERE M.AD_MODULE_ID = T.AD_MODULE_ID
-     AND T1.AD_DATASET_ID = T.AD_DATASET_ID
-     AND T1.AD_DATASET_TABLE_ID = cuerrentModuleID;
+    FROM AD_MODULE M
+   WHERE M.AD_MODULE_ID = cuerrentModuleID;
      
   IF (UPDATING AND devTemplate=0 AND devModule='N') THEN
     IF (
diff -r bba492491e7e -r 965b96738de4 
src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml
--- a/src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml       Fri Jul 
23 13:41:02 2010 +0530
+++ b/src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml       Fri Jul 
23 10:51:43 2010 +0200
@@ -15,13 +15,12 @@
 * 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-2009 Openbravo SLU
+* All portions are Copyright (C) 2008-2010 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,19 +50,15 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Dataset_Table_ID;
-    cuerrentModuleID := :new.AD_Dataset_ID;
+    cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Dataset_Table_ID;
-    cuerrentModuleID := :old.AD_Dataset_ID;
+    cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
   SELECT M.IsInDevelopment
     INTO devModule
-    FROM AD_MODULE M, AD_DATASET T
-   WHERE M.AD_MODULE_ID = T.AD_MODULE_ID
-     AND T.AD_DATASET_ID = cuerrentModuleID;
-
+    FROM AD_MODULE M
+   WHERE M.AD_MODULE_ID = cuerrentModuleID;
      
   IF (UPDATING AND devTemplate=0 AND devModule='N') THEN
     IF (

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to