diff --git a/db/ddlutils/oracle/views/M_PRODUCT_SUBSTITUTERELATED_V.sql b/db/ddlutils/oracle/views/M_PRODUCT_SUBSTITUTERELATED_V.sql index d7fc59d8c9..b89273ada1 100644 --- a/db/ddlutils/oracle/views/M_PRODUCT_SUBSTITUTERELATED_V.sql +++ b/db/ddlutils/oracle/views/M_PRODUCT_SUBSTITUTERELATED_V.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATE_V AS +CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATED_V AS SELECT s.AD_Client_ID, s.AD_Org_ID, s.IsActive, s.Created, s.CreatedBy, s.Updated, s.UpdatedBy, s.m_product_id, s.substitute_id, s.description, 'S' AS ROWTYPE, (ms.qtyonhand - ms.qtyreserved) AS qtyavailable, ms.qtyonhand, ms.qtyreserved, mpr.pricestd, mpr.m_pricelist_version_id, mw.m_warehouse_id FROM M_SUBSTITUTE s JOIN M_STORAGE ms ON ms.m_product_id = s.substitute_id diff --git a/db/ddlutils/postgresql/views/M_PRODUCT_SUBSTITUTERELATED_V.sql b/db/ddlutils/postgresql/views/M_PRODUCT_SUBSTITUTERELATED_V.sql index d7fc59d8c9..b89273ada1 100644 --- a/db/ddlutils/postgresql/views/M_PRODUCT_SUBSTITUTERELATED_V.sql +++ b/db/ddlutils/postgresql/views/M_PRODUCT_SUBSTITUTERELATED_V.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATE_V AS +CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATED_V AS SELECT s.AD_Client_ID, s.AD_Org_ID, s.IsActive, s.Created, s.CreatedBy, s.Updated, s.UpdatedBy, s.m_product_id, s.substitute_id, s.description, 'S' AS ROWTYPE, (ms.qtyonhand - ms.qtyreserved) AS qtyavailable, ms.qtyonhand, ms.qtyreserved, mpr.pricestd, mpr.m_pricelist_version_id, mw.m_warehouse_id FROM M_SUBSTITUTE s JOIN M_STORAGE ms ON ms.m_product_id = s.substitute_id diff --git a/migration/330-331b/044_BF_1824260.sql b/migration/330-331b/044_BF_1824260.sql new file mode 100644 index 0000000000..e69de29bb2 diff --git a/migration/330-331b/postgresql/037_AdditionalProductInfo.sql b/migration/330-331b/postgresql/037_AdditionalProductInfo.sql index 0473c8a7ff..6fcb456295 100644 --- a/migration/330-331b/postgresql/037_AdditionalProductInfo.sql +++ b/migration/330-331b/postgresql/037_AdditionalProductInfo.sql @@ -65,7 +65,7 @@ JOIN M_WAREHOUSE mw ON ml.m_warehouse_id = mw.m_warehouse_id ORDER BY mw.NAME; -CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATE_V AS +CREATE OR REPLACE VIEW M_PRODUCT_SUBSTITUTERELATED_V AS SELECT s.AD_Client_ID, s.AD_Org_ID, s.IsActive, s.Created, s.CreatedBy, s.Updated, s.UpdatedBy, s.m_product_id, s.substitute_id, s.description, 'S' AS ROWTYPE, (ms.qtyonhand - ms.qtyreserved) AS qtyavailable, ms.qtyonhand, ms.qtyreserved, mpr.pricestd, mpr.m_pricelist_version_id, mw.m_warehouse_id FROM M_SUBSTITUTE s JOIN M_STORAGE ms ON ms.m_product_id = s.substitute_id diff --git a/migration/330-331b/postgresql/044_BF_1824260.sql b/migration/330-331b/postgresql/044_BF_1824260.sql new file mode 100644 index 0000000000..f23ede725a --- /dev/null +++ b/migration/330-331b/postgresql/044_BF_1824260.sql @@ -0,0 +1,32 @@ +CREATE OR REPLACE FUNCTION "adempiere"."subtractdays" (in inter interval, in days numeric) RETURNS integer AS +$BODY$ +BEGIN +RETURN ( EXTRACT( EPOCH FROM ( inter ) ) / 86400 ) - days; +END; +$BODY$ +LANGUAGE 'plpgsql'; + +CREATE OPERATOR - ( +PROCEDURE = subtractdays, +LEFTARG = interval, +RIGHTARG = numeric, +COMMUTATOR = - +); + + +CREATE OR REPLACE FUNCTION "adempiere"."adddays" (in inter interval, in days numeric) RETURNS integer AS +$BODY$ +BEGIN +RETURN ( EXTRACT( EPOCH FROM ( inter ) ) / 86400 ) + days; +END; +$BODY$ +LANGUAGE 'plpgsql'; + +CREATE OPERATOR + ( +PROCEDURE = adddays, +LEFTARG = interval, +RIGHTARG = numeric, +COMMUTATOR = - +); + +ALTER OPERATOR adempiere.+ (interval, numeric) OWNER TO adempiere; \ No newline at end of file