details: /erp/devel/pi/rev/768f46cef336
changeset: 9386:768f46cef336
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Dec 24 12:25:09 2010 +0100
summary: [cleanup] Do not set val rule for client/org when creating cols
details: /erp/devel/pi/rev/b29165c217a8
changeset: 9387:b29165c217a8
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Dec 24 12:25:53 2010 +0100
summary: [cleanup] When creating fields: set client as hidden, org 1st field,
rest ordered by col position
diffstat:
src-db/database/model/functions/AD_TABLE_IMPORT.xml | 11 ++---------
src-db/database/model/functions/AD_TAB_IMPORT.xml | 19 +++++++++++++++----
2 files changed, 17 insertions(+), 13 deletions(-)
diffs (113 lines):
diff -r 9aa3f4d4f39f -r b29165c217a8
src-db/database/model/functions/AD_TABLE_IMPORT.xml
--- a/src-db/database/model/functions/AD_TABLE_IMPORT.xml Fri Dec 24
11:58:52 2010 +0100
+++ b/src-db/database/model/functions/AD_TABLE_IMPORT.xml Fri Dec 24
12:25:53 2010 +0100
@@ -22,7 +22,7 @@
* parts created by ComPiere are Copyright (C) ComPiere, Inc.;
* All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2009 Openbravo, S.L.U.
+ * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.U.
*
* Specifically, this derivative work is based upon the following Compiere
* file and version.
@@ -55,7 +55,6 @@
-- Added by Ismael Ciordia
v_AD_Reference_ID VARCHAR2(32);
v_AD_Reference_Value_ID VARCHAR2(32);
- v_AD_Val_Rule_ID VARCHAR2(32);
v_IsParent CHAR(1):='N';
v_IsKey CHAR(1):='N';
v_IsIdentifier CHAR(1):='N';
@@ -132,7 +131,6 @@
-- Added by Ismael Ciordia
v_AD_Reference_ID:=NULL;
v_AD_Reference_Value_ID:=NULL;
- v_AD_Val_Rule_ID:=NULL;
v_IsParent:='N';
v_IsKey:='N';
v_IsIdentifier:='N';
@@ -156,11 +154,6 @@
v_DefaultValue:='@'||Cur_Column.Column_Name||'@';
v_IsUpdateable:='N';
v_IsSessionAttr:='Y';
- IF(UPPER(Cur_Column.Column_Name)='AD_CLIENT_ID') THEN
- v_AD_Val_Rule_ID:='103';
- ELSE
- v_AD_Val_Rule_ID:='104';
- END IF;
ELSIF(UPPER(Cur_Column.Column_Name) IN('UPDATED', 'CREATED')) THEN
v_AD_Reference_ID:='16';
v_IsUpdateable:='N';
@@ -291,7 +284,7 @@
v_AD_Reference_ID, v_FieldLength, v_IsKey, v_IsParent,
(CASE Cur_Column.Nullable WHEN 'Y' THEN 'N' ELSE 'Y' END),
v_IsIdentifier, v_SeqNo, 'N', 'N', v_IsUpdateable,
v_AD_Reference_Value_ID,
- v_AD_Val_Rule_ID, v_DefaultValue, v_IsSessionAttr,
+ null, v_DefaultValue, v_IsSessionAttr,
Cur_Column.COLUMN_ID, v_module_id);
--
v_count:=v_count + 1;
diff -r 9aa3f4d4f39f -r b29165c217a8
src-db/database/model/functions/AD_TAB_IMPORT.xml
--- a/src-db/database/model/functions/AD_TAB_IMPORT.xml Fri Dec 24 11:58:52
2010 +0100
+++ b/src-db/database/model/functions/AD_TAB_IMPORT.xml Fri Dec 24 12:25:53
2010 +0100
@@ -59,6 +59,7 @@
v_isReadOnly CHAR(1):='N';
v_sameLine CHAR(1):='N';
v_SeqNo NUMBER(10) ;
+ v_SeqNoCounter NUMBER;
v_gridSeqno NUMBER;
v_sortNo NUMBER(10) ;
v_columnName VARCHAR2(40) ;
@@ -129,6 +130,8 @@
v_GridSeqNo := 0;
end if;
+ v_SeqNoCounter := 20; --Reserve 10 for Organization
+
FOR Cur_Column IN(-- added by Pablo Sarobe
SELECT c.Columnname, c.Name, c.Description, c.AD_Column_ID, c.FieldLength,
t.tablename, c.AD_Module_ID
FROM AD_Column c, AD_Table t
@@ -138,7 +141,8 @@
WHERE c.AD_Column_ID=f.AD_Column_ID AND c.AD_Table_ID=v_AD_Table_ID
AND f.AD_Tab_ID=v_Record_ID
)
AND c.AD_Table_ID=v_AD_Table_ID AND c.AD_Table_ID=t.AD_Table_ID --
added by Pablo Sarobe
- AND UPPER(c.Columnname) NOT IN ('CREATED', 'UPDATED', 'CREATEDBY',
'UPDATEDBY') AND c.IsActive='Y')
+ AND UPPER(c.Columnname) NOT IN ('CREATED', 'UPDATED', 'CREATEDBY',
'UPDATEDBY') AND c.IsActive='Y'
+ ORDER BY POSITION)
LOOP
AD_Sequence_Next('AD_Field', '0', v_NextNo) ; -- get ID
-- added by Pablo Sarobe
@@ -152,16 +156,18 @@
IF(UPPER(Cur_Column.Columnname)=UPPER(Cur_Column.Tablename) ||'_ID')
THEN --ID column
v_isDisplayed:='N';
v_showInRelation:='N';
+ v_SeqNo:=null;
IF(UPPER(Cur_Column.Columnname) IN('M_PRODUCT_ID', 'C_BPARTNER_ID'))
THEN
v_DisplayLength:=40;
ELSIF(UPPER(Cur_Column.Columnname) IN('C_LOCATION_ID',
'C_BPARTNER_LOCATION_ID')) THEN
v_DisplayLength:=60;
END IF;
ELSIF(UPPER(Cur_Column.Columnname)='AD_CLIENT_ID') THEN
+ v_SeqNo:=null;
+ v_showInRelation:='N';
+ v_isDisplayed:='N';
+ ELSIF(UPPER(Cur_Column.Columnname)='AD_ORG_ID') THEN
v_SeqNo:=10;
- v_showInRelation:='N';
- ELSIF(UPPER(Cur_Column.Columnname)='AD_ORG_ID') THEN
- v_SeqNo:=20;
v_sameLine:='Y';
v_showInRelation:='N';
ELSIF(UPPER(Cur_Column.Columnname)='LINENO') THEN
@@ -176,6 +182,11 @@
v_isReadOnly:='Y';
END IF;
+ IF COALESCE(v_SeqNo,-1) = 0 THEN
+ v_SeqNoCounter := v_SeqNoCounter + 10;
+ v_SeqNo := v_SeqNoCounter;
+ END IF;
+
select count(*)
into v_aux
from ad_module
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
