@@ -, +, @@ --- .../mysql/atomicupdate/bug_23049_debit.perl | 8 +-- installer/data/mysql/kohastructure.sql | 6 +-- .../prog/en/modules/admin/debit_types.tt | 50 +++++++++---------- 3 files changed, 31 insertions(+), 33 deletions(-) --- a/installer/data/mysql/atomicupdate/bug_23049_debit.perl +++ a/installer/data/mysql/atomicupdate/bug_23049_debit.perl @@ -4,7 +4,7 @@ if ( CheckVersion($DBversion) ) { $dbh->do( qq{ CREATE TABLE IF NOT EXISTS account_debit_types ( - code varchar(16) NOT NULL, + code varchar(64) NOT NULL, description varchar(200) NULL, can_be_added_manually tinyint(4) NOT NULL DEFAULT '1', default_amount decimal(28, 6) NULL, @@ -16,7 +16,7 @@ if ( CheckVersion($DBversion) ) { $dbh->do( qq{ CREATE TABLE IF NOT EXISTS ac_debit_types_branches ( - debit_type_code VARCHAR(16), + debit_type_code VARCHAR(64), branchcode VARCHAR(10), FOREIGN KEY (debit_type_code) REFERENCES account_debit_types(code) ON DELETE CASCADE, FOREIGN KEY (branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE @@ -58,7 +58,7 @@ if ( CheckVersion($DBversion) ) { can_be_added_manually ) SELECT - SUBSTR(authorised_value, 1, 16), + SUBSTR(authorised_value, 1, 64), lib, authorised_value, 1 @@ -73,7 +73,7 @@ if ( CheckVersion($DBversion) ) { qq{ ALTER IGNORE TABLE accountlines ADD - debit_type varchar(16) DEFAULT NULL + debit_type varchar(64) DEFAULT NULL AFTER accounttype } --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -2627,7 +2627,7 @@ CREATE TABLE `cash_registers` ( DROP TABLE IF EXISTS `account_debit_types`; CREATE TABLE `account_debit_types` ( - `code` varchar(16) NOT NULL, + `code` varchar(64) NOT NULL, `default_amount` decimal(28,6) DEFAULT NULL, `description` varchar(200) DEFAULT NULL, `can_be_added_manually` tinyint(4) NOT NULL DEFAULT '1', @@ -2640,7 +2640,7 @@ CREATE TABLE `account_debit_types` ( DROP TABLE IF EXISTS `ac_debit_types_branches`; CREATE TABLE `ac_debit_types_branches` ( - `debit_type_code` VARCHAR(16), + `debit_type_code` VARCHAR(64), `branchcode` VARCHAR(10), FOREIGN KEY (`debit_type_code`) REFERENCES `account_debit_types` (`code`) ON DELETE CASCADE, FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE @@ -2660,7 +2660,7 @@ CREATE TABLE `accountlines` ( `amount` decimal(28,6) default NULL, `description` LONGTEXT, `accounttype` varchar(80) default NULL, - `debit_type` varchar(16) default NULL, + `debit_type` varchar(64) default NULL, `status` varchar(16) default NULL, `payment_type` varchar(80) default NULL, -- optional authorised value PAYMENT_TYPE `amountoutstanding` decimal(28,6) default NULL, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -6,18 +6,18 @@ [% INCLUDE 'doc-head-open.inc' %]