hg merge release-1.0c
This commit is contained in:
commit
d36b2a2d01
|
@ -247,7 +247,9 @@ 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'
|
update ad_tab set isadvancedtab='N' where isadvancedtab='Y'
|
||||||
;
|
;
|
||||||
|
|
||||||
CREATE OR REPLACE VIEW adempiere.ad_field_v AS
|
DROP VIEW ad_field_v;
|
||||||
|
|
||||||
|
CREATE OR REPLACE VIEW 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,
|
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.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,
|
f.isfieldonly, f.isreadonly, f.isencrypted AS isencryptedfield, f.obscuretype, c.columnname, c.columnsql,
|
||||||
|
@ -266,16 +268,18 @@ CREATE OR REPLACE VIEW adempiere.ad_field_v AS
|
||||||
COALESCE(f.isallowcopy, c.isallowcopy) AS isallowcopy, f.isdisplayedgrid, f.seqnogrid, c.seqnoselection,
|
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,
|
f.xposition, f.columnspan, f.numlines, COALESCE(f.istoolbarbutton, c.istoolbarbutton) AS istoolbarbutton,
|
||||||
c.formatpattern, f.isadvancedfield
|
c.formatpattern, f.isadvancedfield
|
||||||
FROM adempiere.ad_field f
|
FROM ad_field f
|
||||||
JOIN adempiere.ad_tab t ON f.ad_tab_id = t.ad_tab_id
|
JOIN 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 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
|
LEFT JOIN 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
|
JOIN 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)
|
LEFT JOIN 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
|
WHERE f.isactive = 'Y'::bpchar AND c.isactive = 'Y'::bpchar
|
||||||
;
|
;
|
||||||
|
|
||||||
CREATE OR REPLACE VIEW adempiere.ad_field_vt AS
|
DROP VIEW ad_field_vt;
|
||||||
|
|
||||||
|
CREATE OR REPLACE VIEW 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,
|
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,
|
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,
|
f.issameline, f.isheading, f.isfieldonly, f.isreadonly, f.isencrypted AS isencryptedfield, f.obscuretype,
|
||||||
|
@ -295,14 +299,14 @@ COALESCE(f.infofactoryclass, c.infofactoryclass) AS infofactoryclass, c.isautoco
|
||||||
COALESCE(f.isallowcopy, c.isallowcopy) AS isallowcopy, f.isdisplayedgrid, f.seqnogrid, c.seqnoselection,
|
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,
|
f.xposition, f.columnspan, f.numlines, COALESCE(f.istoolbarbutton, c.istoolbarbutton) AS istoolbarbutton,
|
||||||
c.formatpattern, f.isadvancedfield
|
c.formatpattern, f.isadvancedfield
|
||||||
FROM adempiere.ad_field f
|
FROM ad_field f
|
||||||
JOIN adempiere.ad_field_trl trl ON f.ad_field_id = trl.ad_field_id
|
JOIN 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
|
JOIN 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 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 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
|
LEFT JOIN 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
|
JOIN 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)
|
LEFT JOIN 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
|
WHERE f.isactive = 'Y'::bpchar AND c.isactive = 'Y'::bpchar
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue