Attachment #81917 for bug #21387

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

Lines 73-78 use C4::Suggestions; Link Here

(-)a/acqui/orderreceive.pl (+6 lines)
73	use C4::Koha;	73	use C4::Koha;
74		74
75	use Koha::Acquisition::Booksellers;	75	use Koha::Acquisition::Booksellers;
		76	use Koha::Acquisition::Currencies;
76	use Koha::Acquisition::Orders;	77	use Koha::Acquisition::Orders;
77	use Koha::DateUtils qw( dt_from_string );	78	use Koha::DateUtils qw( dt_from_string );
78	use Koha::ItemTypes;	79	use Koha::ItemTypes;
Lines 112-117 unless ( $results and @$results) { Link Here
112	# prepare the form for receiving	113	# prepare the form for receiving
113	my $order = $results->[0];	114	my $order = $results->[0];
114	my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;	115	my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;
		116	my $active_currency = Koha::Acquisition::Currencies->get_active;
115		117
116	# Check if ACQ framework exists	118	# Check if ACQ framework exists
117	my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );	119	my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );
Lines 203-208 $template->param( Link Here
203	booksellerid => $order->{'booksellerid'},	205	booksellerid => $order->{'booksellerid'},
204	freight => $freight,	206	freight => $freight,
205	name => $bookseller->name,	207	name => $bookseller->name,
		208	cur_active_sym => $active_currency->symbol,
		209	cur_active => $active_currency->currency,
		210	listincgst => $bookseller->listincgst,
		211	invoiceincgst => $bookseller->invoiceincgst,
206	title => $order->{'title'},	212	title => $order->{'title'},
207	author => $order->{'author'},	213	author => $order->{'author'},
208	copyrightdate => $order->{'copyrightdate'},	214	copyrightdate => $order->{'copyrightdate'},




            <input type="hidden" name="tax_rate" value="0" />
        [% END %]

        <li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])</span></li>
        <li>
            <label for="replacementprice">Replacement price:</label>
            <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price %]" />
        </li>
        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]</span></li>
        <li>
            <label for="unitprice">Actual cost:</label>
            <input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 | html %]" /> <span lass="hint">[% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]</span>
        </li>
        <li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote | html %]</textarea></li>
        [% IF order_vendornote %]
- 

Return to bug 21387

Lines 239-253 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-4 / +3 lines)
239	<input type="hidden" name="tax_rate" value="0" />	239	<input type="hidden" name="tax_rate" value="0" />
240	[% END %]	240	[% END %]
241		241
242	<li><label for="rrp">Retail price: </label>[% rrp \| $Price %]</li>	242	<li><label for="rrp">Retail price: </label>[% rrp \| $Price %] <span class="hint">(adjusted for [% cur_active \| html %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])</span></li>
243	<li>	243	<li>
244	<label for="replacementprice">Replacement price:</label>	244	<label for="replacementprice">Replacement price:</label>
245	<input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice \| $Price %]" />	245	<input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice \| $Price %]" />
246	</li>	246	</li>
247	<li><label for="ecost">Budgeted cost: </label>[% ecost \| $Price %]</li>	247	<li><label for="ecost">Budgeted cost: </label>[% ecost \| $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]</span></li>
248	<li>	248	<li>
249	<label for="unitprice">Actual cost:</label>	249	<label for="unitprice">Actual cost:</label>
250	<input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice \| $Price on_editing => 1 \| html %]" />	250	<input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice \| $Price on_editing => 1 \| html %]" /> <span lass="hint">[% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]</span>
251	</li>	251	</li>
252	<li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote \| html %]</textarea></li>	252	<li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote \| html %]</textarea></li>
253	[% IF order_vendornote %]	253	[% IF order_vendornote %]
254	-