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

(-)a/C4/Acquisition.pm (-1 / +1 lines)
Lines 411-417 sub GetBasketGroupAsCSV { Link Here
411
                notes => $order->{order_vendornote},
411
                notes => $order->{order_vendornote},
412
                entrydate => $order->{entrydate},
412
                entrydate => $order->{entrydate},
413
                booksellername => $bookseller->name,
413
                booksellername => $bookseller->name,
414
                bookselleraddress => $bookseller->address1,
414
                bookselleraddress => $bookseller->address,
415
                booksellerpostal => $bookseller->postal,
415
                booksellerpostal => $bookseller->postal,
416
                contractnumber => $contract->{contractnumber},
416
                contractnumber => $contract->{contractnumber},
417
                contractname => $contract->{contractname},
417
                contractname => $contract->{contractname},
(-)a/acqui/uncertainprice.pl (-4 / +1 lines)
Lines 103-112 $template->param( uncertainpriceorders => \@orders, Link Here
103
                                   booksellername => "".$bookseller->name,
103
                                   booksellername => "".$bookseller->name,
104
                                   booksellerid => $bookseller->id,
104
                                   booksellerid => $bookseller->id,
105
                                   booksellerpostal =>$bookseller->postal,
105
                                   booksellerpostal =>$bookseller->postal,
106
                                   bookselleraddress1 => $bookseller->address1,
106
                                   bookselleraddress => $bookseller->address,
107
                                   bookselleraddress2 => $bookseller->address2,
108
                                   bookselleraddress3 => $bookseller->address3,
109
                                   bookselleraddress4 => $bookseller->address4,
110
                                   booksellerphone =>$bookseller->phone,
107
                                   booksellerphone =>$bookseller->phone,
111
                                   booksellernotes => $bookseller->notes,
108
                                   booksellernotes => $bookseller->notes,
112
                                   basketcount   => $bookseller->baskets->count,
109
                                   basketcount   => $bookseller->baskets->count,
(-)a/acqui/updatesupplier.pl (-6 / +1 lines)
Lines 70-81 $data{'id'}=$booksellerid; Link Here
70
70
71
$data{'name'}=$input->param('company');
71
$data{'name'}=$input->param('company');
72
$data{'postal'}=$input->param('company_postal');
72
$data{'postal'}=$input->param('company_postal');
73
my $address=$input->param('physical');
73
$data{'address'}=$input->param('address');
74
my @addresses=split('\n',$address);
75
$data{'address1'}=$addresses[0];
76
$data{'address2'}=$addresses[1];
77
$data{'address3'}=$addresses[2];
78
$data{'address4'}=$addresses[3];
79
$data{'phone'}=$input->param('company_phone');
74
$data{'phone'}=$input->param('company_phone');
80
$data{'accountnumber'}=$input->param('accountnumber');
75
$data{'accountnumber'}=$input->param('accountnumber');
81
$data{'fax'}=$input->param('company_fax');
76
$data{'fax'}=$input->param('company_fax');
(-)a/api/v1/swagger/definitions/vendor.json (-23 / +2 lines)
Lines 10-42 Link Here
10
      ],
10
      ],
11
      "description": "Vendor name"
11
      "description": "Vendor name"
12
    },
12
    },
13
    "address1": {
13
    "address": {
14
      "type": [
14
      "type": [
15
        "string",
15
        "string",
16
        "null"
16
        "null"
17
      ],
17
      ],
18
      "description": "Vendor physical address (line 1)"
18
      "description": "Vendor physical address"
19
    },
20
    "address2": {
21
      "type": [
22
        "string",
23
        "null"
24
      ],
25
      "description": "Vendor physical address (line 2)"
26
    },
27
    "address3": {
28
      "type": [
29
        "string",
30
        "null"
31
      ],
32
      "description": "Vendor physical address (line 3)"
33
    },
34
    "address4": {
35
      "type": [
36
        "string",
37
        "null"
38
      ],
39
      "description": "Vendor physical address (line 4)"
40
    },
19
    },
41
    "phone": {
20
    "phone": {
42
      "type": [
21
      "type": [
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-3 / +3 lines)
Lines 130-137 Link Here
130
                <input type="text" size="40" id="company" name="company" value="[% name | html %]" required="required" class="required" /><span class="required">Required</span></li>
130
                <input type="text" size="40" id="company" name="company" value="[% name | html %]" required="required" class="required" /><span class="required">Required</span></li>
131
            <li><label for="company_postal">Postal address: </label>
131
            <li><label for="company_postal">Postal address: </label>
132
                    <textarea id="company_postal" name="company_postal" cols="40" rows="3">[% postal | html %]</textarea></li>
132
                    <textarea id="company_postal" name="company_postal" cols="40" rows="3">[% postal | html %]</textarea></li>
133
            <li><label for="physical">Physical address: </label>
133
            <li><label for="address">Physical address: </label>
134
                <textarea id="physical" name="physical" cols="40" rows="3">[% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]</textarea></li>
134
                <textarea id="address" name="address" cols="40" rows="3">[% address | html %]</textarea></li>
135
            <li><label for="company_phone">Phone: </label>
135
            <li><label for="company_phone">Phone: </label>
136
                <input type="text" size="20" id="company_phone" name="company_phone" value="[% phone | html %]" /></li>
136
                <input type="text" size="20" id="company_phone" name="company_phone" value="[% phone | html %]" /></li>
137
            <li><label for="company_fax">Fax: </label>
137
            <li><label for="company_fax">Fax: </label>
Lines 285-291 Link Here
285
                <h2>Vendor details</h2>
285
                <h2>Vendor details</h2>
286
                <p><span class="label">Company name: </span>[% name | html %]</p>
286
                <p><span class="label">Company name: </span>[% name | html %]</p>
287
                <p><span class="label">Postal address: </span>[% postal | html %]</p>
287
                <p><span class="label">Postal address: </span>[% postal | html %]</p>
288
                <p><span class="label">Physical address: </span>[% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]</p>
288
                <p><span class="label">Physical address: </span>[% address | html %]</p>
289
                <p><span class="label">Phone: </span>[% phone | html %]</p>
289
                <p><span class="label">Phone: </span>[% phone | html %]</p>
290
                <p><span class="label">Fax: </span>[% fax | html %]</p>
290
                <p><span class="label">Fax: </span>[% fax | html %]</p>
291
                [% IF ( url ) %]
291
                [% IF ( url ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-4 / +1 lines)
Lines 29-38 Link Here
29
            <h2>Contact information</h2>
29
            <h2>Contact information</h2>
30
            <p><strong>Address: </strong>
30
            <p><strong>Address: </strong>
31
                [% booksellerpostal | html %]
31
                [% booksellerpostal | html %]
32
                [% bookselleraddress1 | html %]
32
                [% bookselleraddress | html %]
33
                [% bookselleraddress2 | html %]
34
                [% bookselleraddress3 | html %]
35
                [% bookselleraddress4 | html %]
36
            </p>
33
            </p>
37
            <p><strong>Phone: </strong>
34
            <p><strong>Phone: </strong>
38
                [% booksellerphone | html %] / Fax:
35
                [% booksellerphone | html %] / Fax:
(-)a/t/db_dependent/Bookseller.t (-20 / +5 lines)
Lines 53-62 my $curcode = $builder->build({ source => 'Currency' })->{currencycode}; Link Here
53
my $count            = Koha::Acquisition::Booksellers->search()->count();
53
my $count            = Koha::Acquisition::Booksellers->search()->count();
54
my $sample_supplier1 = {
54
my $sample_supplier1 = {
55
    name          => 'Name1',
55
    name          => 'Name1',
56
    address1      => 'address1_1',
56
    address       => 'address',
57
    address2      => 'address1-2',
58
    address3      => 'address1_2',
59
    address4      => 'address1_2',
60
    postal        => 'postal1',
57
    postal        => 'postal1',
61
    phone         => 'phone1',
58
    phone         => 'phone1',
62
    accountnumber => 'accountnumber1',
59
    accountnumber => 'accountnumber1',
Lines 73-82 my $sample_supplier1 = { Link Here
73
};
70
};
74
my $sample_supplier2 = {
71
my $sample_supplier2 = {
75
    name          => 'Name2',
72
    name          => 'Name2',
76
    address1      => 'address1_2',
73
    address       => 'address2',
77
    address2      => 'address2-2',
78
    address3      => 'address3_2',
79
    address4      => 'address4_2',
80
    postal        => 'postal2',
74
    postal        => 'postal2',
81
    phone         => 'phone2',
75
    phone         => 'phone2',
82
    accountnumber => 'accountnumber2',
76
    accountnumber => 'accountnumber2',
Lines 216-225 is( $bookseller1fromid->subscriptions->count, Link Here
216
$sample_supplier2 = {
210
$sample_supplier2 = {
217
    id            => $id_supplier2,
211
    id            => $id_supplier2,
218
    name          => 'Name2 modified',
212
    name          => 'Name2 modified',
219
    address1      => 'address1_2 modified',
213
    address       => 'address2 modified',
220
    address2      => 'address2-2 modified',
221
    address3      => 'address3_2 modified',
222
    address4      => 'address4_2 modified',
223
    postal        => 'postal2 modified',
214
    postal        => 'postal2 modified',
224
    phone         => 'phone2 modified',
215
    phone         => 'phone2 modified',
225
    accountnumber => 'accountnumber2 modified',
216
    accountnumber => 'accountnumber2 modified',
Lines 246-255 is( $supplier2->name, 'Name2 modified', "supplier's name should have been modifi Link Here
246
#Add 2 suppliers
237
#Add 2 suppliers
247
my $sample_supplier3 = {
238
my $sample_supplier3 = {
248
    name          => 'Name3',
239
    name          => 'Name3',
249
    address1      => 'address1_3',
240
    address       => 'address_3',
250
    address2      => 'address1-3',
251
    address3      => 'address1_3',
252
    address4      => 'address1_3',
253
    postal        => 'postal3',
241
    postal        => 'postal3',
254
    phone         => 'phone3',
242
    phone         => 'phone3',
255
    accountnumber => 'accountnumber3',
243
    accountnumber => 'accountnumber3',
Lines 266-275 my $sample_supplier3 = { Link Here
266
};
254
};
267
my $sample_supplier4 = {
255
my $sample_supplier4 = {
268
    name          => 'Name4',
256
    name          => 'Name4',
269
    address1      => 'address1_4',
257
    address       => 'address_4',
270
    address2      => 'address1-4',
271
    address3      => 'address1_4',
272
    address4      => 'address1_4',
273
    postal        => 'postal4',
258
    postal        => 'postal4',
274
    phone         => 'phone4',
259
    phone         => 'phone4',
275
    accountnumber => 'accountnumber4',
260
    accountnumber => 'accountnumber4',
(-)a/t/db_dependent/Serials/Claims.t (-9 / +2 lines)
Lines 36-45 my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio($record, ''); Link Here
36
36
37
my $sample_supplier1 = {
37
my $sample_supplier1 = {
38
    name          => 'Name1',
38
    name          => 'Name1',
39
    address1      => 'address1_1',
39
    address       => 'address1',
40
    address2      => 'address1-2',
41
    address3      => 'address1_2',
42
    address4      => 'address1_2',
43
    postal        => 'postal1',
40
    postal        => 'postal1',
44
    phone         => 'phone1',
41
    phone         => 'phone1',
45
    accountnumber => 'accountnumber1',
42
    accountnumber => 'accountnumber1',
Lines 56-65 my $sample_supplier1 = { Link Here
56
};
53
};
57
my $sample_supplier2 = {
54
my $sample_supplier2 = {
58
    name          => 'Name2',
55
    name          => 'Name2',
59
    address1      => 'address1_2',
56
    address       => 'address2',
60
    address2      => 'address2-2',
61
    address3      => 'address3_2',
62
    address4      => 'address4_2',
63
    postal        => 'postal2',
57
    postal        => 'postal2',
64
    phone         => 'phone2',
58
    phone         => 'phone2',
65
    accountnumber => 'accountnumber2',
59
    accountnumber => 'accountnumber2',
66
- 

Return to bug 15272