gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new/bug_6716'

This commit is contained in:
Paul Poulain 2012-01-13 11:46:21 +01:00
parent 9faf50a66c d471a79e92
commit 47b7b91d14
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
installer/data/mysql/kohastructure.sql
View File

@ -1317,10 +1317,10 @@ CREATE TABLE `matchchecks` (
--
DROP TABLE IF EXISTS `need_merge_authorities`;
CREATE TABLE `need_merge_authorities` (
`id` int NOT NULL auto_increment PRIMARY KEY,
`authid` bigint NOT NULL,
`done` tinyint DEFAULT 0
CREATE TABLE `need_merge_authorities` ( -- keeping track of authority records still to be merged by merge_authority cron job (used only if pref dontmerge is ON)
`id` int NOT NULL auto_increment PRIMARY KEY, -- unique id
`authid` bigint NOT NULL, -- reference to authority record
`done` tinyint DEFAULT 0 -- indication whether merge has been executed (0=not done, 1= done, 2= in progress)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
@ -2462,39 +2462,39 @@ CREATE TABLE `aqbasket` (
--
DROP TABLE IF EXISTS `aqbooksellers`;
CREATE TABLE `aqbooksellers` (
`id` int(11) NOT NULL auto_increment,
`name` mediumtext NOT NULL,
`address1` mediumtext,
`address2` mediumtext,
`address3` mediumtext,
`address4` mediumtext,
`phone` varchar(30) default NULL,
`accountnumber` mediumtext,
`othersupplier` mediumtext,
`currency` varchar(3) NOT NULL default '',
`booksellerfax` mediumtext,
`notes` mediumtext,
`bookselleremail` mediumtext,
`booksellerurl` mediumtext,
`contact` varchar(100) default NULL,
`postal` mediumtext,
`url` varchar(255) default NULL,
`contpos` varchar(100) default NULL,
`contphone` varchar(100) default NULL,
`contfax` varchar(100) default NULL,
`contaltphone` varchar(100) default NULL,
`contemail` varchar(100) default NULL,
`contnotes` mediumtext,
`active` tinyint(4) default NULL,
`listprice` varchar(10) default NULL,
`invoiceprice` varchar(10) default NULL,
`gstreg` tinyint(4) default NULL,
`listincgst` tinyint(4) default NULL,
`invoiceincgst` tinyint(4) default NULL,
`gstrate` decimal(6,4) default NULL,
`discount` float(6,4) default NULL,
`fax` varchar(50) default NULL,
CREATE TABLE `aqbooksellers` ( -- information about the vendors listed in acquisitions
`id` int(11) NOT NULL auto_increment, -- primary key and unique identifier assigned by Koha
`name` mediumtext NOT NULL, -- vendor name
`address1` mediumtext, -- first line of vendor physical address
`address2` mediumtext, -- second line of vendor physical address
`address3` mediumtext, -- third line of vendor physical address
`address4` mediumtext, -- fourth line of vendor physical address
`phone` varchar(30) default NULL, -- vendor phone number
`accountnumber` mediumtext, -- unused in Koha
`othersupplier` mediumtext, -- unused in Koha
`currency` varchar(3) NOT NULL default '', -- unused in Koha
`booksellerfax` mediumtext, -- vendor fax number
`notes` mediumtext, -- order notes
`bookselleremail` mediumtext, -- vendor email
`booksellerurl` mediumtext, -- unused in Koha
`contact` varchar(100) default NULL, -- name of contact at vendor
`postal` mediumtext, -- vendor postal address (all lines)
`url` varchar(255) default NULL, -- vendor web address
`contpos` varchar(100) default NULL, -- contact person's position
`contphone` varchar(100) default NULL, -- contact's phone number
`contfax` varchar(100) default NULL, -- contact's fax number
`contaltphone` varchar(100) default NULL, -- contact's alternate phone number
`contemail` varchar(100) default NULL, -- contact's email address
`contnotes` mediumtext, -- notes related to the contact
`active` tinyint(4) default NULL, -- is this vendor active (1 for yes, 0 for no)
`listprice` varchar(10) default NULL, -- currency code for list prices
`invoiceprice` varchar(10) default NULL, -- currency code for invoice prices
`gstreg` tinyint(4) default NULL, -- is your library charged tax (1 for yes, 0 for no)
`listincgst` tinyint(4) default NULL, -- is tax included in list prices (1 for yes, 0 for no)
`invoiceincgst` tinyint(4) default NULL, -- is tax included in invoice prices (1 for yes, 0 for no)
`gstrate` decimal(6,4) default NULL, -- the tax rate the library is charged
`discount` float(6,4) default NULL, -- discount offered on all items ordered from this vendor
`fax` varchar(50) default NULL, -- vendor fax number
PRIMARY KEY (`id`),
KEY `listprice` (`listprice`),
KEY `invoiceprice` (`invoiceprice`),