Attachment #27849 for bug #7180

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





        &GetBudget
        &GetBudgetByOrderNumber
        &GetBudgetByCode
        &GetBudgets
        &GetBudgetHierarchy
	    &AddBudget

    return $result;
}

=head2 GetBudgetByCode

    my $budget = &GetBudgetByCode($budget_code);

Retrieve all aqbudgets fields as a hashref for the budget that has
given budget_code

=cut

sub GetBudgetByCode {
    my ( $budget_code ) = @_;

    my $dbh = C4::Context->dbh;
    my $query = qq{
        SELECT *
        FROM aqbudgets
        WHERE budget_code = ?
    };
    my $sth = $dbh->prepare( $query );
    $sth->execute( $budget_code );
    return $sth->fetchrow_hashref;
}

=head2 GetChildBudgetsSpent

  &GetChildBudgetsSpent($budget-id);




# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;
use warnings;
use CGI;
use Carp;
use Number::Format qw(:all);
use YAML qw/Load/;

use C4::Context;
use C4::Auth;

});

my $cgiparams = $input->Vars;
my $op = $cgiparams->{'op'} || '';
my $booksellerid  = $input->param('booksellerid');
my $bookseller = GetBookSellerFromId($booksellerid);
my $data;

                booksellerid => $booksellerid,
                booksellername => $bookseller->{name},
                );
my $ordernumber;

if ($cgiparams->{'import_batch_id'} && $op eq ""){
    $op = "batch_details";

                     loop_currencies  => \@loop_currency,
                     );
    import_biblios_list($template, $cgiparams->{'import_batch_id'});
    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
        # prepare empty item form
        my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );


    # retrieve the file you want to import
    my $import_batch_id = $cgiparams->{'import_batch_id'};
    my $biblios = GetImportRecordsRange($import_batch_id);
    my @import_record_id_selected = $input->param("import_record_id");
    my @quantities = $input->param('quantity');
    my @prices = $input->param('price');
    my @budgets_id = $input->param('budget_id');
    my @rrp = $input->param('rrp');
    my @discount = $input->param('discount');
    my @sort1 = $input->param('sort1');
    my @sort2 = $input->param('sort2');
    my $cur = GetCurrency();
    for my $biblio (@$biblios){
        # Check if this import_record_id was selected
        next if not grep { $_ eq $$biblio{import_record_id} } @import_record_id_selected;
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
        my $match = GetImportRecordMatches( $biblio->{'import_record_id'}, 1 );
        my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0;
        my $c_quantity = shift( @quantities ) || GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) || 1;
        my $c_budget_id = shift( @budgets_id ) || $input->param('all_budget_id') || $budget_id;
        my $c_rrp = shift( @rrp ); # rrp include tax
        my $c_discount = shift ( @discount);
        $c_discount = $c_discount / 100 if $c_discount > 100;
        my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || '';
        my $c_sort2 = shift( @sort2 ) || $input->param('all_sort2') || '';

        # 1st insert the biblio, or find it through matcher
        unless ( $biblionumber ) {
            # add the biblio
            my $bibitemnum;

            # remove ISBN -
            my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn', '' );
            if ( $marcrecord->field($isbnfield) ) {
                foreach my $field ( $marcrecord->field($isbnfield) ) {
                    foreach my $subfield ( $field->subfield($isbnsubfield) ) {

                }
            }
            ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' );
            SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
            # 2nd add authorities if applicable
            if (C4::Context->preference("BiblioAddsAuthorities")){
                my $headings_linked =BiblioAutoLink($marcrecord, $cgiparams->{'frameworkcode'});

        # get quantity in the MARC record (1 if none)
        my $quantity = GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour')) || 1;
        my %orderinfo = (
            biblionumber       => $biblionumber,
            basketno           => $cgiparams->{'basketno'},
            quantity           => $c_quantity,
            branchcode         => $patron->{branchcode},
            budget_id          => $c_budget_id,
            uncertainprice     => 1,
            sort1              => $c_sort1,
            sort2              => $c_sort2,
            order_internalnote => $cgiparams->{'all_order_internalnote'},
            order_vendornote   => $cgiparams->{'all_order_vendornote'},
            currency           => $cgiparams->{'all_currency'},
        );
        # get the price if there is one.
        my $price= shift( @prices ) || GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));

        if ($price){
            # in France, the cents separator is the , but sometimes, ppl use a .
            # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
            $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
            $price = $num->unformat_number($price);
	    if ($@){
		croak $@;
	    }
            eval {
		require C4::Bookseller;
	        import C4::Bookseller qw/GetBookSellerFromId/;
	    };
	    if ($@){
		croak $@;
	    }
            my $basket     = GetBasket( $orderinfo{basketno} );
            my $bookseller = GetBookSellerFromId( $basket->{booksellerid} );
            $orderinfo{gstrate} = $bookseller->{gstrate};
            my $c = $c_discount ? $c_discount / 100 : $bookseller->{discount} / 100;
            if ( $bookseller->{listincgst} ) {
                if ( $c_discount ) {
                    $orderinfo{ecost} = $price;
                    $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
                } else {
                    $orderinfo{ecost} = $price * ( 1 - $c );
                    $orderinfo{rrp}   = $price;
                }
            } else {
                if ( $c_discount ) {
                    $orderinfo{ecost} = $price / ( 1 + $orderinfo{gstrate} );
                    $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
                } else {
                    $orderinfo{rrp}   = $price / ( 1 + $orderinfo{gstrate} );
                    $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
                }
            }
            $orderinfo{listprice} = $orderinfo{rrp} / $cur->{rate};
            $orderinfo{unitprice} = $orderinfo{ecost};
            $orderinfo{total} = $orderinfo{ecost} * $c_quantity;
        } else {
            $orderinfo{listprice} = 0;
        }

        # remove uncertainprice flag if we have found a price in the MARC record
        $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
        my ( $basketno, $ordernumber ) = NewOrder( \%orderinfo );
        ( $basketno, $ordernumber ) = NewOrder( \%orderinfo );

        # 4th, add items if applicable
        # parse the item sent by the form, and create an item just for the import_record_id we are dealing with

            push @{ $item->{indicator} },    $indicator[0];
            my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values, \@ind_tag, \@indicator );
            my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );
            for (my $qtyloop=1;$qtyloop <= $c_quantity;$qtyloop++) {
                my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
                NewOrderItem( $itemnumber, $ordernumber );
            }
        } else {
            SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
        }
    }
    # go to basket page


# build budget list
my $budget_loop = [];
my $budgets_hierarchy = GetBudgetHierarchy;
foreach my $r ( @{$budgets_hierarchy} ) {
    next unless (CanUserUseBudget($borrower, $r, $userflags));
    if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
        next;

    push @{$budget_loop},
      { b_id  => $r->{budget_id},
        b_txt => $r->{budget_name},
        b_sort1_authcat => $r->{'sort1_authcat'},
        b_sort2_authcat => $r->{'sort2_authcat'},
        b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
      };
}

        $CGIsort1 = GetAuthvalueDropbox(  $budget->{'sort1_authcat'}, $data->{'sort1'} );
    }
} elsif ( scalar(@$budgets) ) {
} elsif ( scalar(@$budgets_hierarchy) ) {
    $CGIsort1 = GetAuthvalueDropbox( @$budgets_hierarchy[0]->{'sort1_authcat'}, '' );
}
# if CGIsort is successfully fetched, the use it
# else - failback to plain input-field

    if ( defined $budget->{'sort2_authcat'} ) {
        $CGIsort2 = GetAuthvalueDropbox(  $budget->{'sort2_authcat'}, $data->{'sort2'} );
    }
} elsif ( scalar(@$budgets_hierarchy) ) {
    $CGIsort2 = GetAuthvalueDropbox( @$budgets_hierarchy[0]->{sort2_authcat}, '' );
}
if ($CGIsort2) {
    $template->param( CGIsort2 => $CGIsort2 );

            record_sequence => $biblio->{'record_sequence'},
            overlay_status => $biblio->{'overlay_status'},
            match_biblionumber => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0,
            match_citation     => $#$match > -1 ? $match->[0]->{'title'} || '' . ' ' . $match->[0]->{'author'} || '': '',
            match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
        );
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
        my $infos = get_infos_syspref($marcrecord, ['price', 'quantity', 'budget_code', 'rrp', 'discount', 'sort1', 'sort2']);
        my $price = $infos->{price};
        my $quantity = $infos->{quantity};
        my $budget_code = $infos->{budget_code};
        my $rrp = $infos->{rrp};
        my $discount = $infos->{discount};
        my $sort1 = $infos->{sort1};
        my $sort2 = $infos->{sort2};
        my $budget_id;
        if($budget_code) {
            my $biblio_budget = GetBudgetByCode($budget_code);
            if($biblio_budget) {
                $budget_id = $biblio_budget->{budget_id};
            }
        }
        $cellrecord{price} = $price || '';
        $cellrecord{quantity} = $quantity || '';
        $cellrecord{budget_id} = $budget_id || '';
        $cellrecord{rrp} = $rrp || '';
        $cellrecord{discount} = $discount || '';
        $cellrecord{sort1} = $sort1 || '';
        $cellrecord{sort2} = $sort2 || '';

        push @list, \%cellrecord;
    }
    my $num_biblios = $batch->{'num_biblios'};

    }
    $template->param(available_matchers => \@matchers);
}

sub get_infos_syspref {
    my ($record, $field_list) = @_;
    my $syspref = C4::Context->preference('MarcFieldsToOrder');
    my $yaml = YAML::Load($syspref);
    my $r;
    for my $field_name ( @$field_list ) {
        my @fields = split /\|/, $yaml->{$field_name};
        for my $field ( @fields ) {
            my ( $f, $sf ) = split /\$/, $field;
            next unless $f and $sf;
            if ( my $v = $record->subfield( $f, $sf ) ) {
                $r->{$field_name} = $v;
            }
            last if $yaml->{$field};
        }
    }
    return $r;
}




#!/usr/bin/perl

# Copyright 2012 BibLibre
#
# 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 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.

=head1 NAME

ajax-getauthvaluedropbox.pl - returns an authorised values dropbox

=head1 DESCRIPTION

this script returns an authorised values dropbox

=head1 CGI PARAMETERS

=over 4

=item name

The name of the dropbox.

=item category

The category of authorised values.

=item default

Default value for the dropbox.

=back

=cut

use Modern::Perl;

use CGI;
use C4::Budgets;
use C4::Charset;

my $input = new CGI;
my $name = $input->param('name');
my $category = $input->param('category');
my $default = $input->param('default');
$default = C4::Charset::NormalizeString($default);

binmode STDOUT, ':encoding(UTF-8)';
print $input->header(-type => 'text/plain', -charset => 'UTF-8');
my $avs = GetAuthvalueDropbox($category, $default);
my $html = qq|<select id="$name", name="$name">|;
for my $av ( @$avs ) {
    if ( $av->{default} ) {
        $html .= qq|<option value="$av->{value}" selected="selected">$av->{label}</option>|;
    } else {
        $html .= qq|<option value="$av->{value}">$av->{label}</option>|;
    }
}
$html .= qq|</select>|;

print $html;

Lines 8243-8248 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+9 lines)
8243	SetVersion ($DBversion);	8243	SetVersion ($DBversion);
8244	}	8244	}
8245		8245
		8246
		8247
		8248	$DBversion = "3.15.00.XXX";
		8249	if ( CheckVersion($DBversion) ) {
		8250	$dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('MarcFieldsToOrder','','Set the mapping values for a new order line created from a marcrecord (staged file). In a YAML format.', NULL, 'textarea')");
		8251	print "Upgrade to $DBversion done (Bug 7180: Added MarcFieldsToOrder syspref)\n";
		8252	SetVersion ($DBversion);
		8253	}
		8254
8246	=head1 FUNCTIONS	8255	=head1 FUNCTIONS
8247		8256
8248	=head2 TableExists($table)	8257	=head2 TableExists($table)




    return true;
}

function getAuthValueDropbox( name, cat, destination, selected ) {
    if (cat == null || cat == "") {
        $(destination).replaceWith(' <input type="text" name="' + name + '" />' );
/*
function fetchSortDropbox(f) {
    var  budgetId=f.budget_id.value;
    var handleSuccess = function(o){
        if(o.responseText !== undefined){
            sort_dropbox.innerHTML   = o.responseText;
        }
    }

    var callback = {   success:handleSuccess };
    var sUrl = '../acqui/fetch_sort_dropbox.pl?sort=1&budget_id='+budgetId
    var sort_dropbox = document.getElementById('sort1');
    var request1 = YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
    var rr = '00';

// FIXME: ---------  twice , coz the 2 requests get mixed up otherwise

    var handleSuccess2 = function(o){
    if(o.responseText !== undefined){
        sort2_dropbox.innerHTML   = o.responseText;
        }
    }

    var callback2 = {   success:handleSuccess };
    var sUrl2 = '../acqui/fetch_sort_dropbox.pl?sort=2&budget_id='+budgetId;
    var sort2_dropbox = document.getElementById('sort2');
    var request2 = YAHOO.util.Connect.asyncRequest('GET', sUrl2, callback2);

}
*/



//USED BY NEWORDEREMPTY.PL
function fetchSortDropbox(f) {
    var  budgetId=f.budget_id.value;

for (i=1;i<=2;i++) {

    var sort_zone = document.getElementById('sort'+i+'_zone');
    var url = '../acqui/fetch_sort_dropbox.pl?sort='+i+'&budget_id='+budgetId;

    var xmlhttp = null;
    xmlhttp = new XMLHttpRequest();
    if ( typeof xmlhttp.overrideMimeType != 'undefined') {
        xmlhttp.overrideMimeType('text/xml');
    }

    xmlhttp.open('GET', url, false);
    xmlhttp.send(null);

    xmlhttp.onreadystatechange = function() {
        if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
    // stupid JS...
        } else {
    // wait for the call to complete
        }
    };
    // rc =  eval ( xmlhttp.responseText );
    var retRootType = xmlhttp.responseXML.firstChild.nodeName;
    var existingInputs = sort_zone.getElementsByTagName('input');
    if (existingInputs.length > 0 && retRootType == 'input') {
        // when sort is already an input, do not override to preseve value
        return;
    }
    $.ajax({
        url: "/cgi-bin/koha/acqui/ajax-getauthvaluedropbox.pl",
        data: {
            name: name,
            category: cat,
            default: selected
        },
        async: false,
        success: function(data){
            if(data === "0"){
                $(destination).replaceWith(' <input type="text" name="' + name + '" />' );
            }else{
                $(destination).replaceWith(data);
            }
        }
    });
}







//USED BY NEWORDEREMPTY.PL
function totalExceedsBudget(budgetId, total) {





<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'datatables.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
<script type="text/JavaScript">
//<![CDATA[
    $(document).ready(function() {
        $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
            "aoColumnDefs": [
                { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
                { "sType": "anti-the", "aTargets" : [ "anti-the" ] },

            "aaSorting": []
        } ) );

        $("select[name='budget_id']").change(function(){
            var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
            var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
            var destination_sort1 = $(this).siblings('span.sort1').find('input[name="sort1"]');
            var sort1 = $(destination_sort1).val();
            if ( destination_sort1.length < 1 ) {
                destination_sort1 = $(this).siblings('span.sort1').find('select[name="sort1"]');
                return false;
            }
            var destination_sort2 = $(this).siblings('span.sort2').find('input[name="sort2"]');
            var sort2 = $(destination_sort2).val();
            if ( destination_sort2.length < 1 ) {
                destination_sort2 = $(this).siblings('span.sort2').find('select[name="sort2"]');
            }
            getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 );

            getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
        } );

        $("select[name='budget_id']").change();

        $("select[name='all_budget_id']").change(function(){
            var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
            var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
            var destination_sort1 = $(this).parent().siblings('li').find('input[name="all_sort1"]');
            if ( destination_sort1.length < 1 ) {
                destination_sort1 = $(this).parent().siblings('li').find('select[name="all_sort1"]');
            }
            var destination_sort2 = $(this).parent().siblings('li').find('input[name="all_sort2"]');
            if ( destination_sort2.length < 1 ) {
                destination_sort2 = $(this).parent().siblings('li').find('select[name="all_sort2"]');
            }
            getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1 );
            getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2 );
            $(this).parent().siblings('li').find('select[name="sort1"]').attr('name', 'all_sort1');
            $(this).parent().siblings('li').find('input[name="sort1"]').attr('name', 'all_sort1');
            $(this).parent().siblings('li').find('select[name="sort2"]').attr('name', 'all_sort2');
            $(this).parent().siblings('li').find('input[name="sort2"]').attr('name', 'all_sort2');
        } );

        $('input:checkbox[name="import_record_id"]').change(function(){
            if ( $(this).is(':checked') ) {
                $(this).parent().addClass("selected");
                $(this).parent().removeClass("unselected");
            } else {
                $(this).parent().addClass("unselected");
                $(this).parent().removeClass("selected");
            }
        } );

        $("input:checkbox").attr("checked", false);
        $("div.biblio.unselected select").attr("disabled", false);
        $("div.biblio.unselected input").attr("disabled", false);

        $("#checkAll").click(function(){
            $("#Aform").checkCheckboxes();
            $("input:checkbox[name='import_record_id']").change();
            return false;
        });
        $("#unCheckAll").click(function(){
            $("#Aform").unCheckCheckboxes();
            $("input:checkbox[name='import_record_id']").change();
            return false;
        });

    });

    function disableUnchecked(form){
        $("div.biblio.unselected").each(function(){
            $(this).find('select').attr('disabled', 'disabled');
            $(this).find('input').attr('disabled', 'disabled');
        });
        form.submit();
    }
//]]>
</script>
</head>

       <div id="yui-main">
           <div class="yui-b">
             [% IF ( batch_details ) %]
                <h1>Add orders from [% comments %]
                    ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])
                </h1>
                <div>
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
                    <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform" onsubmit="disableUnchecked(this); return false;">
                        <input type="hidden" name="op" value="import_records"/>
                        <input type="hidden" name="basketno" value="[% basketno %]" />
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                        <input type="hidden" name="import_batch_id" value="[%import_batch_id %]" />
                        <input type="hidden" name="ordernumber" value="[% ordernumber %]" />

                        [% FOREACH cur IN loop_currencies %]
                            <input type="hidden" name="[% cur.currency %]" value="[% cur.rate %]" />
                        [% END %]
                             <td>
                                [% biblio_lis.citation %]

                        [% FOREACH biblio IN biblio_list %]
                        <div class="biblio unselected" style="border-radius: 5px 5px; -moz-border-radius: 5px; padding: 5px; margin:5px; border-style : solid; border-color : grey; border-width:1px;">
                            <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
                            <input type="hidden" value="[% biblio.rrp %]" name="rrp" />
                            <label for="record_[% biblio.import_record_id %]"><span class="citation" style="font-weight:bold;">[% biblio.citation %]</span></label>
                            <span class="match" style="display:block;">
                                [% IF ( biblio_lis.overlay_status == 'no_match' ) %]
                                    No match
                                [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %]

                                [% ELSE %]
                                    [% biblio_lis.overlay_status %]
                                [% END %]
                            </span>
                            [% IF ( biblio.match_biblionumber ) %]
                                Matches biblio [% biblio.match_biblionumber %] (score = [% biblio.match_score %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber %]">[% biblio.match_citation %]</a>
                            [% END %]
                            <span class="quantity" style="display:block;">
                                Quantity: <input type="text" value="[% biblio.quantity %]" name="quantity" />
                            </span>
                            <span class="price" style="display:block;">
                                Price: <input type="text" value="[% biblio.price %]" name="price" />
                            </span>
                            <span class="discount" style="display:block;">
                                Discount: <input type="text" value="[% biblio.discount %]" name="discount" />
                            </span>
                            <span class="budget" style="display:block;">
                                [% IF ( close ) %]
                                <span class="label">Budget: </span>
                                    <input type="hidden" size="20" name="budget_id" value="[% budget_id %]" />[% Budget_name %]
                    [% IF ( page.current_page ) %]
                      <span class="current">[% page.page_number %]</span>
                    [% ELSE %]
                      <a class="nav" href="[% page.script_name %]?import_batch_id=[% page.import_batch_id %]&amp;offset=[% page.offset %]">[% page.page_number %]</a>
                    [% END %]
                  [% END %]
              [% END %]
             [% ELSE %]
               <div>
                <h1>Choose the file to add to the basket</h1>
                   <table id="files">
                     <thead>
                     <tr>
                       <th>File name</th>
                       <th>Comments</th>
                       <th>Status</th>
                       <th class="title-string">Staged</th>
                       <th># Bibs</th>
                       <th class="NoSort">&nbsp;</th>
                     </tr>
                     </thead>
                     <tbody>
                     [% FOREACH batch_lis IN batch_list %]
                     <tr>
                        <td>[% batch_lis.file_name %]</td>
                       <td>[% batch_lis.comments %]</td>
                       <td>
                        [% IF ( batch_lis.import_status == 'cleaned' ) %]
                            Cleaned
                        [% ELSIF ( batch_lis.import_status == 'imported' ) %]
                            Imported
                        [% ELSIF ( batch_lis.import_status == 'importing' ) %]
                            Importing
                        [% ELSIF ( batch_lis.import_status == 'reverted' ) %]
                            Reverted
                        [% ELSIF ( batch_lis.import_status == 'reverting' ) %]
                            Reverting
                        [% ELSIF ( batch_lis.import_status == 'staged' ) %]
                            Staged
                        [% ELSE %]
                            [% batch_lis.import_status %]
                        [% END %]
                       </td>
                       <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</span></td>
                       <td>[% batch_lis.num_biblios %]</td>
                       <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]">Add orders</a></td>
                     </tr>
                     [% END %]
                     </tbody>
                   </table>
               </div>
             [% END %]
           </div>
        [% IF ( import_batch_id ) %]
            <div class="yui-b">
            <h2>Import all</h2>
            <p>Import all the lines in the basket with the following parameters:</p>
            <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
                    <input type="hidden" name="op" value="import_records"/>
                    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
                    <input type="hidden" name="basketno" value="[% basketno %]" />
                    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                    <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" />

                    [% FOREACH loop_currencie IN loop_currencies %]
                        <input type="hidden" name="[% loop_currencie.currency %]" value="[% loop_currencie.rate %]" />
                    [% END %]

                [% IF ( items ) %]
                <fieldset class="rows">
                    <legend>Item</legend>
                    [% IF ( NoACQframework ) %]
                        <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
                    [% END %]

                    [% FOREACH item IN items %]
                    <div id="outeritemblock">
                    <div id="itemblock">
                        <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li style="[% iteminformatio.hidden %];">
                            <div class="subfield_line" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
                                [% IF (iteminformatio.mandatory) %]
                                    <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
                                [% ELSE %]
                                <label for="budget_id">Budget: </label>
                                <select size="1" name="budget_id">
                                    <option value=""></option>
                                    [% FOREACH budget IN budget_loop %]
                                        [% IF ( budget.b_id == biblio.budget_id ) %]
                                            <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]" selected="selected">[% budget.b_txt %]</option>
                                        [% ELSE %]
                                            <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option>
                                        [% END %]
                                    [% END %]
                                </select>
                                [% END %]
                                <span class="sort1">
                                    <label for="sort1">Planning value1: </label>
                                    <input type="text" id="sort1" size="20" name="sort1" value="[% biblio.sort1 %]" />
                                </span>
                                <span class="sort2">
                                    <label for="sort2">Planning value2: </label>
                                    <input type="text" id="sort2" size="20" name="sort2" value="[% biblio.sort2 %]" />
                                </span>
                            </span>
                        </div>
                        [% END %]
                        <div>
                        <h2>Import all</h2>
                        <p>Import all the lines in the basket with the following parameters:</p>

                        [% IF ( items ) %]
                        <fieldset class="rows">
                            <legend>Item</legend>
                            [% IF ( NoACQframework ) %]
                                <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
                    <ol>
                        <li>
                            <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order -->
                            <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
                        </li>
                        <li>
                            [% IF ( close ) %]
                        <span class="label">Budget: </span>
                                <input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
                            [% ELSE %]
                            <li>
                            <label for="currency">Currency:</label>
                            <select name="currency" id="currency">
                            [% FOREACH loop_currencie IN loop_currencies %]
                                    [% IF ( loop_currencie.selected ) %]<option value="[% loop_currencie.currcode %]" selected="selected">[% loop_currencie.currcode %]</option>[% ELSE %]<option value="[% loop_currencie.currcode %]">[% loop_currencie.currcode %]</option>[% END %][% END %]
                            </select>
                            </li>
                            <li>
                            <label for="budget_id">Budget: </label>
                            <select id="budget_id" onchange="fetchSortDropbox(this.form)" size="1" name="budget_id">
                            [% FOREACH budget_loo IN budget_loop %]
                                [% IF ( budget_loo.b_sel ) %]
                                    <option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>
                                [% ELSE %]
                                    <option value="[% budget_loo.b_id %]">[% budget_loo.b_txt %]</option>
                                [% END %]
                            [% END %]
                            </select>
                            </li>
                            [% END %]
                            [% FOREACH item IN items %]
                            <div id="outeritemblock">
                            <div id="itemblock">
                                <ol>
                                [% FOREACH iteminformatio IN item.iteminformation %]<li style="[% iteminformatio.hidden %];">
                                    <div class="subfield_line" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
                                        [% IF (iteminformatio.mandatory) %]
                                            <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
                                        [% ELSE %]
                                            <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
                                        [% END %]

                                        [% iteminformatio.marc_value %]
                                        <input type="hidden" name="itemid" value="1" />
                                        <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
                                        <input type="hidden" name="tag" value="[% iteminformatio.tag %]" />
                                        <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
                                        <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
                                        [% IF ( iteminformatio.mandatory ) %] <span class="required">Required</span>[% END %]
                                    </div></li>
                                [% END %]
                                </ol>
                            </div><!-- /iteminformation -->
                            </div>
                            [% END %] <!-- /items -->
                        </fieldset>
                        [% END %] <!-- items -->

                        <fieldset class="rows">
                            <legend>Accounting details</legend>
                            <ol>
                                <li>
                                    <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order -->
                                    <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
                                </li>
                                <li>
                                    [% IF ( close ) %]
                                        <span class="label">Budget: </span>
                                        <input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
                                    [% ELSE %]
                                        <li>
                                            <label for="all_currency">Currency:</label>
                                            <select name="all_currency" id="all_currency">
                                            [% FOREACH loop_currencie IN loop_currencies %]
                                                [% IF ( loop_currencie.selected ) %]
                                                    <option value="[% loop_currencie.currcode %]" selected="selected">[% loop_currencie.currcode %]</option>
                                                [% ELSE %]
                                                    <option value="[% loop_currencie.currcode %]">[% loop_currencie.currcode %]</option>
                                                [% END %]
                                            [% END %]
                                            </select>
                                        </li>
                                        <li>
                                            <label for="all_budget_id">Budget: </label>
                                            <select id="all_budget_id" size="1" name="all_budget_id">
                                            [% FOREACH budget_loo IN budget_loop %]
                                                [% IF ( budget_loo.b_sel ) %]
                                                    <option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]" selected="selected">[% budget_loo.b_txt %]</option>
                                                [% ELSE %]
                                                    <option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
                                                [% END %]
                                            [% END %]
                                            </select>
                                        </li>
                                    [% END %]
                                </li>
                                <li>
                                    <label for="all_order_internalnote">Internal note: </label>
                                    <textarea id="all_order_internalnote" cols="30" rows="3" name="all_order_internalnote"></textarea>
                                </li>
                                <li>
                                    <label for="all_order_vendornote">Vendor note: </label>
                                    <textarea id="all_order_vendornote" cols="30" rows="3" name="all_order_vendornote"></textarea>
                                </li>
                                <li>
                                    <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
                                    <label for="sort1">Planning value1: </label>
                                    [% IF CGIsort1 %]
                                        <select id="all_sort1" size="1" name="all_sort1">
                                        [% FOREACH sort_opt IN CGIsort1 %]
                                            [% IF sort_opt.default %]
                                                <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
                                            [% ELSE %]
                                                <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
                                            [% END %]
                                        [% END %]
                                        </select>
                                    [% ELSE %]
                                        <input type="text" id="all_sort1" size="20" name="all_sort1" value="[% sort1 %]" />
                                    [% END %]
                                </li>
                                <li>
                                  <span id="sort2_zone">
                                    <label for="sort2">Planning value2: </label>
                                    [% IF CGIsort2 %]
                                        <select id="all_sort2" size="1" name="all_sort1">
                                        [% FOREACH sort_opt IN CGIsort2 %]
                                            [% IF sort_opt.default %]
                                                <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
                                            [% ELSE %]
                                                <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
                                            [% END %]
                                        [% END %]
                                        </select>
                                    [% ELSE %]
                                         <input type="text" id="all_sort2" size="20" name="all_sort2" value="[% sort2 %]" />
                                    [% END %]
                                  </span>
                                </li>
                            </ol>
                        </fieldset>
                        <fieldset class="action">
                            <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
                        </fieldset>

                        </div>
                    </form>
                [% ELSE %]
                <div>
                  <h1>Choose the file to add to the basket</h1>
                  <table id="files">
                    <thead>
                      <tr>
                        <th>File name</th>
                        <th>Comments</th>
                        <th>Status</th>
                        <th class="title-string">Staged</th>
                        <th># Bibs</th>
                        <th class="NoSort">&nbsp;</th>
                      </tr>
                    </thead>
                    <tbody>
                      [% FOREACH batch_lis IN batch_list %]
                      <tr>
                        <td>[% batch_lis.file_name %]</td>
                        <td>[% batch_lis.comments %]</td>
                        <td>
                          [% IF ( batch_lis.import_status == 'cleaned' ) %]
                            Cleaned
                          [% ELSIF ( batch_lis.import_status == 'imported' ) %]
                            Imported
                          [% ELSIF ( batch_lis.import_status == 'importing' ) %]
                            Importing
                          [% ELSIF ( batch_lis.import_status == 'reverted' ) %]
                            Reverted
                          [% ELSIF ( batch_lis.import_status == 'reverting' ) %]
                            Reverting
                          [% ELSIF ( batch_lis.import_status == 'staged' ) %]
                            Staged
                          [% ELSE %]
                            [% batch_lis.import_status %]
                          [% END %]
                        </td>
                        <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</span></td>
                        <td>[% batch_lis.num_biblios %]</td>
                        <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]">Add orders</a></td>
                      </tr>
                      [% END %]
                    </tbody>
                  </table>
                </div>
                [% END %]
           </div>
       </div>
   </div>
</div>

Lines 45-50 Acquisitions: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-1 / +4 lines)
45	-	45	-
46	- Upon receiving items, update their subfields if they were created when placing an order (e.g. o=5\|a="foo bar").	46	- Upon receiving items, update their subfields if they were created when placing an order (e.g. o=5\|a="foo bar").
47	- pref: AcqItemSetSubfieldsWhenReceived	47	- pref: AcqItemSetSubfieldsWhenReceived
		48	-
		49	- Set the mapping values for a new order line created from a marcrecord (staged file). In a YAML format, so you have to finished with an empty line.
		50	- pref: MarcFieldsToOrder
		51	type: textarea
48		52
49	Printing:	53	Printing:
50	-	54	-
51	-

Return to bug 7180

Lines 35-40 BEGIN { Link Here

(-)a/C4/Budgets.pm (+24 lines)
35		35
36	&GetBudget	36	&GetBudget
37	&GetBudgetByOrderNumber	37	&GetBudgetByOrderNumber
		38	&GetBudgetByCode
38	&GetBudgets	39	&GetBudgets
39	&GetBudgetHierarchy	40	&GetBudgetHierarchy
40	&AddBudget	41	&AddBudget
Lines 695-700 sub GetBudgetByOrderNumber { Link Here
695	return $result;	696	return $result;
696	}	697	}
697		698
		699	=head2 GetBudgetByCode
		700
		701	my $budget = &GetBudgetByCode($budget_code);
		702
		703	Retrieve all aqbudgets fields as a hashref for the budget that has
		704	given budget_code
		705
		706	=cut
		707
		708	sub GetBudgetByCode {
		709	my ( $budget_code ) = @_;
		710
		711	my $dbh = C4::Context->dbh;
		712	my $query = qq{
		713	SELECT *
		714	FROM aqbudgets
		715	WHERE budget_code = ?
		716	};
		717	my $sth = $dbh->prepare( $query );
		718	$sth->execute( $budget_code );
		719	return $sth->fetchrow_hashref;
		720	}
		721
698	=head2 GetChildBudgetsSpent	722	=head2 GetChildBudgetsSpent
699		723
700	&GetChildBudgetsSpent($budget-id);	724	&GetChildBudgetsSpent($budget-id);

Lines 214-297 function calcNewsuggTotal(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js (-74 / +19 lines)
214	return true;	214	return true;
215	}	215	}
216		216
217		217	function getAuthValueDropbox( name, cat, destination, selected ) {
218	// ----------------------------------------	218	if (cat == null \|\| cat == "") {
219	//USED BY NEWORDEREMPTY.PL	219	$(destination).replaceWith(' <input type="text" name="' + name + '" />' );
220	/*
221	function fetchSortDropbox(f) {
222	var budgetId=f.budget_id.value;
223	var handleSuccess = function(o){
224	if(o.responseText !== undefined){
225	sort_dropbox.innerHTML = o.responseText;
226	}
227	}
228
229	var callback = { success:handleSuccess };
230	var sUrl = '../acqui/fetch_sort_dropbox.pl?sort=1&budget_id='+budgetId
231	var sort_dropbox = document.getElementById('sort1');
232	var request1 = YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
233	var rr = '00';
234
235	// FIXME: --------- twice , coz the 2 requests get mixed up otherwise
236
237	var handleSuccess2 = function(o){
238	if(o.responseText !== undefined){
239	sort2_dropbox.innerHTML = o.responseText;
240	}
241	}
242
243	var callback2 = { success:handleSuccess };
244	var sUrl2 = '../acqui/fetch_sort_dropbox.pl?sort=2&budget_id='+budgetId;
245	var sort2_dropbox = document.getElementById('sort2');
246	var request2 = YAHOO.util.Connect.asyncRequest('GET', sUrl2, callback2);
247
248	}
249	*/
250
251
252
253	//USED BY NEWORDEREMPTY.PL
254	function fetchSortDropbox(f) {
255	var budgetId=f.budget_id.value;
256
257	for (i=1;i<=2;i++) {
258
259	var sort_zone = document.getElementById('sort'+i+'_zone');
260	var url = '../acqui/fetch_sort_dropbox.pl?sort='+i+'&budget_id='+budgetId;
261
262	var xmlhttp = null;
263	xmlhttp = new XMLHttpRequest();
264	if ( typeof xmlhttp.overrideMimeType != 'undefined') {
265	xmlhttp.overrideMimeType('text/xml');
266	}
267
268	xmlhttp.open('GET', url, false);
269	xmlhttp.send(null);
270
271	xmlhttp.onreadystatechange = function() {
272	if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
273	// stupid JS...
274	} else {
275	// wait for the call to complete
276	}
277	};
278	// rc = eval ( xmlhttp.responseText );
279	var retRootType = xmlhttp.responseXML.firstChild.nodeName;
280	var existingInputs = sort_zone.getElementsByTagName('input');
281	if (existingInputs.length > 0 && retRootType == 'input') {
282	// when sort is already an input, do not override to preseve value
283	return;	220	return;
284	}	221	}
285	sort_zone.innerHTML = xmlhttp.responseText;	222	$.ajax({
286	}	223	url: "/cgi-bin/koha/acqui/ajax-getauthvaluedropbox.pl",
		224	data: {
		225	name: name,
		226	category: cat,
		227	default: selected
		228	},
		229	async: false,
		230	success: function(data){
		231	if(data === "0"){
		232	$(destination).replaceWith(' <input type="text" name="' + name + '" />' );
		233	}else{
		234	$(destination).replaceWith(data);
		235	}
		236	}
		237	});
287	}	238	}
288		239
289
290
291
292
293
294
295	//USED BY NEWORDEREMPTY.PL	240	//USED BY NEWORDEREMPTY.PL
296	function totalExceedsBudget(budgetId, total) {	241	function totalExceedsBudget(budgetId, total) {
297		242

Lines 21-31 Link Here

(-)a/acqui/addorderiso2709.pl (-50 / +117 lines)
21	# with Koha; if not, write to the Free Software Foundation, Inc.,	21	# with Koha; if not, write to the Free Software Foundation, Inc.,
22	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	22	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
23		23
24	use strict;	24	use Modern::Perl;
25	use warnings;
26	use CGI;	25	use CGI;
27	use Carp;	26	use Carp;
28	use Number::Format qw(:all);	27	use Number::Format qw(:all);
		28	use YAML qw/Load/;
29		29
30	use C4::Context;	30	use C4::Context;
31	use C4::Auth;	31	use C4::Auth;
Lines 56-62 my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({ Link Here
56	});	56	});
57		57
58	my $cgiparams = $input->Vars;	58	my $cgiparams = $input->Vars;
59	my $op = $cgiparams->{'op'};	59	my $op = $cgiparams->{'op'} \|\| '';
60	my $booksellerid = $input->param('booksellerid');	60	my $booksellerid = $input->param('booksellerid');
61	my $bookseller = GetBookSellerFromId($booksellerid);	61	my $bookseller = GetBookSellerFromId($booksellerid);
62	my $data;	62	my $data;
Lines 65-71 $template->param(scriptname => "/cgi-bin/koha/acqui/addorderiso2709.pl", Link Here
65	booksellerid => $booksellerid,	65	booksellerid => $booksellerid,
66	booksellername => $bookseller->{name},	66	booksellername => $bookseller->{name},
67	);	67	);
68	my $ordernumber;
69		68
70	if ($cgiparams->{'import_batch_id'} && $op eq ""){	69	if ($cgiparams->{'import_batch_id'} && $op eq ""){
71	$op = "batch_details";	70	$op = "batch_details";
Lines 124-130 if ($op eq ""){ Link Here
124	loop_currencies => \@loop_currency,	123	loop_currencies => \@loop_currency,
125	);	124	);
126	import_biblios_list($template, $cgiparams->{'import_batch_id'});	125	import_biblios_list($template, $cgiparams->{'import_batch_id'});
127	if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber ) {	126	if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
128	# prepare empty item form	127	# prepare empty item form
129	my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );	128	my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
130		129
Lines 157-175 if ($op eq ""){ Link Here
157	# retrieve the file you want to import	156	# retrieve the file you want to import
158	my $import_batch_id = $cgiparams->{'import_batch_id'};	157	my $import_batch_id = $cgiparams->{'import_batch_id'};
159	my $biblios = GetImportRecordsRange($import_batch_id);	158	my $biblios = GetImportRecordsRange($import_batch_id);
		159	my @import_record_id_selected = $input->param("import_record_id");
		160	my @quantities = $input->param('quantity');
		161	my @prices = $input->param('price');
		162	my @budgets_id = $input->param('budget_id');
		163	my @rrp = $input->param('rrp');
		164	my @discount = $input->param('discount');
		165	my @sort1 = $input->param('sort1');
		166	my @sort2 = $input->param('sort2');
		167	my $cur = GetCurrency();
160	for my $biblio (@$biblios){	168	for my $biblio (@$biblios){
161	# 1st insert the biblio, or find it through matcher	169	# Check if this import_record_id was selected
		170	next if not grep { $_ eq $$biblio{import_record_id} } @import_record_id_selected;
162	my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );	171	my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
163	my $marcrecord = MARC::Record->new_from_usmarc($marcblob) \|\| die "couldn't translate marc information";	172	my $marcrecord = MARC::Record->new_from_usmarc($marcblob) \|\| die "couldn't translate marc information";
164	my $match = GetImportRecordMatches( $biblio->{'import_record_id'}, 1 );	173	my $match = GetImportRecordMatches( $biblio->{'import_record_id'}, 1 );
165	my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0;	174	my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0;
		175	my $c_quantity = shift( @quantities ) \|\| GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) \|\| 1;
		176	my $c_budget_id = shift( @budgets_id ) \|\| $input->param('all_budget_id') \|\| $budget_id;
		177	my $c_rrp = shift( @rrp ); # rrp include tax
		178	my $c_discount = shift ( @discount);
		179	$c_discount = $c_discount / 100 if $c_discount > 100;
		180	my $c_sort1 = shift( @sort1 ) \|\| $input->param('all_sort1') \|\| '';
		181	my $c_sort2 = shift( @sort2 ) \|\| $input->param('all_sort2') \|\| '';
166		182
		183	# 1st insert the biblio, or find it through matcher
167	unless ( $biblionumber ) {	184	unless ( $biblionumber ) {
168	# add the biblio	185	# add the biblio
169	my $bibitemnum;	186	my $bibitemnum;
170		187
171	# remove ISBN -	188	# remove ISBN -
172	my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn', '' );	189	my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn', '' );
173	if ( $marcrecord->field($isbnfield) ) {	190	if ( $marcrecord->field($isbnfield) ) {
174	foreach my $field ( $marcrecord->field($isbnfield) ) {	191	foreach my $field ( $marcrecord->field($isbnfield) ) {
175	foreach my $subfield ( $field->subfield($isbnsubfield) ) {	192	foreach my $subfield ( $field->subfield($isbnsubfield) ) {
Lines 180-186 if ($op eq ""){ Link Here
180	}	197	}
181	}	198	}
182	( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} \|\| '' );	199	( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} \|\| '' );
183	SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
184	# 2nd add authorities if applicable	200	# 2nd add authorities if applicable
185	if (C4::Context->preference("BiblioAddsAuthorities")){	201	if (C4::Context->preference("BiblioAddsAuthorities")){
186	my $headings_linked =BiblioAutoLink($marcrecord, $cgiparams->{'frameworkcode'});	202	my $headings_linked =BiblioAutoLink($marcrecord, $cgiparams->{'frameworkcode'});
Lines 194-241 if ($op eq ""){ Link Here
194	# get quantity in the MARC record (1 if none)	210	# get quantity in the MARC record (1 if none)
195	my $quantity = GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour')) \|\| 1;	211	my $quantity = GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour')) \|\| 1;
196	my %orderinfo = (	212	my %orderinfo = (
197	"biblionumber", $biblionumber, "basketno", $cgiparams->{'basketno'},	213	biblionumber => $biblionumber,
198	"quantity", $quantity, "branchcode", $branch,	214	basketno => $cgiparams->{'basketno'},
199	"budget_id", $budget_id, "uncertainprice", 1,	215	quantity => $c_quantity,
200	"sort1", $cgiparams->{'sort1'},"sort2", $cgiparams->{'sort2'},	216	branchcode => $patron->{branchcode},
201	"order_internalnote", $cgiparams->{'order_internalnote'}, "budget_id", $cgiparams->{'budget_id'},	217	budget_id => $c_budget_id,
202	"currency",$cgiparams->{'currency'},	218	uncertainprice => 1,
203	"order_vendornote" => $cgiparams->{'order_vendornote'},	219	sort1 => $c_sort1,
		220	sort2 => $c_sort2,
		221	order_internalnote => $cgiparams->{'all_order_internalnote'},
		222	order_vendornote => $cgiparams->{'all_order_vendornote'},
		223	currency => $cgiparams->{'all_currency'},
204	);	224	);
205		225	# get the price if there is one.
206	my $price = GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));	226	my $price= shift( @prices ) \|\| GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
207
208	if ($price){	227	if ($price){
209	eval {	228	# in France, the cents separator is the , but sometimes, ppl use a .
210	require C4::Acquisition;	229	# in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
211	import C4::Acquisition qw/GetBasket/;	230	$price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
212	};	231	$price = $num->unformat_number($price);
213	if ($@){
214	croak $@;
215	}
216	eval {
217	require C4::Bookseller;
218	import C4::Bookseller qw/GetBookSellerFromId/;
219	};
220	if ($@){
221	croak $@;
222	}
223	my $basket = GetBasket( $orderinfo{basketno} );
224	my $bookseller = GetBookSellerFromId( $basket->{booksellerid} );
225	$orderinfo{gstrate} = $bookseller->{gstrate};	232	$orderinfo{gstrate} = $bookseller->{gstrate};
226	$orderinfo{rrp} = $price;	233	my $c = $c_discount ? $c_discount / 100 : $bookseller->{discount} / 100;
227	$orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $bookseller->{discount} / 100 );	234	if ( $bookseller->{listincgst} ) {
228	$orderinfo{listprice} = $orderinfo{rrp};	235	if ( $c_discount ) {
		236	$orderinfo{ecost} = $price;
		237	$orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c );
		238	} else {
		239	$orderinfo{ecost} = $price * ( 1 - $c );
		240	$orderinfo{rrp} = $price;
		241	}
		242	} else {
		243	if ( $c_discount ) {
		244	$orderinfo{ecost} = $price / ( 1 + $orderinfo{gstrate} );
		245	$orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c );
		246	} else {
		247	$orderinfo{rrp} = $price / ( 1 + $orderinfo{gstrate} );
		248	$orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
		249	}
		250	}
		251	$orderinfo{listprice} = $orderinfo{rrp} / $cur->{rate};
229	$orderinfo{unitprice} = $orderinfo{ecost};	252	$orderinfo{unitprice} = $orderinfo{ecost};
230	$orderinfo{total} = $orderinfo{ecost};	253	$orderinfo{total} = $orderinfo{ecost} * $c_quantity;
231	} else {	254	} else {
232	$orderinfo{'listprice'} = 0;	255	$orderinfo{listprice} = 0;
233	}	256	}
234		257
235	# remove uncertainprice flag if we have found a price in the MARC record	258	# remove uncertainprice flag if we have found a price in the MARC record
236	$orderinfo{uncertainprice} = 0 if $orderinfo{listprice};	259	$orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
237	my $basketno;	260	my ( $basketno, $ordernumber ) = NewOrder( \%orderinfo );
238	( $basketno, $ordernumber ) = NewOrder( \%orderinfo );
239		261
240	# 4th, add items if applicable	262	# 4th, add items if applicable
241	# parse the item sent by the form, and create an item just for the import_record_id we are dealing with	263	# parse the item sent by the form, and create an item just for the import_record_id we are dealing with
Lines 255-266 if ($op eq ""){ Link Here
255	push @{ $item->{indicator} }, $indicator[0];	277	push @{ $item->{indicator} }, $indicator[0];
256	my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values, \@ind_tag, \@indicator );	278	my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values, \@ind_tag, \@indicator );
257	my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );	279	my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );
258	for (my $qtyloop=1;$qtyloop <=$quantity;$qtyloop++) {	280	for (my $qtyloop=1;$qtyloop <= $c_quantity;$qtyloop++) {
259	my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );	281	my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
260	NewOrderItem( $itemnumber, $ordernumber );	282	NewOrderItem( $itemnumber, $ordernumber );
261	}	283	}
262	} else {
263	SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
264	}	284	}
265	}	285	}
266	# go to basket page	286	# go to basket page
Lines 277-284 my $budget = GetBudget($budget_id); Link Here
277		297
278	# build budget list	298	# build budget list
279	my $budget_loop = [];	299	my $budget_loop = [];
280	$budgets = GetBudgetHierarchy;	300	my $budgets_hierarchy = GetBudgetHierarchy;
281	foreach my $r ( @{$budgets} ) {	301	foreach my $r ( @{$budgets_hierarchy} ) {
282	next unless (CanUserUseBudget($borrower, $r, $userflags));	302	next unless (CanUserUseBudget($borrower, $r, $userflags));
283	if ( !defined $r->{budget_amount} \|\| $r->{budget_amount} == 0 ) {	303	if ( !defined $r->{budget_amount} \|\| $r->{budget_amount} == 0 ) {
284	next;	304	next;
Lines 286-291 foreach my $r ( @{$budgets} ) { Link Here
286	push @{$budget_loop},	306	push @{$budget_loop},
287	{ b_id => $r->{budget_id},	307	{ b_id => $r->{budget_id},
288	b_txt => $r->{budget_name},	308	b_txt => $r->{budget_name},
		309	b_sort1_authcat => $r->{'sort1_authcat'},
		310	b_sort2_authcat => $r->{'sort2_authcat'},
289	b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,	311	b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
290	};	312	};
291	}	313	}
Lines 297-303 if ($budget) { # its a mod .. Link Here
297	$CGIsort1 = GetAuthvalueDropbox( $budget->{'sort1_authcat'}, $data->{'sort1'} );	319	$CGIsort1 = GetAuthvalueDropbox( $budget->{'sort1_authcat'}, $data->{'sort1'} );
298	}	320	}
299	} elsif ( scalar(@$budgets) ) {	321	} elsif ( scalar(@$budgets) ) {
300	$CGIsort1 = GetAuthvalueDropbox( @$budgets[0]->{'sort1_authcat'}, '' );	322	} elsif ( scalar(@$budgets_hierarchy) ) {
		323	$CGIsort1 = GetAuthvalueDropbox( @$budgets_hierarchy[0]->{'sort1_authcat'}, '' );
301	}	324	}
302	# if CGIsort is successfully fetched, the use it	325	# if CGIsort is successfully fetched, the use it
303	# else - failback to plain input-field	326	# else - failback to plain input-field
Lines 312-319 if ($budget) { Link Here
312	if ( defined $budget->{'sort2_authcat'} ) {	335	if ( defined $budget->{'sort2_authcat'} ) {
313	$CGIsort2 = GetAuthvalueDropbox( $budget->{'sort2_authcat'}, $data->{'sort2'} );	336	$CGIsort2 = GetAuthvalueDropbox( $budget->{'sort2_authcat'}, $data->{'sort2'} );
314	}	337	}
315	} elsif ( scalar(@$budgets) ) {	338	} elsif ( scalar(@$budgets_hierarchy) ) {
316	$CGIsort2 = GetAuthvalueDropbox( @$budgets[0]->{sort2_authcat}, '' );	339	$CGIsort2 = GetAuthvalueDropbox( @$budgets_hierarchy[0]->{sort2_authcat}, '' );
317	}	340	}
318	if ($CGIsort2) {	341	if ($CGIsort2) {
319	$template->param( CGIsort2 => $CGIsort2 );	342	$template->param( CGIsort2 => $CGIsort2 );
Lines 378-386 sub import_biblios_list { Link Here
378	record_sequence => $biblio->{'record_sequence'},	401	record_sequence => $biblio->{'record_sequence'},
379	overlay_status => $biblio->{'overlay_status'},	402	overlay_status => $biblio->{'overlay_status'},
380	match_biblionumber => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0,	403	match_biblionumber => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0,
381	match_citation => $#$match > -1 ? $match->[0]->{'title'} . ' ' . $match->[0]->{'author'} : '',	404	match_citation => $#$match > -1 ? $match->[0]->{'title'} \|\| '' . ' ' . $match->[0]->{'author'} \|\| '': '',
382	match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,	405	match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
383	);	406	);
		407	my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
		408	my $marcrecord = MARC::Record->new_from_usmarc($marcblob) \|\| die "couldn't translate marc information";
		409	my $infos = get_infos_syspref($marcrecord, ['price', 'quantity', 'budget_code', 'rrp', 'discount', 'sort1', 'sort2']);
		410	my $price = $infos->{price};
		411	my $quantity = $infos->{quantity};
		412	my $budget_code = $infos->{budget_code};
		413	my $rrp = $infos->{rrp};
		414	my $discount = $infos->{discount};
		415	my $sort1 = $infos->{sort1};
		416	my $sort2 = $infos->{sort2};
		417	my $budget_id;
		418	if($budget_code) {
		419	my $biblio_budget = GetBudgetByCode($budget_code);
		420	if($biblio_budget) {
		421	$budget_id = $biblio_budget->{budget_id};
		422	}
		423	}
		424	$cellrecord{price} = $price \|\| '';
		425	$cellrecord{quantity} = $quantity \|\| '';
		426	$cellrecord{budget_id} = $budget_id \|\| '';
		427	$cellrecord{rrp} = $rrp \|\| '';
		428	$cellrecord{discount} = $discount \|\| '';
		429	$cellrecord{sort1} = $sort1 \|\| '';
		430	$cellrecord{sort2} = $sort2 \|\| '';
		431
384	push @list, \%cellrecord;	432	push @list, \%cellrecord;
385	}	433	}
386	my $num_biblios = $batch->{'num_biblios'};	434	my $num_biblios = $batch->{'num_biblios'};
Lines 440-442 sub add_matcher_list { Link Here
440	}	488	}
441	$template->param(available_matchers => \@matchers);	489	$template->param(available_matchers => \@matchers);
442	}	490	}
		491
		492	sub get_infos_syspref {
		493	my ($record, $field_list) = @_;
		494	my $syspref = C4::Context->preference('MarcFieldsToOrder');
		495	my $yaml = YAML::Load($syspref);
		496	my $r;
		497	for my $field_name ( @$field_list ) {
		498	my @fields = split /\\|/, $yaml->{$field_name};
		499	for my $field ( @fields ) {
		500	my ( $f, $sf ) = split /\$/, $field;
		501	next unless $f and $sf;
		502	if ( my $v = $record->subfield( $f, $sf ) ) {
		503	$r->{$field_name} = $v;
		504	}
		505	last if $yaml->{$field};
		506	}
		507	}
		508	return $r;
		509	}

Line 0 Link Here

(-)a/acqui/ajax-getauthvaluedropbox.pl (+73 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2012 BibLibre
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 2 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along
		17	# with Koha; if not, write to the Free Software Foundation, Inc.,
		18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		19
		20	=head1 NAME
		21
		22	ajax-getauthvaluedropbox.pl - returns an authorised values dropbox
		23
		24	=head1 DESCRIPTION
		25
		26	this script returns an authorised values dropbox
		27
		28	=head1 CGI PARAMETERS
		29
		30	=over 4
		31
		32	=item name
		33
		34	The name of the dropbox.
		35
		36	=item category
		37
		38	The category of authorised values.
		39
		40	=item default
		41
		42	Default value for the dropbox.
		43
		44	=back
		45
		46	=cut
		47
		48	use Modern::Perl;
		49
		50	use CGI;
		51	use C4::Budgets;
		52	use C4::Charset;
		53
		54	my $input = new CGI;
		55	my $name = $input->param('name');
		56	my $category = $input->param('category');
		57	my $default = $input->param('default');
		58	$default = C4::Charset::NormalizeString($default);
		59
		60	binmode STDOUT, ':encoding(UTF-8)';
		61	print $input->header(-type => 'text/plain', -charset => 'UTF-8');
		62	my $avs = GetAuthvalueDropbox($category, $default);
		63	my $html = qq\|<select id="$name", name="$name">\|;
		64	for my $av ( @$avs ) {
65	if ( $av->{default} ) {
66	$html .= qq\|<option value="$av->{value}" selected="selected">$av->{label}</option>\|;
67	} else {
68	$html .= qq\|<option value="$av->{value}">$av->{label}</option>\|;
69	}
70	}
71	$html .= qq\|</select>\|;
72
73	print $html;