#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
#you can use any PDF::API2 module, all you need to do is return the stringifyed pdf object from the printpdf sub.
package pdfformat::layout3pages;
use vars qw($VERSION @ISA @EXPORT);
-use Number::Format qw(format_price);
use MIME::Base64;
+use List::MoreUtils qw/uniq/;
use strict;
use warnings;
use utf8;
-use C4::Branch qw(GetBranchDetail);
+use C4::Branch qw(GetBranchName);
+
+use Koha::Number::Price;
+use Koha::DateUtils;
+use Koha::Libraries;
BEGIN {
use Exporter ();
#be careful, all the sizes (height, width, etc...) are in mm, not PostScript points (the default measurment of PDF::API2).
-#The constants exported tranform that into PostScript points (/mm for milimeter, /in for inch, pt is postscript point, and as so is there only to show what is happening.
+#The constants exported transform that into PostScript points (/mm for milimeter, /in for inch, pt is postscript point, and as so is there only to show what is happening.
use constant mm => 25.4 / 72;
use constant in => 1 / 72;
use constant pt => 1;
my ($pdf, $basketgroup, $baskets, $orders) = @_;
my $cur_format = C4::Context->preference("CurrencyFormat");
- my $num;
-
- if ( $cur_format eq 'FR' ) {
- $num = new Number::Format(
- 'decimal_fill' => '2',
- 'decimal_point' => ',',
- 'int_curr_symbol' => '',
- 'mon_thousands_sep' => ' ',
- 'thousands_sep' => ' ',
- 'mon_decimal_point' => ','
- );
- } else { # US by default..
- $num = new Number::Format(
- 'int_curr_symbol' => '',
- 'mon_thousands_sep' => ',',
- 'mon_decimal_point' => '.'
- );
- }
$pdf->mediabox($height/mm, $width/mm);
my $number = 3;
# add basketgroup number
$text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm );
$text->translate(20/mm, ($height-15)/mm);
- $text->text("Order N°".$basketgroup->{'id'}.". Basket N° ".$basket->{basketno}.". ".$basket->{booksellernote});
-
+ $text->text("Order no. ".$basketgroup->{'id'}.". Basket no. ".$basket->{basketno}.". ".$basket->{booksellernote});
+ $text->translate(20/mm, ($height-20)/mm);
+ $text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
+ $text->text( ( $basket->{billingplace} ? "Billing at " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" )
+ . ( $basket->{billingplace} and $basket->{deliveryplace} ? " and " : "" )
+ . ( $basket->{deliveryplace} ? "delivery at " . C4::Branch::GetBranchName( $basket->{deliveryplace}) : "" )
+ );
+
my $pdftable = new PDF::Table();
my $abaskets;
my $arrbasket;
- my @keys = ('Document','Qty','RRT GST Inc.','Discount','Discount price GST Exc.','GST', 'Total GST Inc.');
+ my @keys = ('Document', 'Qty', 'RRP tax exc.', 'RRP tax inc.', 'Discount', 'Discount price', 'GST rate', 'Total tax exc.', 'Total tax inc.');
for my $bkey (@keys) {
push(@$arrbasket, $bkey);
}
push(@$abaskets, $arrbasket);
-# @{$orders->{$basket->{basketno}}});
+
+ my $titleinfo;
foreach my $line (@{$orders->{$basket->{basketno}}}) {
$arrbasket = undef;
- push(@$arrbasket, @$line[3]." / ".@$line[2].(@$line[0]?" ISBN : ".@$line[0]:'').(@$line[10]?" EN : ".@$line[10]:'').", ".@$line[1].(@$line[4]?' published by '.@$line[4]:''), @$line[5],$num->format_price(@$line[6]),$num->format_price(@$line[8]).'%',$num->format_price(@$line[7]/(1+@$line[9]/100)),$num->format_price(@$line[9]).'%',$num->format_price($num->round(@$line[7])*@$line[5]));
+ $titleinfo = "";
+ if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) {
+ $titleinfo = $line->{title} . " / " . $line->{author} .
+ ( $line->{isbn} ? " ISBN: " . $line->{isbn} : '' ) .
+ ( $line->{en} ? " EN: " . $line->{en} : '' ) .
+ ( $line->{itemtype} ? ", " . $line->{itemtype} : '' ) .
+ ( $line->{edition} ? ", " . $line->{edition} : '' ) .
+ ( $line->{publishercode} ? ' published by '. $line->{publishercode} : '') .
+ ( $line->{publicationyear} ? ', '. $line->{publicationyear} : '');
+ }
+ else { # MARC21, NORMARC
+ $titleinfo = $line->{title} . " " . $line->{author} .
+ ( $line->{isbn} ? " ISBN: " . $line->{isbn} : '' ) .
+ ( $line->{en} ? " EN: " . $line->{en} : '' ) .
+ ( $line->{itemtype} ? " " . $line->{itemtype} : '' ) .
+ ( $line->{edition} ? ", " . $line->{edition} : '' ) .
+ ( $line->{publishercode} ? ' published by '. $line->{publishercode} : '') .
+ ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : '');
+ }
+ push( @$arrbasket,
+ $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNote for vendor : " . $line->{order_vendornote} : '' ),
+ $line->{quantity},
+ Koha::Number::Price->new( $line->{rrpgste} )->format,
+ Koha::Number::Price->new( $line->{rrpgsti} )->format,
+ Koha::Number::Price->new( $line->{discount} )->format . '%',
+ Koha::Number::Price->new( $line->{rrpgste} - $line->{ecostgste})->format,
+ Koha::Number::Price->new( $line->{gstrate} * 100 )->format . '%',
+ Koha::Number::Price->new( $line->{totalgste} )->format,
+ Koha::Number::Price->new( $line->{totalgsti} )->format,
+ );
push(@$abaskets, $arrbasket);
}
-
+
$pdftable->table($pdf, $page, $abaskets,
x => 10/mm,
w => ($width - 20)/mm,
font_size => 3/mm,
header_props => {
font => $pdf->corefont("Times", -encoding => "utf8"),
- font_size => 10,
+ font_size => 9,
bg_color => 'gray',
repeat => 1,
},
column_props => [
{
- min_w => 100/mm, # Minimum column width.
+ min_w => 85/mm, # Minimum column width.
+ },
+ {
+ justify => 'right', # One of left|right ,
+ },
+ {
+ justify => 'right', # One of left|right ,
},
{
justify => 'right', # One of left|right ,
my $libraryname = C4::Context->preference("LibraryName");
my $cur_format = C4::Context->preference("CurrencyFormat");
- my $num;
-
- if ( $cur_format eq 'FR' ) {
- $num = new Number::Format(
- 'decimal_fill' => '2',
- 'decimal_point' => ',',
- 'int_curr_symbol' => '',
- 'mon_thousands_sep' => ' ',
- 'thousands_sep' => ' ',
- 'mon_decimal_point' => ','
- );
- } else { # US by default..
- $num = new Number::Format(
- 'int_curr_symbol' => '',
- 'mon_thousands_sep' => ',',
- 'mon_decimal_point' => '.'
- );
- }
-
+
$pdf->mediabox($width/mm, $height/mm);
my $page = $pdf->openpage(2);
# create a text
my $abaskets;
my $arrbasket;
# header of the table
- my @keys = ('Lot', 'Basket (N°)', 'RRT GST Inc.', 'Discount', 'Discount price','GST rate', 'Total GST exc.','GST', 'Total GST Inc.');
+ my @keys = ('Lot', 'Basket (No.)','Total RRP tax exc.', 'Total RRP tax inc.', 'GST rate', 'GST', 'Total discount', 'Total tax exc.', 'Total tax inc.');
for my $bkey (@keys) {
push(@$arrbasket, $bkey);
}
- my $grandtotal=0;
- my $grandgst=0;
+ my ($grandtotalrrpgsti, $grandtotalrrpgste, $grandtotalgsti, $grandtotalgste, $grandtotalgstvalue, $grandtotaldiscount);
# calculate each basket total
push(@$abaskets, $arrbasket);
for my $basket (@$hbaskets) {
+ my @gst;
$arrbasket = undef;
- my ($total, $gst, $totallist) = (0, 0, 0);
+ my ($totalrrpgste, $totalrrpgsti, $totalgste, $totalgsti, $totalgstvalue, $totaldiscount);
my $ords = $orders->{$basket->{basketno}};
my $ordlength = @$ords;
foreach my $ord (@$ords) {
- $total += @$ord[5] * @$ord[7];
- $gst += (@$ord[5] * @$ord[7]) * $GSTrate/(1+$GSTrate);
- $totallist += @$ord[5]*@$ord[6];
+ $totalgste += $ord->{totalgste};
+ $totalgsti += $ord->{totalgsti};
+ $totalgstvalue += $ord->{gstvalue};
+ $totaldiscount += ($ord->{rrpgste} - $ord->{ecostgste} ) * $ord->{quantity};
+ $totalrrpgste += $ord->{rrpgste} * $ord->{quantity};
+ $totalrrpgsti += $ord->{rrpgsti} * $ord->{quantity};
+ push @gst, $ord->{gstrate};
}
- $total=$num->round($total);
- $gst=$num->round($gst);
- $grandtotal +=$total;
- $grandgst +=$gst;
- push(@$arrbasket, $basket->{contractname}, $basket->{basketname}.'(N°'.$basket->{basketno}.')',$num->format_price($totallist), $num->format_price($bookseller->{discount}).'%', $num->format_price($total), $num->format_price($GSTrate*100).'%', $num->format_price($total-$gst), $num->format_price($gst), $num->format_price($total));
+ @gst = uniq map { $_ * 100 } @gst;
+ $grandtotalrrpgste += $totalrrpgste;
+ $grandtotalrrpgsti += $totalrrpgsti;
+ $grandtotalgsti += $totalgsti;
+ $grandtotalgste += $totalgste;
+ $grandtotalgstvalue += $totalgstvalue;
+ $grandtotaldiscount += $totaldiscount;
+ my @gst_string =
+ map { Koha::Number::Price->new($_)->format . '%' } @gst;
+ push(@$arrbasket,
+ $basket->{contractname},
+ $basket->{basketname} . ' (No. ' . $basket->{basketno} . ')',
+ Koha::Number::Price->new( $totalrrpgste )->format,
+ Koha::Number::Price->new( $totalrrpgsti )->format,
+ "@gst_string",
+ Koha::Number::Price->new( $totalgstvalue )->format,
+ Koha::Number::Price->new( $totaldiscount )->format,
+ Koha::Number::Price->new( $totalgste )->format,
+ Koha::Number::Price->new( $totalgsti )->format,
+ );
push(@$abaskets, $arrbasket);
}
# now, push total
undef $arrbasket;
- push @$arrbasket,'','','','Total',$num->format_price($grandtotal),'',$num->format_price($grandtotal-$grandgst), $num->format_price($grandgst),$num->format_price($grandtotal);
+ push @$arrbasket,
+ '',
+ 'Total',
+ Koha::Number::Price->new( $grandtotalrrpgste )->format,
+ Koha::Number::Price->new( $grandtotalrrpgsti )->format,
+ '',
+ Koha::Number::Price->new( $grandtotalgstvalue )->format,
+ Koha::Number::Price->new( $grandtotaldiscount )->format,
+ Koha::Number::Price->new( $grandtotalgste )->format,
+ Koha::Number::Price->new( $grandtotalgsti )->format;
push @$abaskets,$arrbasket;
# height is width and width is height in this function, as the pdf is in landscape mode for the Tables.
{
justify => 'right',
},
- {
- justify => 'right',
- },
- {
- justify => 'right',
- },
],
);
$pdf->mediabox($height/mm, $width/mm);
# get library name
my $libraryname = C4::Context->preference("LibraryName");
- # get branch details
- my $billingdetails = GetBranchDetail( $basketgroup->{billingplace} );
- my $deliverydetails = GetBranchDetail( $basketgroup->{deliveryplace} );
+ my $billing_library = Koha::Libraries->find( $basketgroup->{billingplace} );
+ my $delivery_library = Koha::Libraries->find( $basketgroup->{deliveryplace} );
my $freedeliveryplace = $basketgroup->{freedeliveryplace};
# get the subject
my $subject;
$text->text($basketgroup->{'id'});
# print the date
- my $today = C4::Dates->today();
+ my $today = output_pref({ dt => dt_from_string, dateonly => 1 });
$text->translate(130/mm, ($height-5-48)/mm);
$text->text($today);
$text->translate(100/mm, ($height-86)/mm);
$text->text($libraryname);
$text->translate(100/mm, ($height-97)/mm);
- $text->text($billingdetails->{branchname});
+ $text->text($billing_library->branchname);
$text->translate(100/mm, ($height-108.5)/mm);
- $text->text($billingdetails->{branchphone});
+ $text->text($billing_library->branchphone);
$text->translate(100/mm, ($height-115.5)/mm);
- $text->text($billingdetails->{branchfax});
+ $text->text($billing_library->branchfax);
$text->translate(100/mm, ($height-122.5)/mm);
- $text->text($billingdetails->{branchaddress1});
+ $text->text($billing_library->branchaddress1);
$text->translate(100/mm, ($height-127.5)/mm);
- $text->text($billingdetails->{branchaddress2});
+ $text->text($billing_library->branchaddress2);
$text->translate(100/mm, ($height-132.5)/mm);
- $text->text($billingdetails->{branchaddress3});
+ $text->text($billing_library->branchaddress3);
$text->translate(100/mm, ($height-137.5)/mm);
- $text->text(join(' ', $billingdetails->{branchzip}, $billingdetails->{branchcity}, $billingdetails->{branchcountry}));
+ $text->text(join(' ', $billing_library->branchzip, $billing_library->branchcity, $billing_library->branchcountry));
$text->translate(100/mm, ($height-147.5)/mm);
- $text->text($billingdetails->{branchemail});
+ $text->text($billing_library->branchemail);
# print subject
$text->translate(100/mm, ($height-145.5)/mm);
$text->text($bookseller->{address2});
$text->translate(100/mm, ($height-200)/mm);
$text->text($bookseller->{address3});
+ $text->translate(100/mm, ($height-205)/mm);
+ $text->text($bookseller->{accountnumber});
# print delivery infos
$text->font( $pdf->corefont("Times-Bold", -encoding => "utf8"), 4/mm );
$start += 5;
}
} else {
- $text->text($deliverydetails->{branchaddress1});
+ $text->text($delivery_library->branchaddress1);
$text->translate(50/mm, ($height-242)/mm);
- $text->text($deliverydetails->{branchaddress2});
+ $text->text($delivery_library->branchaddress2);
$text->translate(50/mm, ($height-247)/mm);
- $text->text($deliverydetails->{branchaddress3});
+ $text->text($delivery_library->branchaddress3);
$text->translate(50/mm, ($height-252)/mm);
- $text->text(join(' ', $deliverydetails->{branchzip}, $deliverydetails->{branchcity}, $deliverydetails->{branchcountry}));
+ $text->text(join(' ', $delivery_library->branchzip, $delivery_library->branchcity, $delivery_library->branchcountry));
}
$text->translate(50/mm, ($height-262)/mm);
$text->text($basketgroup->{deliverycomment});
projects / koha.git / blobdiff