Attachment #146814 for bug #32705

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




my $total_tax_excluded = 0;
my $total_tax_included = 0;
my $total_tax_value = 0;
my $has_invoice_unitprice;
foreach my $order (@$orders) {
    my $line = get_infos( $order, $bookseller);


    $total_tax_included += get_rounded_price($$line{total_tax_included});

    $line->{orderline} = $line->{parent_ordernumber};
    $has_invoice_unitprice = 1 if defined $line->{invoice_unitprice};
    push @orders_loop, $line;
}


    currency                    => Koha::Acquisition::Currencies->get_active,
    budgets                     => $budget_loop,
    budget                      => GetBudget( $shipmentcost_budgetid ),
    has_invoice_unitprice       => $has_invoice_unitprice,
);

defined( $invoice_files ) && $template->param( files => $invoice_files->GetFilesInfo() );

Lines 317-322 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +19 lines)
317	<tr>	317	<tr>
318	<th class="anti-the">Summary</th>	318	<th class="anti-the">Summary</th>
319	<th>Library</th>	319	<th>Library</th>
		320	[% IF has_invoice_unitprice %]
		321	<th>Invoice price</th>
		322	[% END %]
320	<th class="tax_excluded">Actual cost tax exc.</th>	323	<th class="tax_excluded">Actual cost tax exc.</th>
321	<th class="tax_included">Actual cost tax inc.</th>	324	<th class="tax_included">Actual cost tax inc.</th>
322	<th class="replacementprice">Replacement price</th>	325	<th class="replacementprice">Replacement price</th>
Lines 349-354 Link Here
349	</td>	352	</td>
350	<td>	353	<td>
351	<p>[% order.branchcode \| html %]</p>	354	<p>[% order.branchcode \| html %]</p>
		355	[% IF has_invoice_unitprice %]
		356	<td>
		357	[% IF order.invoice_unitprice %]
		358	[% order.invoice_unitprice \| $Price %] [% order.invoice_currency \| html %]
		359	[% END %]
		360	</td>
		361	[% END %]
352	</td>	362	</td>
353	<td class="number tax_excluded">	363	<td class="number tax_excluded">
354	[% order.unitprice_tax_excluded \| $Price %]	364	[% order.unitprice_tax_excluded \| $Price %]
Lines 388-393 Link Here
388	[% FOR tf IN foot_loop %]	398	[% FOR tf IN foot_loop %]
389	<tr>	399	<tr>
390	<th colspan="2">Total (GST [% tf.tax_rate * 100 \| html %] %)</th>	400	<th colspan="2">Total (GST [% tf.tax_rate * 100 \| html %] %)</th>
		401	[% IF has_invoice_unitprice %]
		402	<th></th>
		403	[% END %]
391	<th class="tax_excluded"></th>	404	<th class="tax_excluded"></th>
392	<th class="tax_included"></th>	405	<th class="tax_included"></th>
393	<th class="replacementprice"/>	406	<th class="replacementprice"/>
Lines 401-406 Link Here
401	[% END # /FOR tf %]	414	[% END # /FOR tf %]
402	<tr>	415	<tr>
403	<th colspan="2">Total ([% currency.symbol \| html %])</th>	416	<th colspan="2">Total ([% currency.symbol \| html %])</th>
		417	[% IF has_invoice_unitprice %]
		418	<th></th>
		419	[% END %]
404	<th class="tax_excluded"></th>	420	<th class="tax_excluded"></th>
405	<th class="tax_included"></th>	421	<th class="tax_included"></th>
406	<th class="replacementprice"/>	422	<th class="replacementprice"/>
Lines 413-418 Link Here
413	</tr>	429	</tr>
414	<tr>	430	<tr>
415	<th colspan="2">Total + adjustments + shipment cost ([% currency.symbol \| html %])</th>	431	<th colspan="2">Total + adjustments + shipment cost ([% currency.symbol \| html %])</th>
		432	[% IF has_invoice_unitprice %]
		433	<th></th>
		434	[% END %]
416	<th class="tax_excluded"></th>	435	<th class="tax_excluded"></th>
417	<th class="tax_included"></th>	436	<th class="tax_included"></th>
418	<th class="replacementprice"/>	437	<th class="replacementprice"/>
419	-

Return to bug 32705

Lines 262-267 my $total_quantity = 0; Link Here

(-)a/acqui/invoice.pl (+3 lines)
262	my $total_tax_excluded = 0;	262	my $total_tax_excluded = 0;
263	my $total_tax_included = 0;	263	my $total_tax_included = 0;
264	my $total_tax_value = 0;	264	my $total_tax_value = 0;
		265	my $has_invoice_unitprice;
265	foreach my $order (@$orders) {	266	foreach my $order (@$orders) {
266	my $line = get_infos( $order, $bookseller);	267	my $line = get_infos( $order, $bookseller);
267		268
Lines 282-287 foreach my $order (@$orders) { Link Here
282	$total_tax_included += get_rounded_price($$line{total_tax_included});	283	$total_tax_included += get_rounded_price($$line{total_tax_included});
283		284
284	$line->{orderline} = $line->{parent_ordernumber};	285	$line->{orderline} = $line->{parent_ordernumber};
		286	$has_invoice_unitprice = 1 if defined $line->{invoice_unitprice};
285	push @orders_loop, $line;	287	push @orders_loop, $line;
286	}	288	}
287		289
Lines 344-349 $template->param( Link Here
344	currency => Koha::Acquisition::Currencies->get_active,	346	currency => Koha::Acquisition::Currencies->get_active,
345	budgets => $budget_loop,	347	budgets => $budget_loop,
346	budget => GetBudget( $shipmentcost_budgetid ),	348	budget => GetBudget( $shipmentcost_budgetid ),
		349	has_invoice_unitprice => $has_invoice_unitprice,
347	);	350	);
348		351
349	defined( $invoice_files ) && $template->param( files => $invoice_files->GetFilesInfo() );	352	defined( $invoice_files ) && $template->param( files => $invoice_files->GetFilesInfo() );