Attachment #138965 for bug #31017

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

Lines 150-155 for my $vendor (@suppliers) { Link Here

(-)a/acqui/booksellers.pl (+1 lines)
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	basketcount => $vendor->baskets->count,	154	basketcount => $vendor->baskets->count,
154	subscriptioncount => $vendor->subscriptions->count,	155	subscriptioncount => $vendor->subscriptions->count,
155	};	156	};

Lines 76-81 $data{'address3'}=$addresses[2]; Link Here

(-)a/acqui/updatesupplier.pl (+1 lines)
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{'fax'}=$input->param('company_fax');	80	$data{'fax'}=$input->param('company_fax');
80	$data{'url'}=$input->param('website');	81	$data{'url'}=$input->param('website');
81	# warn "".$data{'contnotes'};	82	# warn "".$data{'contnotes'};

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (+2 lines)
1	[% PROCESS 'i18n.inc' %]	1	[% PROCESS 'i18n.inc' %]
2	[% USE raw %]	2	[% USE raw %]
3	[% USE Asset %]	3	[% USE Asset %]
		4	[% USE AuthorisedValues %]
4	[% USE KohaDates %]	5	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
Lines 86-91 Link Here
86	[% END %]	87	[% END %]
87	</a>	88	</a>
88	<a name="[% supplier.booksellerid \| html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid \| uri %]"></a>	89	<a name="[% supplier.booksellerid \| html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid \| uri %]"></a>
		90	[% IF (supplier.vendor_type) %]([% AuthorisedValues.GetByCode( 'VENDOR_TYPE', supplier.vendor_type ) \| html %])[% END %]
89	[% IF ( !supplier.active ) %]<span class="vendor_inactive">(inactive)</span>[% END %]	91	[% IF ( !supplier.active ) %]<span class="vendor_inactive">(inactive)</span>[% END %]
90	</h2>	92	</h2>
91	<span class="basketcounts">	93	<span class="basketcounts">

Lines 172-178 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-1 / +7 lines)
172	<li><label for="website">Website: </label>	172	<li><label for="website">Website: </label>
173	<input type="text" size="40" id="website" name="website" value="[% url \| html %]" class="url" /></li>	173	<input type="text" size="40" id="website" name="website" value="[% url \| html %]" class="url" /></li>
174	<li><label for="accountnumber">Account number: </label>	174	<li><label for="accountnumber">Account number: </label>
175	<input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber \| html %]" /></li></ol>	175	<input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber \| html %]" /></li>
		176	<li>
		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 %]
		179	</li>
		180	</ol>
176	</fieldset>	181	</fieldset>
177	<fieldset class="rows">	182	<fieldset class="rows">
178	<legend>Contacts</legend>	183	<legend>Contacts</legend>
Lines 316-321 Link Here
316	<div class="row">	321	<div class="row">
317	<div id="supplier-company-details" class="col-sm-6">	322	<div id="supplier-company-details" class="col-sm-6">
318	<h2>Vendor details</h2>	323	<h2>Vendor details</h2>
		324	<p><span class="label">Type: </span>[% vendor_type \| html %]</p>
319	<p><span class="label">Company name: </span>[% name \| html %]</p>	325	<p><span class="label">Company name: </span>[% name \| html %]</p>
320	<p><span class="label">Postal address: </span>[% postal \| html %]</p>	326	<p><span class="label">Postal address: </span>[% postal \| html %]</p>
321	<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>

Lines 548-553 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt (-1 / +2 lines)
548	<p>Terms to be used in Course Reserves module. Enter terms that will show in the drop down menu when setting up a Course reserve. (For example: Spring, Summer, Winter, Fall).</p>	548	<p>Terms to be used in Course Reserves module. Enter terms that will show in the drop down menu when setting up a Course reserve. (For example: Spring, Summer, Winter, Fall).</p>
549	[% CASE 'UPLOAD' %]	549	[% CASE 'UPLOAD' %]
550	<p>Categories to be assigned to file uploads. Without a category an upload is considered temporary and may be removed during automated cleanup.</p>	550	<p>Categories to be assigned to file uploads. Without a category an upload is considered temporary and may be removed during automated cleanup.</p>
		551	[% CASE 'VENDOR_TYPE' %]
		552	<p>Values that can be entered to fill in the 'Vendor type' field in the acquisitions module, that can be used for statistical purposes</p>
551	[% CASE 'WITHDRAWN' %]	553	[% CASE 'WITHDRAWN' %]
552	<p>Description of a withdrawn item (appears when adding or editing an item)</p>	554	<p>Description of a withdrawn item (appears when adding or editing an item)</p>
553	[% CASE 'YES_NO' %]	555	[% CASE 'YES_NO' %]
554	-

Return to bug 31017