details: https://code.openbravo.com/erp/stable/2.50/rev/55c5e981efd3
changeset: 9867:55c5e981efd3
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Thu May 31 11:30:47 2012 +0200
summary: Fixes issue 20654: Should not be possible to create several periods
for same date range in different years
diffstat:
src-db/database/model/triggers/C_PERIOD_TRG2.xml | 7 ++++++-
src-db/database/sourcedata/AD_MESSAGE.xml | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diffs (29 lines):
diff -r 6398e356f509 -r 55c5e981efd3
src-db/database/model/triggers/C_PERIOD_TRG2.xml
--- a/src-db/database/model/triggers/C_PERIOD_TRG2.xml Mon Apr 16 16:20:47
2012 +0000
+++ b/src-db/database/model/triggers/C_PERIOD_TRG2.xml Thu May 31 11:30:47
2012 +0200
@@ -52,7 +52,12 @@
IF (:NEW.STARTDATE > :NEW.ENDDATE) THEN
RAISE_APPLICATION_ERROR(-20000, '@DatesWrong@');
END IF;
- SELECT COUNT(*) INTO V_COUNT FROM C_PERIOD WHERE C_PERIOD_ID <>
:NEW.C_PERIOD_ID AND C_YEAR_ID = :NEW.C_YEAR_ID AND :NEW.STARTDATE <= ENDDATE
AND :NEW.ENDDATE >= STARTDATE;
+ SELECT COUNT(*) INTO V_COUNT
+ FROM C_PERIOD
+ WHERE C_PERIOD_ID <> :NEW.C_PERIOD_ID
+ AND AD_ORG_ID = :NEW.AD_ORG_ID
+ AND :NEW.STARTDATE <= ENDDATE
+ AND :NEW.ENDDATE >= STARTDATE;
IF (V_COUNT > 0) THEN
RAISE_APPLICATION_ERROR(-20000, '@DatesOverlapped@');
END IF;
diff -r 6398e356f509 -r 55c5e981efd3 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Apr 16 16:20:47 2012 +0000
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu May 31 11:30:47 2012 +0200
@@ -29868,7 +29868,7 @@
<!--0FF0EC6915A04F4EA5FB2FD09DA82F14--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0FF0EC6915A04F4EA5FB2FD09DA82F14--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0FF0EC6915A04F4EA5FB2FD09DA82F14-->
<VALUE><![CDATA[DatesOverlapped]]></VALUE>
-<!--0FF0EC6915A04F4EA5FB2FD09DA82F14--> <MSGTEXT><![CDATA[The dates period
defined is overlapped with another period of the same year.]]></MSGTEXT>
+<!--0FF0EC6915A04F4EA5FB2FD09DA82F14--> <MSGTEXT><![CDATA[Saving failed. The
dates period defined is overlapped with another period of an existing
year.]]></MSGTEXT>
<!--0FF0EC6915A04F4EA5FB2FD09DA82F14--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
<!--0FF0EC6915A04F4EA5FB2FD09DA82F14-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--0FF0EC6915A04F4EA5FB2FD09DA82F14--></AD_MESSAGE>
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
