Compare commits

..

No commits in common. "e91c5e18467ee19b6bfb598cb0c6efc1a2819c5d" and "7a3ef892cf76da96e73573686968f177f21748c4" have entirely different histories.

View File

@ -4087,7 +4087,7 @@ $function$
-- DROP FUNCTION v3.v_form1_smeta(int4, int4); -- DROP FUNCTION v3.v_form1_smeta(int4, int4);
CREATE OR REPLACE FUNCTION v3.v_form1_smeta(p_year INT, p_org_unit_id INT) CREATE FUNCTION v3.v_form1_smeta(p_year INT, p_org_unit_id INT)
RETURNS TABLE ( RETURNS TABLE (
row_type VARCHAR, row_type VARCHAR,
depth INT, depth INT,
@ -4105,7 +4105,8 @@ RETURNS TABLE (
supp_corr_q2 NUMERIC, supp_corr_q3 NUMERIC, supp_corr_q4 NUMERIC, supp_corr_q2 NUMERIC, supp_corr_q3 NUMERIC, supp_corr_q4 NUMERIC,
dev_corr_q2 NUMERIC, dev_corr_q3 NUMERIC, dev_corr_q4 NUMERIC dev_corr_q2 NUMERIC, dev_corr_q3 NUMERIC, dev_corr_q4 NUMERIC
) )
AS $function$ AS $$
#variable_conflict use_column
DECLARE DECLARE
v_ahr INT; v_cap INT; v_oper INT; v_ahr INT; v_cap INT; v_oper INT;
v_sections TEXT[] := ARRAY['plan','approved','q1','q2','q3','q4']; v_sections TEXT[] := ARRAY['plan','approved','q1','q2','q3','q4'];
@ -4234,9 +4235,7 @@ BEGIN
FROM merged m FROM merged m
ORDER BY m.sc; ORDER BY m.sc;
END; END;
$function$ $$ LANGUAGE plpgsql STABLE SET search_path = v3, pg_catalog;
LANGUAGE plpgsql STABLE SET search_path = v3, pg_catalog
;
-- DROP FUNCTION v3.v_form2_sheet_sections(int4, varchar, _text); -- DROP FUNCTION v3.v_form2_sheet_sections(int4, varchar, _text);