View | Details | Raw Unified | Return to bug 11879
Collapse All | Expand All

(-)a/installer/data/mysql/kohastructure.sql
Lines 2-8 Link Here
2
--
2
--
3
-- Host: localhost    Database: koha30test
3
-- Host: localhost    Database: koha30test
4
-- ------------------------------------------------------
4
-- ------------------------------------------------------
(-)Server version (-11 / +11 lines)
Lines 265-270 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
265
  `altcontactphone` varchar(50) default NULL, -- the phone number for the alternate contact for the patron/borrower
265
  `altcontactphone` varchar(50) default NULL, -- the phone number for the alternate contact for the patron/borrower
266
  `smsalertnumber` varchar(50) default NULL, -- the mobile phone number where the patron/borrower would like to receive notices (if SNS turned on)
266
  `smsalertnumber` varchar(50) default NULL, -- the mobile phone number where the patron/borrower would like to receive notices (if SNS turned on)
267
  `privacy` integer(11) DEFAULT '1' NOT NULL, -- patron/borrower's privacy settings related to their reading history
267
  `privacy` integer(11) DEFAULT '1' NOT NULL, -- patron/borrower's privacy settings related to their reading history
268
  `contactprincipal` varchar(45) DEFAULT NULL, --  useful for reporting purposes
268
  UNIQUE KEY `cardnumber` (`cardnumber`),
269
  UNIQUE KEY `cardnumber` (`cardnumber`),
269
  PRIMARY KEY `borrowernumber` (`borrowernumber`),
270
  PRIMARY KEY `borrowernumber` (`borrowernumber`),
270
  KEY `categorycode` (`categorycode`),
271
  KEY `categorycode` (`categorycode`),
Lines 2174-2183 CREATE TABLE `suggestions` ( -- purchase suggestions Link Here
2174
   branchcode VARCHAR(10) default NULL, -- foreign key linking the suggested branch to the branches table
2175
   branchcode VARCHAR(10) default NULL, -- foreign key linking the suggested branch to the branches table
2175
   collectiontitle text default NULL, -- collection name for the suggested item
2176
   collectiontitle text default NULL, -- collection name for the suggested item
2176
   itemtype VARCHAR(30) default NULL, -- suggested item type 
2177
   itemtype VARCHAR(30) default NULL, -- suggested item type 
2177
	quantity SMALLINT(6) default NULL, -- suggested quantity to be purchased
2178
    quantity SMALLINT(6) default NULL, -- suggested quantity to be purchased
2178
	currency VARCHAR(3) default NULL, -- suggested currency for the suggested price
2179
    currency VARCHAR(3) default NULL, -- suggested currency for the suggested price
2179
	price DECIMAL(28,6) default NULL, -- suggested price
2180
    price DECIMAL(28,6) default NULL, -- suggested price
2180
	total DECIMAL(28,6) default NULL, -- suggested total cost (price*quantity updated for currency)
2181
    total DECIMAL(28,6) default NULL, -- suggested total cost (price*quantity updated for currency)
2181
  PRIMARY KEY  (`suggestionid`),
2182
  PRIMARY KEY  (`suggestionid`),
2182
  KEY `suggestedby` (`suggestedby`),
2183
  KEY `suggestedby` (`suggestedby`),
2183
  KEY `managedby` (`managedby`)
2184
  KEY `managedby` (`managedby`)
Lines 2475-2486 CREATE TABLE `permissions` ( Link Here
2475
2476
2476
DROP TABLE IF EXISTS `serialitems`;
2477
DROP TABLE IF EXISTS `serialitems`;
2477
CREATE TABLE `serialitems` (
2478
CREATE TABLE `serialitems` (
2478
	`itemnumber` int(11) NOT NULL,
2479
    `itemnumber` int(11) NOT NULL,
2479
	`serialid` int(11) NOT NULL,
2480
    `serialid` int(11) NOT NULL,
2480
	UNIQUE KEY `serialitemsidx` (`itemnumber`),
2481
    UNIQUE KEY `serialitemsidx` (`itemnumber`),
2481
	KEY `serialitems_sfk_1` (`serialid`),
2482
    KEY `serialitems_sfk_1` (`serialid`),
2482
	CONSTRAINT `serialitems_sfk_1` FOREIGN KEY (`serialid`) REFERENCES `serial` (`serialid`) ON DELETE CASCADE ON UPDATE CASCADE,
2483
    CONSTRAINT `serialitems_sfk_1` FOREIGN KEY (`serialid`) REFERENCES `serial` (`serialid`) ON DELETE CASCADE ON UPDATE CASCADE,
2483
	CONSTRAINT `serialitems_sfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
2484
    CONSTRAINT `serialitems_sfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
2484
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2485
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2485
2486
2486
--
2487
--
Lines 3461-3464 CREATE TABLE IF NOT EXISTS columns_settings ( Link Here
3461
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
3462
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
3462
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
3463
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
3463
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
3464
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
3464
(-)a/installer/data/mysql/updatedatabase.pl (+6 lines)
Lines 8668-8673 if ( CheckVersion($DBversion) ) { Link Here
8668
    print "Upgrade to $DBversion done (Bug 10402: Move bookseller contacts to separate table)\n";
8668
    print "Upgrade to $DBversion done (Bug 10402: Move bookseller contacts to separate table)\n";
8669
    SetVersion($DBversion);
8669
    SetVersion($DBversion);
8670
}
8670
}
8671
$DBversion = "XXX";
8672
if ( CheckVersion($DBversion) ) {
8673
    $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `contactprincipal` VARCHAR(45) NULL DEFAULT NULL;");
8674
    print "Upgrade to $DBversion done (Add the contactprincipal column to the borrowers table)\n";
8675
    SetVersion($DBversion);
8676
}
8671
8677
8672
8678
8673
=head1 FUNCTIONS
8679
=head1 FUNCTIONS
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +37 lines)
Lines 167-173 Link Here
167
167
168
                <form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off">
168
                <form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off">
169
				<input type="hidden" name="nodouble" value="1" />
169
				<input type="hidden" name="nodouble" value="1" />
170
				<input class="new" type="submit" value="Not a duplicate. Save as new record" />
170
                <input class="new" type="submit" value="Not a duplicate. Sav496c160f51ef814283f3311615922f53a6d9985fe as new record" />
171
			</div>
171
			</div>
172
	[% END %]
172
	[% END %]
173
173
Lines 644-649 Link Here
644
        <input type="text" id="fax" name="fax" value="[% fax %]" class="[% focusAction %]" />
644
        <input type="text" id="fax" name="fax" value="[% fax %]" class="[% focusAction %]" />
645
	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
645
	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
646
    </li>
646
    </li>
647
    <li>
648
       <label for="primary_contact_method">Main Contact Method</label>
649
       <select id="primary_contact_method" name="primary_contact_method">
650
       <option value=""></option>
651
            [% IF ( primary_contact_method == 'phone' ) %]
652
                <option value="phone" selected="selected">Primary phone</option>
653
            [% ELSE %]
654
                <option value="phone">Primary phone</option>
655
            [% END %]
656
            [% IF ( primary_contact_method == 'phonepro' ) %]
657
                <option value="phonepro" selected="selected">Secondary phone</option>
658
            [% ELSE %]
659
                <option value="phonepro">Secondary phone</option>
660
            [% END %]
661
            [% IF ( primary_contact_method == 'mobile' ) %]
662
                <option value="mobile" selected="selected">Other phone</option>
663
            [% ELSE %]
664
                <option value="mobile">Other phone</option>
665
            [% END %]
666
            [% IF ( primary_contact_method == 'email' ) %]
667
                <option value="email" selected="selected">Primary email</option>
668
            [% ELSE %]
669
                <option value="email">Primary email</option>
670
            [% END %]
671
            [% IF ( primary_contact_method == 'emailpro' ) %]
672
                <option value="emailpro" selected="selected">Secondary email</option>
673
            [% ELSE %]
674
                <option value="emailpro">Secondary email</option>
675
            [% END %]
676
            [% IF ( primary_contact_method == 'fax' ) %]
677
                <option value="fax" selected="selected">Fax</option>
678
            [% ELSE %]
679
                <option value="fax">Fax</option>
680
            [% END %]
681
       </select>
682
    </li>
647
        [% END %]
683
        [% END %]
648
	</ol>
684
	</ol>
649
  </fieldset>
685
  </fieldset>
(-)a/members/memberentry.pl (-1 / +1 lines)
Lines 530-535 foreach (qw(C A S P I X)) { Link Here
530
$template->param('typeloop' => \@typeloop,
530
$template->param('typeloop' => \@typeloop,
531
        no_categories => $no_categories);
531
        no_categories => $no_categories);
532
if($no_categories){ $no_add = 1; }
532
if($no_categories){ $no_add = 1; }
533
533
# test in city
534
# test in city
534
if ( $guarantorid ) {
535
if ( $guarantorid ) {
535
    $select_city = getidcity($data{city});
536
    $select_city = getidcity($data{city});
536
- 

Return to bug 11879