From: <ex...@us...> - 2015-11-17 22:52:37
|
Revision: 7394 http://sourceforge.net/p/web-erp/reponame/7394 Author: exsonqu Date: 2015-11-17 22:52:34 +0000 (Tue, 17 Nov 2015) Log Message: ----------- 18/11/15 AlexFigueiro: Remove the duplicate foreign key in stockrequest and stockrequestitem; Modified Paths: -------------- trunk/sql/mysql/country_sql/default.sql trunk/sql/mysql/upgrade4.12.3-4.13.sql Modified: trunk/sql/mysql/country_sql/default.sql =================================================================== --- trunk/sql/mysql/country_sql/default.sql 2015-11-17 00:38:05 UTC (rev 7393) +++ trunk/sql/mysql/country_sql/default.sql 2015-11-17 22:52:34 UTC (rev 7394) @@ -2749,8 +2749,6 @@ KEY `departmentid` (`departmentid`), CONSTRAINT `stockrequest_ibfk_1` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`), CONSTRAINT `stockrequest_ibfk_2` FOREIGN KEY (`departmentid`) REFERENCES `departments` (`departmentid`), - CONSTRAINT `stockrequest_ibfk_3` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`), - CONSTRAINT `stockrequest_ibfk_4` FOREIGN KEY (`departmentid`) REFERENCES `departments` (`departmentid`) ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2774,8 +2772,6 @@ KEY `stockid` (`stockid`), CONSTRAINT `stockrequestitems_ibfk_1` FOREIGN KEY (`dispatchid`) REFERENCES `stockrequest` (`dispatchid`), CONSTRAINT `stockrequestitems_ibfk_2` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`), - CONSTRAINT `stockrequestitems_ibfk_3` FOREIGN KEY (`dispatchid`) REFERENCES `stockrequest` (`dispatchid`), - CONSTRAINT `stockrequestitems_ibfk_4` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql =================================================================== --- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-17 00:38:05 UTC (rev 7393) +++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-17 22:52:34 UTC (rev 7394) @@ -23,7 +23,7 @@ `grns` (`grnno`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO scripts VALUES('EmailCustStatements.php','3','Email customer statement to customer'); -INSERT INTO scripts VALUES('SupplierGRNAndInvoiceInquiry.php',5,'Suppliers delivery note and grn relationship inquiry'); +INSERT INTO scripts VALUES('SupplierGRNAndInvoiceInquiry.php',5,'Supplier\'s delivery note and grn relationship inquiry'); ALTER table grns ADD supplierref varchar(30) NOT NULL DEFAULT ''; CREATE TABLE IF NOT EXISTS `glaccountusers` ( @@ -48,9 +48,7 @@ INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('GLAccountUsers.php', '15', 'Maintenance of users allowed to a GL Account'), ('UserGLAccounts.php', '15', 'Maintenance of GL Accounts allowed for a user'); - -INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES -('GLAccountUsersCopyAuthority.php', '15', 'Copy the authority into GL Accounts from user A to user B'); - +ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_3`; +ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_4`; -- Update version number: UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber'; |