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

(-)a/acqui/booksellers.pl (-1 / +1 lines)
Lines 150-156 for my $vendor (@suppliers) { Link Here
150 
        booksellerid  => $vendor->id,
 150 
        booksellerid  => $vendor->id,
151 
        name        => $vendor->name,
 151 
        name        => $vendor->name,
152 
        active      => $vendor->active,
 152 
        active      => $vendor->active,
153 
        vendor_type => $vendor->vendor_type,
 153 
        vendor_type => $vendor->type,
154 
        basketcount   => $vendor->baskets->count,
 154 
        basketcount   => $vendor->baskets->count,
155 
        subscriptioncount => $vendor->subscriptions->count,
 155 
        subscriptioncount => $vendor->subscriptions->count,
156 
      };
 156 
      };
(-)a/acqui/updatesupplier.pl (-1 / +1 lines)
Lines 76-82 $data{'address3'}=$addresses[2]; Link Here
76 
$data{'address4'}=$addresses[3];
 76 
$data{'address4'}=$addresses[3];
77 
$data{'phone'}=$input->param('company_phone');
 77 
$data{'phone'}=$input->param('company_phone');
78 
$data{'accountnumber'}=$input->param('accountnumber');
 78 
$data{'accountnumber'}=$input->param('accountnumber');
79 
$data{'vendor_type'}=$input->param('vendor_type');
 79 
$data{'type'}=$input->param('vendor_type');
80 
$data{'fax'}=$input->param('company_fax');
 80 
$data{'fax'}=$input->param('company_fax');
81 
$data{'url'}=$input->param('website');
 81 
$data{'url'}=$input->param('website');
82 
# warn "".$data{'contnotes'};
 82 
# warn "".$data{'contnotes'};
(-)a/installer/data/mysql/atomicupdate/bug_31017.pl (-3 / +3 lines)
Lines 6-16 return { Link Here
6 
    up => sub {
 6 
    up => sub {
7 
        my ($args) = @_;
 7 
        my ($args) = @_;
8 
        my ($dbh, $out) = @$args{qw(dbh out)};
 8 
        my ($dbh, $out) = @$args{qw(dbh out)};
9 
        unless( column_exists('aqbooksellers','vendor_type') ){
 9 
        unless( column_exists('aqbooksellers','type') ){
10 
            $dbh->do(q{
 10 
            $dbh->do(q{
11 
                ALTER TABLE aqbooksellers ADD COLUMN vendor_type varchar(255) DEFAULT NULL AFTER accountnumber
 11 
                ALTER TABLE aqbooksellers ADD COLUMN type varchar(255) DEFAULT NULL AFTER accountnumber
12 
            });
 12 
            });
13 
            say $out "Added vendor_type column";
 13 
            say $out "Added type column to aqbooksellers";
14 
        }
 14 
        }
15 
        $dbh->do(q{
 15 
        $dbh->do(q{
16 
            INSERT IGNORE INTO authorised_value_categories( category_name, is_system ) VALUES ('VENDOR_TYPE', 1);
 16 
            INSERT IGNORE INTO authorised_value_categories( category_name, is_system ) VALUES ('VENDOR_TYPE', 1);
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 404-410 CREATE TABLE `aqbooksellers` ( Link Here
404 
  `address4` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'fourth line of vendor physical address',
 404 
  `address4` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'fourth line of vendor physical address',
405 
  `phone` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor phone number',
 405 
  `phone` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor phone number',
406 
  `accountnumber` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor account number',
 406 
  `accountnumber` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor account number',
407 
  `vendor_type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
 407 
  `type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
408 
  `notes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'order notes',
 408 
  `notes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'order notes',
409 
  `postal` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor postal address (all lines)',
 409 
  `postal` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor postal address (all lines)',
410 
  `url` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor web address',
 410 
  `url` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'vendor web address',
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-3 / +2 lines)
Lines 175-181 Link Here
175 
                <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber | html %]" /></li>
 175 
                <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber | html %]" /></li>
176 
                <li>
 176 
                <li>
177 
                    <label for="vendor_type">Vendor type: </label>
 177 
                    <label for="vendor_type">Vendor type: </label>
178 
                    [% PROCESS 'av-build-dropbox.inc' name="vendor_type", category="VENDOR_TYPE", default=vendor_type, empty=1, size = 20 %]
 178 
                    [% PROCESS 'av-build-dropbox.inc' name="vendor_type", category="VENDOR_TYPE", default=type, empty=1, size = 20 %]
179 
                </li>
 179 
                </li>
180 
            </ol>
 180 
            </ol>
181 
        </fieldset>
 181 
        </fieldset>
Lines 321-327 Link Here
321 
        <div class="row">
 321 
        <div class="row">
322 
            <div id="supplier-company-details" class="col-sm-6">
 322 
            <div id="supplier-company-details" class="col-sm-6">
323 
                <h2>Vendor details</h2>
 323 
                <h2>Vendor details</h2>
324 
                <p><span class="label">Type: </span>[% vendor_type | html %]</p>
 324 
                <p><span class="label">Type: </span>[% type | html %]</p>
325 
                <p><span class="label">Company name: </span>[% name | html %]</p>
 325 
                <p><span class="label">Company name: </span>[% name | html %]</p>
326 
                <p><span class="label">Postal address: </span>[% postal | html %]</p>
 326 
                <p><span class="label">Postal address: </span>[% postal | html %]</p>
327 
                <p><span class="label">Physical address: </span>[% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]</p>
 327 
                <p><span class="label">Physical address: </span>[% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]</p>
328 
-

Return to bug 31017