Attachment #156993 for bug #34752

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

Lines 448-455 sub get_order_infos { Link Here

(-)a/acqui/basket.pl (-2 / +4 lines)
448	my %line = %{ $order };	448	my %line = %{ $order };
449	# Don't show unreceived standing orders as received	449	# Don't show unreceived standing orders as received
450	$line{order_received} = ( $qty == $order->{'quantityreceived'} && ( $basket->{is_standing} ? $qty : 1 ) );	450	$line{order_received} = ( $qty == $order->{'quantityreceived'} && ( $basket->{is_standing} ? $qty : 1 ) );
451	$line{basketno} = $basketno;	451	$line{basketno} = $basketno;
452	$line{budget_name} = $budget->{budget_name};	452	$line{budget_name} = $budget->{budget_name};
		453	$line{sort1_authcat} = $budget->{sort1_authcat};
		454	$line{sort2_authcat} = $budget->{sort2_authcat};
453		455
454	# If we have an actual cost that should be the total, otherwise use the ecost	456	# If we have an actual cost that should be the total, otherwise use the ecost
455	$line{unitprice_tax_included} += 0;	457	$line{unitprice_tax_included} += 0;




                                                                    <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
                                                            [% END %]
                                                        </td>
                                                        <td>[% AuthorisedValues.GetByCode( books_loo.sort1_authcat, books_loo.sort1 ) | html %]</td>
                                                        <td>[% AuthorisedValues.GetByCode( books_loo.sort2_authcat, books_loo.sort2 ) | html %]</td>
                                                        <td>
                                                            [% IF CAN_user_acquisition_edit_invoices %]
                                                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% books_loo.invoice_object.invoiceid | url %]" class="invoice">[% books_loo.invoice_object.invoicenumber | html %]</a>

                                                                [% books_loo.invoice_object.invoicenumber | html %]
                                                            [% END %]
                                                        </td>

                                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
                                                            <td>[% books_loo.suppliers_report | html %]</td>
                                                        [% END %]
- 

Return to bug 34752

Lines 664-671 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-3 / +3 lines)
664	<i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>	664	<i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
665	[% END %]	665	[% END %]
666	</td>	666	</td>
667	<td>[% books_loo.sort1 \| html %]</td>	667	<td>[% AuthorisedValues.GetByCode( books_loo.sort1_authcat, books_loo.sort1 ) \| html %]</td>
668	<td>[% books_loo.sort2 \| html %]</td>	668	<td>[% AuthorisedValues.GetByCode( books_loo.sort2_authcat, books_loo.sort2 ) \| html %]</td>
669	<td>	669	<td>
670	[% IF CAN_user_acquisition_edit_invoices %]	670	[% IF CAN_user_acquisition_edit_invoices %]
671	<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% books_loo.invoice_object.invoiceid \| url %]" class="invoice">[% books_loo.invoice_object.invoicenumber \| html %]</a>	671	<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% books_loo.invoice_object.invoiceid \| url %]" class="invoice">[% books_loo.invoice_object.invoicenumber \| html %]</a>
Lines 673-678 Link Here
673	[% books_loo.invoice_object.invoicenumber \| html %]	673	[% books_loo.invoice_object.invoicenumber \| html %]
674	[% END %]	674	[% END %]
675	</td>	675	</td>
		676
676	[% IF Koha.Preference('EDIFACT') && ediaccount %]	677	[% IF Koha.Preference('EDIFACT') && ediaccount %]
677	<td>[% books_loo.suppliers_report \| html %]</td>	678	<td>[% books_loo.suppliers_report \| html %]</td>
678	[% END %]	679	[% END %]
679	-