diff --git a/migration/i1.0c-release/oracle/20130801160000_IDEMPIERE-1160.sql b/migration/i1.0c-release/oracle/20130801160000_IDEMPIERE-1160.sql index 4a3e457ce6..d684f355ef 100644 --- a/migration/i1.0c-release/oracle/20130801160000_IDEMPIERE-1160.sql +++ b/migration/i1.0c-release/oracle/20130801160000_IDEMPIERE-1160.sql @@ -273,7 +273,7 @@ CREATE OR REPLACE VIEW AD_FIELD_V AS f.seqnogrid, c.seqnoselection, f.xposition, f.columnspan, f.numlines, COALESCE(f.istoolbarbutton , c.istoolbarbutton ) As istoolbarbutton, - c.FormatPattern, f.isadvancedfield, f.IsDefaultFocus + c.FormatPattern, f.isadvancedfield FROM AD_FIELD f INNER JOIN AD_TAB t ON (f.AD_Tab_ID = t.AD_Tab_ID) LEFT OUTER JOIN AD_FIELDGROUP fg ON (f.AD_FieldGroup_ID = fg.AD_FieldGroup_ID) @@ -309,7 +309,7 @@ CREATE OR REPLACE VIEW AD_FIELD_VT AS f.seqnogrid, c.seqnoselection, f.xposition, f.columnspan, f.numlines, COALESCE(f.istoolbarbutton , c.istoolbarbutton ) As istoolbarbutton, - c.FormatPattern, f.isadvancedfield, f.IsDefaultFocus + c.FormatPattern, f.isadvancedfield FROM AD_FIELD f INNER JOIN AD_FIELD_TRL trl ON (f.AD_Field_ID = trl.AD_Field_ID) INNER JOIN AD_TAB t ON (f.AD_Tab_ID = t.AD_Tab_ID) diff --git a/migration/i1.0c-release/postgresql/20130801160000_IDEMPIERE-1160.sql b/migration/i1.0c-release/postgresql/20130801160000_IDEMPIERE-1160.sql index 0aa7115a79..2b195b9733 100644 --- a/migration/i1.0c-release/postgresql/20130801160000_IDEMPIERE-1160.sql +++ b/migration/i1.0c-release/postgresql/20130801160000_IDEMPIERE-1160.sql @@ -247,9 +247,7 @@ UPDATE AD_Field SET SeqNo=390,Updated=TO_TIMESTAMP('2013-08-06 14:45:24','YYYY-M update ad_tab set isadvancedtab='N' where isadvancedtab='Y' ; -DROP VIEW ad_field_v; - -CREATE OR REPLACE VIEW ad_field_v AS +CREATE OR REPLACE VIEW adempiere.ad_field_v AS SELECT t.ad_window_id, f.ad_tab_id, f.ad_field_id, tbl.ad_table_id, f.ad_column_id, f.name, f.description, f.help, f.isdisplayed, f.displaylogic, f.displaylength, f.seqno, f.sortno, f.issameline, f.isheading, f.isfieldonly, f.isreadonly, f.isencrypted AS isencryptedfield, f.obscuretype, c.columnname, c.columnsql, @@ -267,19 +265,17 @@ CREATE OR REPLACE VIEW ad_field_v AS COALESCE(f.infofactoryclass, c.infofactoryclass) AS infofactoryclass, c.isautocomplete, COALESCE(f.isallowcopy, c.isallowcopy) AS isallowcopy, f.isdisplayedgrid, f.seqnogrid, c.seqnoselection, f.xposition, f.columnspan, f.numlines, COALESCE(f.istoolbarbutton, c.istoolbarbutton) AS istoolbarbutton, - c.formatpattern, f.isadvancedfield, f.IsDefaultFocus - FROM ad_field f - JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id - LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id - LEFT JOIN ad_column c ON f.ad_column_id = c.ad_column_id - JOIN ad_table tbl ON c.ad_table_id = tbl.ad_table_id - LEFT JOIN ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) + c.formatpattern, f.isadvancedfield + FROM adempiere.ad_field f + JOIN adempiere.ad_tab t ON f.ad_tab_id = t.ad_tab_id + LEFT JOIN adempiere.ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id + LEFT JOIN adempiere.ad_column c ON f.ad_column_id = c.ad_column_id + JOIN adempiere.ad_table tbl ON c.ad_table_id = tbl.ad_table_id + LEFT JOIN adempiere.ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) WHERE f.isactive = 'Y'::bpchar AND c.isactive = 'Y'::bpchar ; -DROP VIEW ad_field_vt; - -CREATE OR REPLACE VIEW ad_field_vt AS +CREATE OR REPLACE VIEW adempiere.ad_field_vt AS SELECT trl.ad_language, t.ad_window_id, f.ad_tab_id, f.ad_field_id, tbl.ad_table_id, f.ad_column_id, trl.name, trl.description, trl.help, f.isdisplayed, f.displaylogic, f.displaylength, f.seqno, f.sortno, f.issameline, f.isheading, f.isfieldonly, f.isreadonly, f.isencrypted AS isencryptedfield, f.obscuretype, @@ -298,15 +294,15 @@ f.included_tab_id, fg.fieldgrouptype, fg.iscollapsedbydefault, COALESCE(f.infofactoryclass, c.infofactoryclass) AS infofactoryclass, c.isautocomplete, COALESCE(f.isallowcopy, c.isallowcopy) AS isallowcopy, f.isdisplayedgrid, f.seqnogrid, c.seqnoselection, f.xposition, f.columnspan, f.numlines, COALESCE(f.istoolbarbutton, c.istoolbarbutton) AS istoolbarbutton, -c.formatpattern, f.isadvancedfield, f.IsDefaultFocus - FROM ad_field f - JOIN ad_field_trl trl ON f.ad_field_id = trl.ad_field_id - JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id - LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id - LEFT JOIN ad_fieldgroup_trl fgt ON f.ad_fieldgroup_id = fgt.ad_fieldgroup_id AND trl.ad_language::text = fgt.ad_language::text - LEFT JOIN ad_column c ON f.ad_column_id = c.ad_column_id - JOIN ad_table tbl ON c.ad_table_id = tbl.ad_table_id - LEFT JOIN ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) +c.formatpattern, f.isadvancedfield + FROM adempiere.ad_field f + JOIN adempiere.ad_field_trl trl ON f.ad_field_id = trl.ad_field_id + JOIN adempiere.ad_tab t ON f.ad_tab_id = t.ad_tab_id + LEFT JOIN adempiere.ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id + LEFT JOIN adempiere.ad_fieldgroup_trl fgt ON f.ad_fieldgroup_id = fgt.ad_fieldgroup_id AND trl.ad_language::text = fgt.ad_language::text + LEFT JOIN adempiere.ad_column c ON f.ad_column_id = c.ad_column_id + JOIN adempiere.ad_table tbl ON c.ad_table_id = tbl.ad_table_id + LEFT JOIN adempiere.ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) WHERE f.isactive = 'Y'::bpchar AND c.isactive = 'Y'::bpchar ;