Merge bug fixes from release to trunk

merge 12158, 12159

Revision: 12158
http://adempiere.svn.sourceforge.net/adempiere/?rev=12158&view=rev
Fix [2819386] PaymentTerm DueDate Bug - thanks to Armen
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2819386

Revision: 12159
http://adempiere.svn.sourceforge.net/adempiere/?rev=12159&view=rev
Fix [2793048] trunc function different on db/ddlutils and seed
Synchronize ddlutils version with current versions in DB
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2793048

Regards,
Tony
This commit is contained in:
tspc 2010-04-27 23:30:29 +00:00
parent 3e88fa4bc8
commit eb462af86c
4 changed files with 55 additions and 5 deletions

View File

@ -1,4 +1,4 @@
CREATE OR REPLACE FUNCTION "adempiere"."paymenttermduedate" (in paymentterm_id numeric, in docdate timestamptz) RETURNS timestamptz AS
CREATE OR REPLACE FUNCTION paymenttermduedate (in paymentterm_id numeric, in docdate timestamptz) RETURNS timestamptz AS
$BODY$
/*************************************************************************
* The contents of this file are subject to the Compiere License. You may
@ -32,7 +32,7 @@ BEGIN
-- Due 15th of following month
IF (p.IsDueFixed = 'Y') THEN
FirstDay := TRUNC(DocDate, 'MM');
NoDays := EXTRACT(epoch FROM TRUNC(DocDate) - FirstDay);
NoDays := EXTRACT(day FROM TRUNC(DocDate) - FirstDay);
DueDate := FirstDay + (p.FixMonthDay-1); -- starting on 1st
DueDate := ADD_MONTHS(DueDate, p.FixMonthOffset);
IF (NoDays > p.FixMonthCutoff) THEN

View File

@ -20,14 +20,14 @@
*Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.of
*/
CREATE OR REPLACE FUNCTION trunc(datetime TIMESTAMP WITH TIME ZONE)
RETURNS DATE AS $$
RETURNS TIMESTAMP WITH TIME ZONE AS $$
BEGIN
RETURN CAST(datetime AS DATE);
END;
$$ LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION trunc(datetime TIMESTAMP WITH TIME ZONE, format varchar)
RETURNS TIMESTAMP WITH TIME ZONE AS $$
RETURNS DATE AS $$
BEGIN
IF format = 'Q' THEN
RETURN CAST(DATE_Trunc('quarter',datetime) as DATE);
@ -50,4 +50,4 @@ RETURNS INTEGER AS $$
BEGIN
RETURN EXTRACT(DAY FROM i);
END;
$$ LANGUAGE plpgsql;
$$ LANGUAGE plpgsql;

View File

@ -0,0 +1 @@
-- just for postgresql

View File

@ -0,0 +1,49 @@
CREATE OR REPLACE FUNCTION paymenttermduedate (in paymentterm_id numeric, in docdate timestamptz) RETURNS timestamptz AS
$BODY$
/*************************************************************************
* The contents of this file are subject to the Compiere License. You may
* obtain a copy of the License at http://www.compiere.org/license.html
* Software is on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
* express or implied. See the License for details. Code: Compiere ERP+CRM
* Copyright (C) 1999-2001 Jorg Janke, ComPiere, Inc. All Rights Reserved.
*
* converted to postgreSQL by Karsten Thiemann (Schaeffer AG),
* kthiemann@adempiere.org
*************************************************************************
* Title: Get Due timestamp with time zone
* Description:
* Returns the due timestamp with time zone
* Test:
* select paymenttermDueDate(106, now()) from Test; => now()+30 days
************************************************************************/
DECLARE
Days NUMERIC := 0;
DueDate timestamp with time zone := TRUNC(DocDate);
--
FirstDay timestamp with time zone;
NoDays NUMERIC;
p RECORD;
BEGIN
FOR p IN
SELECT *
FROM C_PaymentTerm
WHERE C_PaymentTerm_ID = PaymentTerm_ID
LOOP -- for convineance only
-- Due 15th of following month
IF (p.IsDueFixed = 'Y') THEN
FirstDay := TRUNC(DocDate, 'MM');
NoDays := EXTRACT(day FROM TRUNC(DocDate) - FirstDay);
DueDate := FirstDay + (p.FixMonthDay-1); -- starting on 1st
DueDate := ADD_MONTHS(DueDate, p.FixMonthOffset);
IF (NoDays > p.FixMonthCutoff) THEN
DueDate := ADD_MONTHS(DueDate, 1);
END IF;
ELSE
DueDate := TRUNC(DocDate) + p.NetDays;
END IF;
END LOOP;
RETURN DueDate;
END;
$BODY$
LANGUAGE 'plpgsql'
;