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

(-)a/acqui/basketgroup.pl (-1 / +5 lines)
Lines 200-211 sub printbasketgrouppdf{ Link Here
200
200
201
            # Editor Number
201
            # Editor Number
202
            my $en;
202
            my $en;
203
            my $edition;
203
            my $marcrecord=eval{MARC::Record::new_from_xml( $ord->{marcxml},'UTF-8' )};
204
            my $marcrecord=eval{MARC::Record::new_from_xml( $ord->{marcxml},'UTF-8' )};
204
            if ($marcrecord){
205
            if ($marcrecord){
205
                if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) {
206
                if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) {
206
                    $en = $marcrecord->subfield( '345', "b" );
207
                    $en = $marcrecord->subfield( '345', "b" );
208
                    $edition = $marcrecord->subfield( '205', 'a' );
207
                } elsif ( C4::Context->preference("marcflavour") eq 'MARC21' ) {
209
                } elsif ( C4::Context->preference("marcflavour") eq 'MARC21' ) {
208
                    $en = $marcrecord->subfield( '037', "a" );
210
                    $en = $marcrecord->subfield( '037', "a" );
211
                    $edition = $marcrecord->subfield( '250', 'a' );
209
                }
212
                }
210
            }
213
            }
211
214
Lines 213-220 sub printbasketgrouppdf{ Link Here
213
                isbn => ($ord->{isbn} ? $ord->{isbn} : undef),
216
                isbn => ($ord->{isbn} ? $ord->{isbn} : undef),
214
                itemtype => ( $ord->{itemtype} and $bib->{itemtype} ? $itemtypes->{$bib->{itemtype}}->{description} : undef ),
217
                itemtype => ( $ord->{itemtype} and $bib->{itemtype} ? $itemtypes->{$bib->{itemtype}}->{description} : undef ),
215
                en => ( $en ? $en : undef ),
218
                en => ( $en ? $en : undef ),
219
                edition => ( $edition ? $edition : undef ),
216
            };
220
            };
217
            for my $key ( qw/ gstrate author title itemtype publishercode discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti / ) {
221
            for my $key ( qw/ gstrate author title itemtype publishercode copyrightdate publicationyear discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti / ) {
218
                $ba_order->{$key} = $ord->{$key};
222
                $ba_order->{$key} = $ord->{$key};
219
            }
223
            }
220
224
(-)a/acqui/pdfformat/layout2pages.pm (-1 / +21 lines)
Lines 88-99 sub printorders { Link Here
88
    }
88
    }
89
    push(@$abaskets, $arrbasket);
89
    push(@$abaskets, $arrbasket);
90
90
91
    my $titleinfo;
91
    for my $basket (@$baskets){
92
    for my $basket (@$baskets){
92
        for my $line (@{$orders->{$basket->{basketno}}}) {
93
        for my $line (@{$orders->{$basket->{basketno}}}) {
93
            $arrbasket = undef;
94
            $arrbasket = undef;
95
            $titleinfo = "";
96
            if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) {
97
                $titleinfo =  $line->{title} . " / " . $line->{author} .
98
                    ( $line->{isbn} ? " ISBN: " . $line->{isbn} : '' ) .
99
                    ( $line->{en} ? " EN: " . $line->{en} : '' ) .
100
                    ( $line->{itemtype} ? ", " . $line->{itemtype} : '' ) .
101
                    ( $line->{edition} ? ", " . $line->{edition} : '' ) .
102
                    ( $line->{publishercode} ? ' published by '. $line->{publishercode} : '') .
103
                    ( $line->{publicationyear} ? ', '. $line->{publicationyear} : '');
104
            }
105
            else { # MARC21, NORMARC
106
                $titleinfo =  $line->{title} . " " . $line->{author} .
107
                    ( $line->{isbn} ? " ISBN: " . $line->{isbn} : '' ) .
108
                    ( $line->{en} ? " EN: " . $line->{en} : '' ) .
109
                    ( $line->{itemtype} ? " " . $line->{itemtype} : '' ) .
110
                    ( $line->{edition} ? ", " . $line->{edition} : '' ) .
111
                    ( $line->{publishercode} ? ' published by '. $line->{publishercode} : '') .
112
                    ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : '');
113
            }
94
            push( @$arrbasket,
114
            push( @$arrbasket,
95
                $basket->{basketno},
115
                $basket->{basketno},
96
                $line->{title} . " / " . $line->{author} . ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . ( $line->{en} ? " EN : " . $line->{en} : '' ) . ", " . $line->{itemtype} . ( $line->{publishercode} ? ' published by '. $line->{publishercode} : ""),
116
                $titleinfo,
97
                $line->{quantity},
117
                $line->{quantity},
98
                $num->format_price($line->{rrpgsti}),
118
                $num->format_price($line->{rrpgsti}),
99
                $num->format_price($line->{discount}).'%',
119
                $num->format_price($line->{discount}).'%',
(-)a/acqui/pdfformat/layout3pages.pm (-2 / +22 lines)
Lines 108-117 sub printorders { Link Here
108
            push(@$arrbasket, $bkey);
108
            push(@$arrbasket, $bkey);
109
        }
109
        }
110
        push(@$abaskets, $arrbasket);
110
        push(@$abaskets, $arrbasket);
111
112
        my $titleinfo;
111
        foreach my $line (@{$orders->{$basket->{basketno}}}) {
113
        foreach my $line (@{$orders->{$basket->{basketno}}}) {
112
            $arrbasket = undef;
114
            $arrbasket = undef;
115
            $titleinfo = "";
116
            if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) {
117
                $titleinfo =  $line->{title} . " / " . $line->{author} .
118
                    ( $line->{isbn} ? " ISBN: " . $line->{isbn} : '' ) .
119
                    ( $line->{en} ? " EN: " . $line->{en} : '' ) .
120
                    ( $line->{itemtype} ? ", " . $line->{itemtype} : '' ) .
121
                    ( $line->{edition} ? ", " . $line->{edition} : '' ) .
122
                    ( $line->{publishercode} ? ' published by '. $line->{publishercode} : '') .
123
                    ( $line->{publicationyear} ? ', '. $line->{publicationyear} : '');
124
            }
125
            else { # MARC21, NORMARC
126
                $titleinfo =  $line->{title} . " " . $line->{author} .
127
                    ( $line->{isbn} ? " ISBN: " . $line->{isbn} : '' ) .
128
                    ( $line->{en} ? " EN: " . $line->{en} : '' ) .
129
                    ( $line->{itemtype} ? " " . $line->{itemtype} : '' ) .
130
                    ( $line->{edition} ? ", " . $line->{edition} : '' ) .
131
                    ( $line->{publishercode} ? ' published by '. $line->{publishercode} : '') .
132
                    ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : '');
133
            }
113
            push( @$arrbasket,
134
            push( @$arrbasket,
114
                $line->{title} . " / " . $line->{author} . ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . ( $line->{en} ? " EN : " . $line->{en} : '' ) . ", " . $line->{itemtype} . ( $line->{publishercode} ? ' published by '. $line->{publishercode} : ""),
135
                $titleinfo,
115
                $line->{quantity},
136
                $line->{quantity},
116
                $num->format_price($line->{rrpgste}),
137
                $num->format_price($line->{rrpgste}),
117
                $num->format_price($line->{rrpgsti}),
138
                $num->format_price($line->{rrpgsti}),
118
- 

Return to bug 11859