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

(-)a/installer/data/mysql/kohastructure.sql (-44 / +91 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
  `account_balance` decimal(28,6) NOT NULL,
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 2705-2754 CREATE TABLE `messages` ( -- circulation messages left via the patron's check ou Link Here
2705
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2706
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2706
2707
2707
--
2708
--
2708
-- Table structure for table `accountlines`
2709
--
2710
2711
DROP TABLE IF EXISTS `accountlines`;
2712
CREATE TABLE `accountlines` (
2713
  `accountlines_id` int(11) NOT NULL AUTO_INCREMENT,
2714
  `borrowernumber` int(11) NOT NULL default 0,
2715
  `accountno` smallint(6) NOT NULL default 0,
2716
  `itemnumber` int(11) default NULL,
2717
  `date` date default NULL,
2718
  `amount` decimal(28,6) default NULL,
2719
  `description` mediumtext,
2720
  `dispute` mediumtext,
2721
  `accounttype` varchar(5) default NULL,
2722
  `amountoutstanding` decimal(28,6) default NULL,
2723
  `lastincrement` decimal(28,6) default NULL,
2724
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
2725
  `notify_id` int(11) NOT NULL default 0,
2726
  `notify_level` int(2) NOT NULL default 0,
2727
  `note` text NULL default NULL,
2728
  `manager_id` int(11) NULL,
2729
  PRIMARY KEY (`accountlines_id`),
2730
  KEY `acctsborridx` (`borrowernumber`),
2731
  KEY `timeidx` (`timestamp`),
2732
  KEY `itemnumber` (`itemnumber`),
2733
  CONSTRAINT `accountlines_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
2734
  CONSTRAINT `accountlines_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL
2735
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2736
2737
--
2738
-- Table structure for table `accountoffsets`
2739
--
2740
2741
DROP TABLE IF EXISTS `accountoffsets`;
2742
CREATE TABLE `accountoffsets` (
2743
  `borrowernumber` int(11) NOT NULL default 0,
2744
  `accountno` smallint(6) NOT NULL default 0,
2745
  `offsetaccount` smallint(6) NOT NULL default 0,
2746
  `offsetamount` decimal(28,6) default NULL,
2747
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
2748
  CONSTRAINT `accountoffsets_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE
2749
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2750
2751
--
2752
-- Table structure for table `action_logs`
2709
-- Table structure for table `action_logs`
2753
--
2710
--
2754
2711
Lines 3456-3461 CREATE TABLE IF NOT EXISTS columns_settings ( Link Here
3456
    PRIMARY KEY(module, page, tablename, columnname)
3413
    PRIMARY KEY(module, page, tablename, columnname)
3457
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3414
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3458
3415
3416
--
3417
-- Table structure for table 'account_credits'
3418
--
3419
DROP TABLE IF EXISTS account_credits;
3420
CREATE TABLE IF account_credits (
3421
    credit_id int(11) NOT NULL AUTO_INCREMENT,     -- The unique id for this credit
3422
    borrowernumber int(11) NOT NULL,               -- The borrower this credit applies to
3423
    `type` varchar(255) NOT NULL,                  -- The type of credit this is ( defined by Koha::Accounts::CreditTypes )
3424
    amount_received decimal(28,6) DEFAULT NULL,    -- If this was a cash payment, the amount of money given
3425
    amount_paid decimal(28,6) NOT NULL,            -- The actual ammount paid, if less than amount_recieved, change was given back
3426
    amount_remaining decimal(28,6) NOT NULL,       -- The amount of this credit that has not been applied to outstanding debits
3427
    amount_voided decimal(28,6) NULL DEFAULT NULL, -- The amount of this credit was for before it was voided
3428
    notes text,                                    -- Misc notes for this credit
3429
    branchcode VARCHAR( 10 ) NULL DEFAULT NULL,    -- Branchcode where the credit was created ( if any )
3430
    manager_id int(11) DEFAULT NULL,               -- The borrowernumber of the user who created this credit ( if any )
3431
    created_on timestamp NULL DEFAULT NULL,        -- Timestamp for when this credit was created
3432
    updated_on timestamp NULL DEFAULT NULL,        -- Timestamp for when this credit was last modified
3433
    PRIMARY KEY (credit_id),
3434
    KEY borrowernumber (borrowernumber),
3435
    KEY branchcode (branchcode)
3436
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
3437
3438
--
3439
-- Constraints for table `account_credits`
3440
--
3441
ALTER TABLE `account_credits`
3442
  ADD CONSTRAINT account_credits_ibfk_1 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
3443
  ADD CONSTRAINT account_credits_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE;
3444
3445
--
3446
-- Table structure for table 'account_debits'
3447
--
3448
3449
DROP TABLE IF EXISTS account_debits;
3450
CREATE TABLE account_debits (
3451
    debit_id int(11) NOT NULL AUTO_INCREMENT,           -- The unique id for this debit
3452
    borrowernumber int(11) NOT NULL DEFAULT '0',        -- The borrower this debit applies to
3453
    itemnumber int(11) DEFAULT NULL,                    -- The item related to this debit ( for fines, lost fees, etc )
3454
    issue_id int(11) DEFAULT NULL,                      -- The checkout this debit is related to ( again, for fines, lost fees, etc )
3455
    `type` varchar(255) NOT NULL,                       -- The type of debit this is ( defined by Koha::Accounts::DebitTypes )
3456
    accruing tinyint(1) NOT NULL DEFAULT '0',           -- Boolean flag, tells of if this is a fine that is still accruing
3457
    amount_original decimal(28,6) DEFAULT NULL,         -- The total amount of this debit
3458
    amount_outstanding decimal(28,6) DEFAULT NULL,      -- The amount still owed on this debit
3459
    amount_last_increment decimal(28,6) DEFAULT NULL,   -- The amount by which this debit last changed
3460
    description mediumtext,                             -- The description for this debit
3461
    notes text,                                         -- Misc notes for this debit
3462
    branchcode VARCHAR( 10 ) NULL DEFAULT NULL,         -- Branchcode where the debit was created ( if any )
3463
    manager_id int(11) DEFAULT NULL,                    -- The borrowernumber of the user who created this debit ( if any )
3464
    created_on timestamp NULL DEFAULT NULL,             -- Timestamp for when this credit was created
3465
    updated_on timestamp NULL DEFAULT NULL,             -- Timestamp for when this credit was last modified
3466
    PRIMARY KEY (debit_id),
3467
    KEY acctsborridx (borrowernumber),
3468
    KEY itemnumber (itemnumber),
3469
    KEY borrowernumber (borrowernumber),
3470
    KEY issue_id (issue_id),
3471
    KEY branchcode (branchcode)
3472
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
3473
3474
--
3475
-- Constraints for table `account_debits`
3476
--
3477
ALTER TABLE `account_debits`
3478
    ADD CONSTRAINT account_debits_ibfk_1 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
3479
    ADD CONSTRAINT account_debits_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE;
3480
3481
--
3482
-- Table structure for table 'account_offsets'
3483
--
3484
3485
DROP TABLE IF EXISTS account_offsets;
3486
CREATE TABLE account_offsets (
3487
    offset_id int(11) NOT NULL AUTO_INCREMENT,                                              -- Unique id for this offset
3488
    debit_id int(11) DEFAULT NULL,                                                          -- Related debit
3489
    credit_id int(11) DEFAULT NULL,                                                         -- Related credit ( if any )
3490
    `type` varchar(255) DEFAULT NULL,                                                       -- The type of this offset ( defined by Koha::Accounts::OffsetTypes ), if any
3491
    amount decimal(28,6) NOT NULL,                                                          -- The amount of the offset, positive means patron owes more, negative means patron owes less
3492
    created_on timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,    -- Timestamp for when this offset was created
3493
    PRIMARY KEY (offset_id),
3494
    KEY fee_id (debit_id),
3495
    KEY payment_id (credit_id)
3496
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
3497
3498
--
3499
-- Constraints for table `account_offsets`
3500
--
3501
ALTER TABLE `account_offsets`
3502
    ADD CONSTRAINT account_offsets_ibfk_1 FOREIGN KEY (debit_id) REFERENCES account_debits (debit_id) ON DELETE CASCADE ON UPDATE CASCADE,
3503
    ADD CONSTRAINT account_offsets_ibfk_2 FOREIGN KEY (credit_id) REFERENCES account_credits (credit_id) ON DELETE CASCADE ON UPDATE CASCADE;
3504
3505
3459
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
3506
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
3460
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
3507
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
3461
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
3508
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +184 lines)
Lines 37-42 use Getopt::Long; Link Here
37
use C4::Context;
37
use C4::Context;
38
use C4::Installer;
38
use C4::Installer;
39
use C4::Dates;
39
use C4::Dates;
40
use Koha::Database;
40
41
41
use MARC::Record;
42
use MARC::Record;
42
use MARC::File::XML ( BinaryEncoding => 'utf8' );
43
use MARC::File::XML ( BinaryEncoding => 'utf8' );
Lines 7257-7262 if ( CheckVersion($DBversion) ) { Link Here
7257
7258
7258
    $dbh->{AutoCommit} = 1;
7259
    $dbh->{AutoCommit} = 1;
7259
    $dbh->{RaiseError} = 0;
7260
    $dbh->{RaiseError} = 0;
7261
   SetVersion ($DBversion);
7260
}
7262
}
7261
7263
7262
$DBversion = "3.13.00.031";
7264
$DBversion = "3.13.00.031";
Lines 8776-8781 if ( CheckVersion($DBversion) ) { Link Here
8776
    SetVersion($DBversion);
8778
    SetVersion($DBversion);
8777
}
8779
}
8778
8780
8781
$DBversion = "3.17.00.XXX";
8782
if ( CheckVersion($DBversion) ) {
8783
    $dbh->do(q{
8784
        ALTER TABLE old_issues ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST
8785
    });
8786
    $dbh->do(q{
8787
        ALTER TABLE issues ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
8788
    });
8789
    $dbh->do(q{
8790
        UPDATE issues SET issue_id = issue_id + ( SELECT COUNT(*) FROM old_issues ) ORDER BY issue_id DESC
8791
    });
8792
8793
    $dbh->do("
8794
        CREATE TABLE IF NOT EXISTS account_credits (
8795
            credit_id int(11) NOT NULL AUTO_INCREMENT,
8796
            borrowernumber int(11) NOT NULL,
8797
            `type` varchar(255) NOT NULL,
8798
            amount_received decimal(28,6) DEFAULT NULL,
8799
            amount_paid decimal(28,6) NOT NULL,
8800
            amount_remaining decimal(28,6) NOT NULL,
8801
            amount_voided decimal(28,6) NULL DEFAULT NULL,
8802
            notes text,
8803
            branchcode VARCHAR( 10 ) NULL DEFAULT NULL,
8804
            manager_id int(11) DEFAULT NULL,
8805
            created_on timestamp NULL DEFAULT NULL,
8806
            updated_on timestamp NULL DEFAULT NULL,
8807
            PRIMARY KEY (credit_id),
8808
            KEY borrowernumber (borrowernumber),
8809
            KEY branchcode (branchcode)
8810
        ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
8811
    ");
8812
    $dbh->do("
8813
        CREATE TABLE IF NOT EXISTS account_debits (
8814
            debit_id int(11) NOT NULL AUTO_INCREMENT,
8815
            borrowernumber int(11) NOT NULL DEFAULT '0',
8816
            itemnumber int(11) DEFAULT NULL,
8817
            issue_id int(11) DEFAULT NULL,
8818
            `type` varchar(255) NOT NULL,
8819
            accruing tinyint(1) NOT NULL DEFAULT '0',
8820
            amount_original decimal(28,6) DEFAULT NULL,
8821
            amount_outstanding decimal(28,6) DEFAULT NULL,
8822
            amount_last_increment decimal(28,6) DEFAULT NULL,
8823
            description mediumtext,
8824
            notes text,
8825
            branchcode VARCHAR( 10 ) NULL DEFAULT NULL,
8826
            manager_id int(11) DEFAULT NULL,
8827
            created_on timestamp NULL DEFAULT NULL,
8828
            updated_on timestamp NULL DEFAULT NULL,
8829
            PRIMARY KEY (debit_id),
8830
            KEY acctsborridx (borrowernumber),
8831
            KEY itemnumber (itemnumber),
8832
            KEY borrowernumber (borrowernumber),
8833
            KEY issue_id (issue_id),
8834
            KEY branchcode (branchcode)
8835
        ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
8836
    ");
8837
8838
    $dbh->do("
8839
        CREATE TABLE account_offsets (
8840
            offset_id int(11) NOT NULL AUTO_INCREMENT,
8841
            debit_id int(11) DEFAULT NULL,
8842
            credit_id int(11) DEFAULT NULL,
8843
            `type` varchar(255) DEFAULT NULL,
8844
            amount decimal(28,6) NOT NULL COMMENT 'A positive number here represents a payment, a negative is a increase in a fine.',
8845
            created_on timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
8846
            PRIMARY KEY (offset_id),
8847
            KEY fee_id (debit_id),
8848
            KEY payment_id (credit_id)
8849
        ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
8850
    ");
8851
8852
    $dbh->do("
8853
        ALTER TABLE `account_credits`
8854
          ADD CONSTRAINT account_credits_ibfk_1 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
8855
          ADD CONSTRAINT account_credits_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE;
8856
    ");
8857
    $dbh->do("
8858
        ALTER TABLE `account_debits`
8859
          ADD CONSTRAINT account_debits_ibfk_1 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
8860
          ADD CONSTRAINT account_debits_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE;
8861
    ");
8862
    $dbh->do("
8863
        ALTER TABLE `account_offsets`
8864
          ADD CONSTRAINT account_offsets_ibfk_1 FOREIGN KEY (debit_id) REFERENCES account_debits (debit_id) ON DELETE CASCADE ON UPDATE CASCADE,
8865
          ADD CONSTRAINT account_offsets_ibfk_2 FOREIGN KEY (credit_id) REFERENCES account_credits (credit_id) ON DELETE CASCADE ON UPDATE CASCADE;
8866
    ");
8867
8868
    $dbh->do("
8869
        ALTER TABLE borrowers ADD account_balance DECIMAL( 28, 6 ) NOT NULL;
8870
    ");
8871
8872
    my $schema = Koha::Database->new()->schema;
8873
    my $debit_rs = $schema->resultset('AccountDebit');
8874
    my $credit_rs = $schema->resultset('AccountCredit');
8875
    my $issues_rs = $schema->resultset('Issue');
8876
8877
    use Koha::Accounts::DebitTypes;
8878
    use Koha::Accounts::CreditTypes;
8879
8880
    my $debit_types_map = {
8881
        'A'    => Koha::Accounts::DebitTypes::AccountManagementFee,
8882
        'F'    => Koha::Accounts::DebitTypes::Fine,
8883
        'FU'   => Koha::Accounts::DebitTypes::Fine,
8884
        'L'    => Koha::Accounts::DebitTypes::Lost,
8885
        'M'    => Koha::Accounts::DebitTypes::Sundry,
8886
        'N'    => Koha::Accounts::DebitTypes::NewCard,
8887
        'Rent' => Koha::Accounts::DebitTypes::Rental,
8888
    };
8889
8890
    my $credit_types_map = {
8891
        'FOR' => Koha::Accounts::CreditTypes::Forgiven,
8892
        'LR'  => Koha::Accounts::CreditTypes::Found,
8893
        'Pay' => Koha::Accounts::CreditTypes::Payment,
8894
        'PAY' => Koha::Accounts::CreditTypes::Payment,
8895
        'WO'  => Koha::Accounts::CreditTypes::WriteOff,
8896
        'W'   => Koha::Accounts::CreditTypes::WriteOff,
8897
        'C'   => Koha::Accounts::CreditTypes::Credit,
8898
        'CR'  => Koha::Accounts::CreditTypes::Credit,
8899
    };
8900
8901
    my $sth = $dbh->prepare("SELECT * FROM accountlines");
8902
    $sth->execute();
8903
    while ( my $a = $sth->fetchrow_hashref() ) {
8904
        if ( $debit_types_map->{ $a->{accounttype} } ) {
8905
            $debit_rs->create(
8906
                {
8907
                    borrowernumber     => $a->{borrowernumber},
8908
                    itemnumber         => $a->{itemnumber},
8909
                    amount_original    => $a->{amount},
8910
                    amount_outstanding => $a->{amountoutstanding},
8911
                    created_on         => $a->{timestamp},
8912
                    description        => $a->{description},
8913
                    notes              => $a->{note},
8914
                    manager_id         => $a->{manager_id},
8915
                    accruing           => $a->{accounttype} eq 'FU',
8916
                    type     => $debit_types_map->{ $a->{accounttype} },
8917
                    issue_id => $a->{accounttype} eq 'FU'
8918
                    ? $issues_rs->single(
8919
                        {
8920
                            borrowernumber => $a->{borrowernumber},
8921
                            itemnumber     => $a->{itemnumber},
8922
                        }
8923
                      )->issue_id()
8924
                    : undef,
8925
                }
8926
            );
8927
        }
8928
        elsif ( $credit_types_map->{ $a->{accounttype} } ) {
8929
            $credit_rs->create(
8930
                {
8931
                    borrowernumber   => $a->{borrowernumber},
8932
                    amount_paid      => $a->{amount} * -1,
8933
                    amount_remaining => $a->{amountoutstanding} * -1,
8934
                    created_on       => $a->{timestamp},
8935
                    notes            => $a->{note},
8936
                    manager_id       => $a->{manager_id},
8937
                    type => $credit_types_map->{ $a->{accounttype} },
8938
                }
8939
            );
8940
        }
8941
        else {
8942
            # Everything else must be a MANUAL_INV
8943
            $debit_rs->create(
8944
                {
8945
                    borrowernumber     => $a->{borrowernumber},
8946
                    itemnumber         => $a->{itemnumber},
8947
                    amount_original    => $a->{amount},
8948
                    amount_outstanding => $a->{amountoutstanding},
8949
                    created_on         => $a->{timestamp},
8950
                    description        => $a->{description},
8951
                    notes              => $a->{note},
8952
                    manager_id         => $a->{manager_id},
8953
                    type               => Koha::Accounts::DebitTypes::Sundry,
8954
                }
8955
            );
8956
        }
8957
    }
8958
8959
    print "Upgrade to $DBversion done ( Bug 6427 - Rewrite of the accounts system )\n";
8960
    SetVersion ($DBversion);
8961
}
8962
8779
=head1 FUNCTIONS
8963
=head1 FUNCTIONS
8780
8964
8781
=head2 TableExists($table)
8965
=head2 TableExists($table)
8782
- 

Return to bug 6427