From 29711f727c39c294bc92f59a638e4300718bf6a3 Mon Sep 17 00:00:00 2001 From: trifonnt Date: Wed, 7 Apr 2010 08:56:54 +0000 Subject: [PATCH] FR [2979756] - Touchscreen friendly POS https://sourceforge.net/tracker/?func=detail&atid=879335&aid=2979756&group_id=176962 Removed SQL statements which caused ID duplication errors. This IDs were not used anywhere. Not sure why migration scripts contained them at all. --- migration/354a-trunk/oracle/701_FR2979756_JavaPOS.sql | 5 +++-- migration/354a-trunk/oracle/702_FR2979756_JavaPOS.sql | 5 +++-- migration/354a-trunk/postgresql/701_FR2979756_JavaPOS.sql | 5 +++-- migration/354a-trunk/postgresql/702_FR2979756_JavaPOS.sql | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/migration/354a-trunk/oracle/701_FR2979756_JavaPOS.sql b/migration/354a-trunk/oracle/701_FR2979756_JavaPOS.sql index 6355253293..2dcf14e037 100644 --- a/migration/354a-trunk/oracle/701_FR2979756_JavaPOS.sql +++ b/migration/354a-trunk/oracle/701_FR2979756_JavaPOS.sql @@ -340,8 +340,9 @@ ALTER TABLE C_POSKeyLayout ADD AD_PrintFont_ID NUMBER(10) DEFAULT NULL -- Mar 21, 2010 7:40:14 PM EST -- Java POS enhancements -INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,Help,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,2210,0,'AutoLogoutTime',TO_DATE('2003-10-07 15:10:01','YYYY-MM-DD HH24:MI:SS'),0,'Automatic logout if inactive for this many seconds.','D','Automatic logout disabled if zero.','Y','Auto Logout time','Auto Logout time',TO_DATE('2000-01-02 00:00:00','YYYY-MM-DD HH24:MI:SS'),0) -; +-- NOT USED ANYWHERE AND CAUSING SQL Errors +--INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,Help,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,2210,0,'AutoLogoutTime',TO_DATE('2003-10-07 15:10:01','YYYY-MM-DD HH24:MI:SS'),0,'Automatic logout if inactive for this many seconds.','D','Automatic logout disabled if zero.','Y','Auto Logout time','Auto Logout time',TO_DATE('2000-01-02 00:00:00','YYYY-MM-DD HH24:MI:SS'),0) +--; -- Mar 21, 2010 7:42:33 PM EST -- Java POS enhancements diff --git a/migration/354a-trunk/oracle/702_FR2979756_JavaPOS.sql b/migration/354a-trunk/oracle/702_FR2979756_JavaPOS.sql index a9a17d630c..98ef1bc403 100644 --- a/migration/354a-trunk/oracle/702_FR2979756_JavaPOS.sql +++ b/migration/354a-trunk/oracle/702_FR2979756_JavaPOS.sql @@ -150,8 +150,9 @@ UPDATE AD_Process SET Classname='org.compiere.process.PosKeyGenerate',Updated=TO -- Mar 24, 2010 11:02:09 AM EST -- Java POS improvements -INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgTip,MsgType,Updated,UpdatedBy,Value) VALUES (0,52072,0,TO_DATE('2008-03-26 13:20:02','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Subtotal',NULL,'I',TO_DATE('2008-03-26 13:20:02','YYYY-MM-DD HH24:MI:SS'),100,'SubTotal') -; +-- NOT USED ANYWHERE AND CAUSING SQL Errors +--INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgTip,MsgType,Updated,UpdatedBy,Value) VALUES (0,52072,0,TO_DATE('2008-03-26 13:20:02','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Subtotal',NULL,'I',TO_DATE('2008-03-26 13:20:02','YYYY-MM-DD HH24:MI:SS'),100,'SubTotal') +--; -- Mar 24, 2010 11:03:05 AM EST -- Java POS improvements diff --git a/migration/354a-trunk/postgresql/701_FR2979756_JavaPOS.sql b/migration/354a-trunk/postgresql/701_FR2979756_JavaPOS.sql index eaf3c5d26f..8896c8a3c4 100644 --- a/migration/354a-trunk/postgresql/701_FR2979756_JavaPOS.sql +++ b/migration/354a-trunk/postgresql/701_FR2979756_JavaPOS.sql @@ -340,8 +340,9 @@ ALTER TABLE C_POSKeyLayout ADD COLUMN AD_PrintFont_ID NUMERIC(10) DEFAULT NULL -- Mar 21, 2010 7:40:14 PM EST -- Java POS enhancements -INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,Help,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,2210,0,'AutoLogoutTime',TO_TIMESTAMP('2003-10-07 15:10:01','YYYY-MM-DD HH24:MI:SS'),0,'Automatic logout if inactive for this many seconds.','D','Automatic logout disabled if zero.','Y','Auto Logout time','Auto Logout time',TO_TIMESTAMP('2000-01-02 00:00:00','YYYY-MM-DD HH24:MI:SS'),0) -; +-- NOT USED ANYWHERE AND CAUSING SQL Errors +--INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,Help,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,2210,0,'AutoLogoutTime',TO_TIMESTAMP('2003-10-07 15:10:01','YYYY-MM-DD HH24:MI:SS'),0,'Automatic logout if inactive for this many seconds.','D','Automatic logout disabled if zero.','Y','Auto Logout time','Auto Logout time',TO_TIMESTAMP('2000-01-02 00:00:00','YYYY-MM-DD HH24:MI:SS'),0) +--; -- Mar 21, 2010 7:42:33 PM EST -- Java POS enhancements diff --git a/migration/354a-trunk/postgresql/702_FR2979756_JavaPOS.sql b/migration/354a-trunk/postgresql/702_FR2979756_JavaPOS.sql index c946c9f42e..666f165075 100644 --- a/migration/354a-trunk/postgresql/702_FR2979756_JavaPOS.sql +++ b/migration/354a-trunk/postgresql/702_FR2979756_JavaPOS.sql @@ -150,8 +150,9 @@ UPDATE AD_Process SET Classname='org.compiere.process.PosKeyGenerate',Updated=TO -- Mar 24, 2010 11:02:09 AM EST -- Java POS improvements -INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgTip,MsgType,Updated,UpdatedBy,Value) VALUES (0,52072,0,TO_TIMESTAMP('2008-03-26 13:20:02','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Subtotal',NULL,'I',TO_TIMESTAMP('2008-03-26 13:20:02','YYYY-MM-DD HH24:MI:SS'),100,'SubTotal') -; +-- NOT USED ANYWHERE AND CAUSING SQL Errors +--INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgTip,MsgType,Updated,UpdatedBy,Value) VALUES (0,52072,0,TO_TIMESTAMP('2008-03-26 13:20:02','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Subtotal',NULL,'I',TO_TIMESTAMP('2008-03-26 13:20:02','YYYY-MM-DD HH24:MI:SS'),100,'SubTotal') +--; -- Mar 24, 2010 11:03:05 AM EST -- Java POS improvements