Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 31017: Update field name to 'type'

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Nick Clemens 2022-08-09 19:17:14 +00:00 committed by Tomas Cohen Arazi
parent bfa2a1a148
commit 532fde9f45
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acqui/booksellers.pl
View file

@ -150,7 +150,7 @@ for my $vendor (@suppliers) {
booksellerid => $vendor->id,
name => $vendor->name,
active => $vendor->active,
vendor_type => $vendor->vendor_type,
vendor_type => $vendor->type,
basketcount => $vendor->baskets->count,
subscriptioncount => $vendor->subscriptions->count,
};

2
acqui/updatesupplier.pl
View file

@ -76,7 +76,7 @@ $data{'address3'}=$addresses[2];
$data{'address4'}=$addresses[3];
$data{'phone'}=$input->param('company_phone');
$data{'accountnumber'}=$input->param('accountnumber');
$data{'vendor_type'}=$input->param('vendor_type');
$data{'type'}=$input->param('vendor_type');
$data{'fax'}=$input->param('company_fax');
$data{'url'}=$input->param('website');
# warn "".$data{'contnotes'};

6
installer/data/mysql/atomicupdate/bug_31017.pl
View file

@ -6,11 +6,11 @@ return {
up => sub {
my ($args) = @_;
my ($dbh, $out) = @$args{qw(dbh out)};
unless( column_exists('aqbooksellers','vendor_type') ){
unless( column_exists('aqbooksellers','type') ){
$dbh->do(q{
ALTER TABLE aqbooksellers ADD COLUMN vendor_type varchar(255) DEFAULT NULL AFTER accountnumber
ALTER TABLE aqbooksellers ADD COLUMN type varchar(255) DEFAULT NULL AFTER accountnumber
});
say $out "Added vendor_type column";
say $out "Added type column to aqbooksellers";
}
$dbh->do(q{
INSERT IGNORE INTO authorised_value_categories( category_name, is_system ) VALUES ('VENDOR_TYPE', 1);

2
installer/data/mysql/kohastructure.sql
View file

@ -404,7 +404,7 @@ CREATE TABLE `aqbooksellers` (
`address4` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'fourth line of vendor physical address',
`phone` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor phone number',
`accountnumber` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor account number',
`vendor_type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`notes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'order notes',
`postal` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor postal address (all lines)',
`url` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor web address',

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
View file

@ -175,7 +175,7 @@
<input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber | html %]" /></li>
<li>
<label for="vendor_type">Vendor type: </label>
[% PROCESS 'av-build-dropbox.inc' name="vendor_type", category="VENDOR_TYPE", default=vendor_type, empty=1, size = 20 %]
[% PROCESS 'av-build-dropbox.inc' name="vendor_type", category="VENDOR_TYPE", default=type, empty=1, size = 20 %]
</li>
</ol>
</fieldset>
@ -321,7 +321,7 @@
<div class="row">
<div id="supplier-company-details" class="col-sm-6">
<h2>Vendor details</h2>
<p><span class="label">Type: </span>[% vendor_type | html %]</p>
<p><span class="label">Type: </span>[% type | html %]</p>
<p><span class="label">Company name: </span>[% name | html %]</p>
<p><span class="label">Postal address: </span>[% postal | html %]</p>
<p><span class="label">Physical address: </span>[% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]</p>