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

(-)a/Koha/Acquisition/Fund.pm (-1 / +1 lines)
Lines 17-24 package Koha::Acquisition::Fund; Link Here
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
use Koha::Acquisition::Budgets;
21
use Koha::Database;
20
use Koha::Database;
21
use Koha::Acquisition::Budget;
22
22
23
use base qw(Koha::Object);
23
use base qw(Koha::Object);
24
24
(-)a/Koha/Acquisition/Order.pm (+15 lines)
Lines 32-37 use Koha::Exceptions::Object; Link Here
32
use Koha::Biblios;
32
use Koha::Biblios;
33
use Koha::Holds;
33
use Koha::Holds;
34
use Koha::Items;
34
use Koha::Items;
35
use Koha::Patron;
35
use Koha::Subscriptions;
36
use Koha::Subscriptions;
36
37
37
use base qw(Koha::Object);
38
use base qw(Koha::Object);
Lines 394-399 sub claimed_date { Link Here
394
    return $last_claim->claimed_on;
395
    return $last_claim->claimed_on;
395
}
396
}
396
397
398
=head3 creator
399
400
my $creator = $order->creator;
401
402
Retrieves patron that created this order.
403
404
=cut
405
406
sub creator {
407
    my ( $self )  = @_;
408
    my $creator_rs = $self->_result->creator;
409
    return Koha::Patron->_new_from_dbic( $creator_rs );
410
}
411
397
=head3 duplicate_to
412
=head3 duplicate_to
398
413
399
    my $duplicated_order = $order->duplicate_to($basket, [$default_values]);
414
    my $duplicated_order = $order->duplicate_to($basket, [$default_values]);
(-)a/Koha/Item.pm (+27 lines)
Lines 46-51 use Koha::Plugins; Link Here
46
use Koha::Libraries;
46
use Koha::Libraries;
47
use Koha::StockRotationItem;
47
use Koha::StockRotationItem;
48
use Koha::StockRotationRotas;
48
use Koha::StockRotationRotas;
49
use Koha::MarcSubfieldStructures;
50
use Koha::AuthorisedValues;
49
51
50
use base qw(Koha::Object);
52
use base qw(Koha::Object);
51
53
Lines 1166-1171 sub _after_item_action_hooks { Link Here
1166
    );
1168
    );
1167
}
1169
}
1168
1170
1171
=head3 _fetch_authorised_values
1172
1173
Retrieves for each column name the unblessed authorised value.
1174
1175
=cut
1176
1177
sub _fetch_authorised_values {
1178
    my ($self, $av_expand) = @_;
1179
1180
    my $columns_info = $self->_result->result_source->columns_info;
1181
    my $framworkcode = $self->biblio->frameworkcode;
1182
    # Handle not null and default values for integers and dates
1183
    my $avs = {};
1184
    foreach my $col ( keys %{$columns_info} ) {
1185
        next unless defined $self->$col;
1186
        my $field = $self->_result->result_source->name.'.'.$col;
1187
        my $mss = Koha::MarcSubfieldStructures->find({frameworkcode => $framworkcode, kohafield => $field});
1188
        if ($mss && $mss->authorised_value) {
1189
            my $av = Koha::AuthorisedValues->find({category => $mss->authorised_value, authorised_value => $self->$col});
1190
            $avs->{$col} = $av->unblessed if $av;
1191
        };
1192
    }
1193
    return $avs;
1194
}
1195
1169
=head3 _type
1196
=head3 _type
1170
1197
1171
=cut
1198
=cut
(-)a/Koha/REST/V1/Acquisitions/Orders.pm (-2 / +5 lines)
Lines 130-136 sub list { Link Here
130
                for my $f ( qw( isbn ean publisher ) ) {
130
                for my $f ( qw( isbn ean publisher ) ) {
131
                    $reserved_params->{$q} =~ s|"biblio.$f":|"biblio.biblioitem.$f":|g;
131
                    $reserved_params->{$q} =~ s|"biblio.$f":|"biblio.biblioitem.$f":|g;
132
                }
132
                }
133
                push @query_params_array, $reserved_params->{$q};
133
                push @query_params_array, $q eq 'query'
134
                  ? $reserved_params->{$q}
135
                  : decode_json( $reserved_params->{$q} );
136
134
            }
137
            }
135
138
136
            if(scalar(@query_params_array) > 1) {
139
            if(scalar(@query_params_array) > 1) {
Lines 157-163 sub list { Link Here
157
160
158
        return $c->render(
161
        return $c->render(
159
            status  => 200,
162
            status  => 200,
160
            openapi => $orders->to_api({ embed => $embed })
163
            openapi => $orders->to_api({ embed => $embed, av_expand => $c->req->headers->header('x-koha-av') })
161
        );
164
        );
162
    }
165
    }
163
    catch {
166
    catch {
(-)a/Koha/REST/V1/Items.pm (-2 / +5 lines)
Lines 66-81 sub get { Link Here
66
    my $c = shift->openapi->valid_input or return;
66
    my $c = shift->openapi->valid_input or return;
67
67
68
    try {
68
    try {
69
        my $item = Koha::Items->find($c->validation->param('item_id'));
69
        my $items_set = Koha::Items->new;
70
        my $id = $c->validation->param('item_id');
71
        my $item = $c->objects->find( $items_set, $id );
70
        unless ( $item ) {
72
        unless ( $item ) {
71
            return $c->render(
73
            return $c->render(
72
                status => 404,
74
                status => 404,
73
                openapi => { error => 'Item not found'}
75
                openapi => { error => 'Item not found'}
74
            );
76
            );
75
        }
77
        }
76
        return $c->render( status => 200, openapi => $item->to_api );
78
        return $c->render( status => 200, openapi => $item );
77
    }
79
    }
78
    catch {
80
    catch {
81
        print $_->message;
79
        $c->unhandled_exception($_);
82
        $c->unhandled_exception($_);
80
    };
83
    };
81
}
84
}
(-)a/Koha/Schema/Result/Aqorder.pm (+20 lines)
Lines 800-805 __PACKAGE__->belongs_to( Link Here
800
  },
800
  },
801
);
801
);
802
802
803
=head2 creator
804
805
Type: belongs_to
806
807
Related object: L<Koha::Schema::Result::Borrower>
808
809
=cut
810
811
__PACKAGE__->belongs_to(
812
  "creator",
813
  "Koha::Schema::Result::Borrower",
814
  { borrowernumber => "created_by" },
815
  {
816
    is_deferrable => 1,
817
    join_type     => "LEFT",
818
    on_delete     => "SET NULL",
819
    on_update     => "CASCADE",
820
  },
821
);
822
803
__PACKAGE__->belongs_to(
823
__PACKAGE__->belongs_to(
804
  "subscription",
824
  "subscription",
805
  "Koha::Schema::Result::Subscription",
825
  "Koha::Schema::Result::Subscription",
(-)a/acqui/finishreceive.pl (+2 lines)
Lines 73-78 if (C4::Context->preference("CurrencyFormat") eq 'FR') { Link Here
73
$unitprice = Koha::Number::Price->new( $unitprice )->unformat();
73
$unitprice = Koha::Number::Price->new( $unitprice )->unformat();
74
$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat();
74
$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat();
75
my $order_obj = Koha::Acquisition::Orders->find( $ordernumber );
75
my $order_obj = Koha::Acquisition::Orders->find( $ordernumber );
76
76
my $basket = $order_obj->basket;
77
my $basket = $order_obj->basket;
77
78
78
#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME
79
#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME
Lines 116-121 if ($quantityrec > $origquantityrec ) { Link Here
116
            # Quantity can only be modified if linked to a subscription
117
            # Quantity can only be modified if linked to a subscription
117
            $order->{quantity} = $quantity; # quantityrec will be deduced from this value in ModReceiveOrder
118
            $order->{quantity} = $quantity; # quantityrec will be deduced from this value in ModReceiveOrder
118
        }
119
        }
120
119
        ( $datereceived, $new_ordernumber ) = ModReceiveOrder(
121
        ( $datereceived, $new_ordernumber ) = ModReceiveOrder(
120
            {
122
            {
121
                biblionumber     => $biblionumber,
123
                biblionumber     => $biblionumber,
(-)a/acqui/orderreceive.pl (-44 / +54 lines)
Lines 87-92 my $invoice = GetInvoice($invoiceid); Link Here
87
my $booksellerid   = $invoice->{booksellerid};
87
my $booksellerid   = $invoice->{booksellerid};
88
my $freight      = $invoice->{shipmentcost};
88
my $freight      = $invoice->{shipmentcost};
89
my $ordernumber  = $input->param('ordernumber');
89
my $ordernumber  = $input->param('ordernumber');
90
my $multiple_orders = $input->param('multiple_orders');
90
91
91
my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
92
my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
92
my $order = Koha::Acquisition::Orders->find( $ordernumber );
93
my $order = Koha::Acquisition::Orders->find( $ordernumber );
Lines 101-113 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( Link Here
101
    }
102
    }
102
);
103
);
103
104
104
unless ( $order ) {
105
unless ( $order || $multiple_orders ) {
105
    output_html_with_http_headers $input, $cookie, $template->output;
106
    output_html_with_http_headers $input, $cookie, $template->output;
106
    exit;
107
    exit;
107
}
108
}
108
109
109
# prepare the form for receiving
110
my $budget;
110
my $basket = $order->basket;
111
if( $order ) {
112
    # prepare the form for receiving
113
    my $creator = Koha::Patrons->find( $order->created_by );
114
115
    $budget = GetBudget( $order->budget_id );
116
117
    my $datereceived = $order->datereceived ? dt_from_string( $order->datereceived ) : dt_from_string;
118
119
    my $order_internalnote = $order->order_internalnote;
120
    my $order_vendornote   = $order->order_vendornote;
121
    if ( $order->subscriptionid ) {
122
        # Order from a subscription, we will display an history of what has been received
123
        my $orders = Koha::Acquisition::Orders->search(
124
            {
125
                subscriptionid     => $order->subscriptionid,
126
                parent_ordernumber => $order->ordernumber,
127
                ordernumber        => { '!=' => $order->ordernumber }
128
            }
129
        );
130
        if ( $order->parent_ordernumber != $order->ordernumber ) {
131
            my $parent_order = Koha::Acquisition::Orders->find($order->parent_ordernumber);
132
            $order_internalnote = $parent_order->order_internalnote;
133
            $order_vendornote   = $parent_order->order_vendornote;
134
        }
135
        $template->param(
136
            orders => $orders,
137
        );
138
    }
139
140
    my $suggestion = GetSuggestionInfoFromBiblionumber($order->biblionumber);
141
142
    if ( $suggestion ) {
143
        $template->param( suggestion => $suggestion );
144
    }
145
146
    $template->param(
147
        order                 => $order,
148
        creator               => $creator,
149
        bookfund              => $budget->{budget_name},
150
        datereceived          => $datereceived,
151
        order_internalnote    => $order_internalnote,
152
        order_vendornote      => $order_vendornote,
153
    );
154
}
155
156
if( $multiple_orders ) {
157
    $template->param(multiple_orders => $multiple_orders);
158
}
159
111
my $currencies = Koha::Acquisition::Currencies->search;
160
my $currencies = Koha::Acquisition::Currencies->search;
112
my $active_currency = $currencies->get_active;
161
my $active_currency = $currencies->get_active;
113
162
Lines 117-182 unless($acq_fw) { Link Here
117
    $template->param('NoACQframework' => 1);
166
    $template->param('NoACQframework' => 1);
118
}
167
}
119
168
120
121
my $creator = Koha::Patrons->find( $order->created_by );
122
123
my $budget = GetBudget( $order->budget_id );
124
125
my $datereceived = $order->datereceived ? dt_from_string( $order->datereceived ) : dt_from_string;
126
127
# get option values for TaxRates syspref
169
# get option values for TaxRates syspref
128
my @gst_values = map {
170
my @gst_values = map {
129
    option => $_ + 0.0
171
    option => $_ + 0.0
130
}, split( '\|', C4::Context->preference("TaxRates") );
172
}, split( '\|', C4::Context->preference("TaxRates") );
131
173
132
my $order_internalnote = $order->order_internalnote;
133
my $order_vendornote   = $order->order_vendornote;
134
if ( $order->subscriptionid ) {
135
    # Order from a subscription, we will display an history of what has been received
136
    my $orders = Koha::Acquisition::Orders->search(
137
        {
138
            subscriptionid     => $order->subscriptionid,
139
            parent_ordernumber => $order->ordernumber,
140
            ordernumber        => { '!=' => $order->ordernumber }
141
        }
142
    );
143
    if ( $order->parent_ordernumber != $order->ordernumber ) {
144
        my $parent_order = Koha::Acquisition::Orders->find($order->parent_ordernumber);
145
        $order_internalnote = $parent_order->order_internalnote;
146
        $order_vendornote   = $parent_order->order_vendornote;
147
    }
148
    $template->param(
149
        orders => $orders,
150
    );
151
}
152
153
$template->param(
174
$template->param(
154
    order                 => $order,
155
    freight               => $freight,
175
    freight               => $freight,
156
    name                  => $bookseller->name,
176
    name                  => $bookseller->name,
157
    active_currency       => $active_currency,
177
    active_currency       => $active_currency,
158
    currencies            => scalar $currencies->search({ rate => { '!=' => 1 } }),
178
    currencies            => scalar $currencies->search({ rate => { '!=' => 1 } }),
159
    invoiceincgst         => $bookseller->invoiceincgst,
179
    invoiceincgst         => $bookseller->invoiceincgst,
160
    bookfund              => $budget->{budget_name},
161
    creator               => $creator,
162
    invoiceid             => $invoice->{invoiceid},
180
    invoiceid             => $invoice->{invoiceid},
163
    invoice               => $invoice->{invoicenumber},
181
    invoice               => $invoice->{invoicenumber},
164
    datereceived          => $datereceived,
165
    order_internalnote    => $order_internalnote,
166
    order_vendornote      => $order_vendornote,
167
    gst_values            => \@gst_values,
182
    gst_values            => \@gst_values,
168
);
183
);
169
184
170
my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber});
171
if ( $suggestion ) {
172
    $template->param( suggestion => $suggestion );
173
}
174
175
my $patron = Koha::Patrons->find( $loggedinuser )->unblessed;
185
my $patron = Koha::Patrons->find( $loggedinuser )->unblessed;
176
my @budget_loop;
186
my @budget_loop;
177
my $periods = GetBudgetPeriods( );
187
my $periods = GetBudgetPeriods( );
178
foreach my $period (@$periods) {
188
foreach my $period (@$periods) {
179
    if ($period->{'budget_period_id'} == $budget->{'budget_period_id'}) {
189
    if ($budget && $period->{'budget_period_id'} == $budget->{'budget_period_id'}) {
180
        $template->{'VARS'}->{'budget_period_description'} = $period->{'budget_period_description'};
190
        $template->{'VARS'}->{'budget_period_description'} = $period->{'budget_period_description'};
181
    }
191
    }
182
    next if $period->{'budget_period_locked'} || !$period->{'budget_period_description'};
192
    next if $period->{'budget_period_locked'} || !$period->{'budget_period_description'};
Lines 191-197 foreach my $period (@$periods) { Link Here
191
          {
201
          {
192
            b_id  => $r->{budget_id},
202
            b_id  => $r->{budget_id},
193
            b_txt => $r->{budget_name},
203
            b_txt => $r->{budget_name},
194
            b_sel => ( $r->{budget_id} == $order->{budget_id} ) ? 1 : 0,
204
            b_sel => ( $order && $r->{budget_id} == $order->{budget_id} ) ? 1 : 0,
195
          };
205
          };
196
    }
206
    }
197
207
(-)a/api/v1/swagger/definitions/item.json (+12 lines)
Lines 180-185 Link Here
180
    "exclude_from_local_holds_priority": {
180
    "exclude_from_local_holds_priority": {
181
      "type": "boolean",
181
      "type": "boolean",
182
      "description": "Exclude this item from local holds priority."
182
      "description": "Exclude this item from local holds priority."
183
    },
184
    "home_branch": {
185
      "type": ["object", "null"]
186
    },
187
    "holding_branch": {
188
      "type": ["object", "null"]
189
    },
190
    "itemtype": {
191
      "type": ["object", "null"]
192
    },
193
    "_authorised_values": {
194
      "type": ["object", "null"]
183
    }
195
    }
184
  },
196
  },
185
  "additionalProperties": false,
197
  "additionalProperties": false,
(-)a/api/v1/swagger/definitions/order.json (+9 lines)
Lines 329-334 Link Here
329
                "object",
329
                "object",
330
                "null"
330
                "null"
331
            ]
331
            ]
332
        },
333
        "creator": {
334
            "type": [
335
                "object",
336
                "null"
337
            ]
338
        },
339
        "_authorised_values": {
340
            "type": "object"
332
        }
341
        }
333
    },
342
    },
334
    "additionalProperties": false
343
    "additionalProperties": false
(-)a/api/v1/swagger/paths/acquisitions_orders.json (-1 / +6 lines)
Lines 124-133 Link Here
124
                "biblio.items+count",
124
                "biblio.items+count",
125
                "biblio.suggestions.suggester",
125
                "biblio.suggestions.suggester",
126
                "fund",
126
                "fund",
127
                "fund.budget",
127
                "current_item_level_holds+count",
128
                "current_item_level_holds+count",
128
                "invoice",
129
                "invoice",
129
                "items",
130
                "items",
130
                "subscription"
131
                "items.home_branch",
132
                "items.holding_branch",
133
                "items.itemtype",
134
                "subscription",
135
                "creator"
131
            ]
136
            ]
132
        },
137
        },
133
        "post": {
138
        "post": {
(-)a/api/v1/swagger/paths/items.json (-1 / +6 lines)
Lines 122-128 Link Here
122
        "permissions": {
122
        "permissions": {
123
          "catalogue": "1"
123
          "catalogue": "1"
124
        }
124
        }
125
      }
125
      },
126
      "x-koha-embed": [
127
        "itemtype",
128
        "home_branch",
129
        "holding_branch"
130
      ]
126
    }
131
    }
127
  }
132
  }
128
}
133
}
(-)a/koha-tmpl/intranet-tmpl/lib/datatables/dataTables.select.min.js (+38 lines)
Line 0 Link Here
1
/*!
2
   Copyright 2015-2019 SpryMedia Ltd.
3
4
 This source file is free software, available under the following license:
5
   MIT license - http://datatables.net/license/mit
6
7
 This source file is distributed in the hope that it will be useful, but
8
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
9
 or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
10
11
 For details please refer to: http://www.datatables.net/extensions/select
12
 Select for DataTables 1.3.1
13
 2015-2019 SpryMedia Ltd - datatables.net/license/mit
14
*/
15
(function(f){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(k){return f(k,window,document)}):"object"===typeof exports?module.exports=function(k,p){k||(k=window);p&&p.fn.dataTable||(p=require("datatables.net")(k,p).$);return f(p,k,k.document)}:f(jQuery,window,document)})(function(f,k,p,h){function z(a,b,c){var d=function(c,b){if(c>b){var d=b;b=c;c=d}var e=!1;return a.columns(":visible").indexes().filter(function(a){a===c&&(e=!0);return a===b?(e=!1,!0):e})};var e=
16
function(c,b){var d=a.rows({search:"applied"}).indexes();if(d.indexOf(c)>d.indexOf(b)){var e=b;b=c;c=e}var f=!1;return d.filter(function(a){a===c&&(f=!0);return a===b?(f=!1,!0):f})};a.cells({selected:!0}).any()||c?(d=d(c.column,b.column),c=e(c.row,b.row)):(d=d(0,b.column),c=e(0,b.row));c=a.cells(c,d).flatten();a.cells(b,{selected:!0}).any()?a.cells(c).deselect():a.cells(c).select()}function v(a){var b=a.settings()[0]._select.selector;f(a.table().container()).off("mousedown.dtSelect",b).off("mouseup.dtSelect",
17
b).off("click.dtSelect",b);f("body").off("click.dtSelect"+a.table().node().id.replace(/[^a-zA-Z0-9\-_]/g,"-"))}function A(a){var b=f(a.table().container()),c=a.settings()[0],d=c._select.selector,e;b.on("mousedown.dtSelect",d,function(a){if(a.shiftKey||a.metaKey||a.ctrlKey)b.css("-moz-user-select","none").one("selectstart.dtSelect",d,function(){return!1});k.getSelection&&(e=k.getSelection())}).on("mouseup.dtSelect",d,function(){b.css("-moz-user-select","")}).on("click.dtSelect",d,function(c){var b=
18
a.select.items();if(e){var d=k.getSelection();if((!d.anchorNode||f(d.anchorNode).closest("table")[0]===a.table().node())&&d!==e)return}d=a.settings()[0];var l=f.trim(a.settings()[0].oClasses.sWrapper).replace(/ +/g,".");if(f(c.target).closest("div."+l)[0]==a.table().container()&&(l=a.cell(f(c.target).closest("td, th")),l.any())){var g=f.Event("user-select.dt");m(a,g,[b,l,c]);g.isDefaultPrevented()||(g=l.index(),"row"===b?(b=g.row,w(c,a,d,"row",b)):"column"===b?(b=l.index().column,w(c,a,d,"column",
19
b)):"cell"===b&&(b=l.index(),w(c,a,d,"cell",b)),d._select_lastCell=g)}});f("body").on("click.dtSelect"+a.table().node().id.replace(/[^a-zA-Z0-9\-_]/g,"-"),function(b){!c._select.blurable||f(b.target).parents().filter(a.table().container()).length||0===f(b.target).parents("html").length||f(b.target).parents("div.DTE").length||r(c,!0)})}function m(a,b,c,d){if(!d||a.flatten().length)"string"===typeof b&&(b+=".dt"),c.unshift(a),f(a.table().node()).trigger(b,c)}function B(a){var b=a.settings()[0];if(b._select.info&&
20
b.aanFeatures.i&&"api"!==a.select.style()){var c=a.rows({selected:!0}).flatten().length,d=a.columns({selected:!0}).flatten().length,e=a.cells({selected:!0}).flatten().length,l=function(b,c,d){b.append(f('<span class="select-item"/>').append(a.i18n("select."+c+"s",{_:"%d "+c+"s selected",0:"",1:"1 "+c+" selected"},d)))};f.each(b.aanFeatures.i,function(b,a){a=f(a);b=f('<span class="select-info"/>');l(b,"row",c);l(b,"column",d);l(b,"cell",e);var g=a.children("span.select-info");g.length&&g.remove();
21
""!==b.text()&&a.append(b)})}}function D(a){var b=new g.Api(a);a.aoRowCreatedCallback.push({fn:function(b,d,e){d=a.aoData[e];d._select_selected&&f(b).addClass(a._select.className);b=0;for(e=a.aoColumns.length;b<e;b++)(a.aoColumns[b]._select_selected||d._selected_cells&&d._selected_cells[b])&&f(d.anCells[b]).addClass(a._select.className)},sName:"select-deferRender"});b.on("preXhr.dt.dtSelect",function(){var a=b.rows({selected:!0}).ids(!0).filter(function(b){return b!==h}),d=b.cells({selected:!0}).eq(0).map(function(a){var c=
22
b.row(a.row).id(!0);return c?{row:c,column:a.column}:h}).filter(function(b){return b!==h});b.one("draw.dt.dtSelect",function(){b.rows(a).select();d.any()&&d.each(function(a){b.cells(a.row,a.column).select()})})});b.on("draw.dtSelect.dt select.dtSelect.dt deselect.dtSelect.dt info.dt",function(){B(b)});b.on("destroy.dtSelect",function(){v(b);b.off(".dtSelect")})}function C(a,b,c,d){var e=a[b+"s"]({search:"applied"}).indexes();d=f.inArray(d,e);var g=f.inArray(c,e);if(a[b+"s"]({selected:!0}).any()||
23
-1!==d){if(d>g){var u=g;g=d;d=u}e.splice(g+1,e.length);e.splice(0,d)}else e.splice(f.inArray(c,e)+1,e.length);a[b](c,{selected:!0}).any()?(e.splice(f.inArray(c,e),1),a[b+"s"](e).deselect()):a[b+"s"](e).select()}function r(a,b){if(b||"single"===a._select.style)a=new g.Api(a),a.rows({selected:!0}).deselect(),a.columns({selected:!0}).deselect(),a.cells({selected:!0}).deselect()}function w(a,b,c,d,e){var f=b.select.style(),g=b.select.toggleable(),h=b[d](e,{selected:!0}).any();if(!h||g)"os"===f?a.ctrlKey||
24
a.metaKey?b[d](e).select(!h):a.shiftKey?"cell"===d?z(b,e,c._select_lastCell||null):C(b,d,e,c._select_lastCell?c._select_lastCell[d]:null):(a=b[d+"s"]({selected:!0}),h&&1===a.flatten().length?b[d](e).deselect():(a.deselect(),b[d](e).select())):"multi+shift"==f?a.shiftKey?"cell"===d?z(b,e,c._select_lastCell||null):C(b,d,e,c._select_lastCell?c._select_lastCell[d]:null):b[d](e).select(!h):b[d](e).select(!h)}function t(a,b){return function(c){return c.i18n("buttons."+a,b)}}function x(a){a=a._eventNamespace;
25
return"draw.dt.DT"+a+" select.dt.DT"+a+" deselect.dt.DT"+a}function E(a,b){return-1!==f.inArray("rows",b.limitTo)&&a.rows({selected:!0}).any()||-1!==f.inArray("columns",b.limitTo)&&a.columns({selected:!0}).any()||-1!==f.inArray("cells",b.limitTo)&&a.cells({selected:!0}).any()?!0:!1}var g=f.fn.dataTable;g.select={};g.select.version="1.3.1";g.select.init=function(a){var b=a.settings()[0],c=b.oInit.select,d=g.defaults.select;c=c===h?d:c;d="row";var e="api",l=!1,u=!0,k=!0,m="td, th",p="selected",n=!1;
26
b._select={};!0===c?(e="os",n=!0):"string"===typeof c?(e=c,n=!0):f.isPlainObject(c)&&(c.blurable!==h&&(l=c.blurable),c.toggleable!==h&&(u=c.toggleable),c.info!==h&&(k=c.info),c.items!==h&&(d=c.items),e=c.style!==h?c.style:"os",n=!0,c.selector!==h&&(m=c.selector),c.className!==h&&(p=c.className));a.select.selector(m);a.select.items(d);a.select.style(e);a.select.blurable(l);a.select.toggleable(u);a.select.info(k);b._select.className=p;f.fn.dataTable.ext.order["select-checkbox"]=function(b,a){return this.api().column(a,
27
{order:"index"}).nodes().map(function(a){return"row"===b._select.items?f(a).parent().hasClass(b._select.className):"cell"===b._select.items?f(a).hasClass(b._select.className):!1})};!n&&f(a.table().node()).hasClass("selectable")&&a.select.style("os")};f.each([{type:"row",prop:"aoData"},{type:"column",prop:"aoColumns"}],function(a,b){g.ext.selector[b.type].push(function(a,d,e){d=d.selected;var c=[];if(!0!==d&&!1!==d)return e;for(var f=0,g=e.length;f<g;f++){var h=a[b.prop][e[f]];(!0===d&&!0===h._select_selected||
28
!1===d&&!h._select_selected)&&c.push(e[f])}return c})});g.ext.selector.cell.push(function(a,b,c){b=b.selected;var d=[];if(b===h)return c;for(var e=0,f=c.length;e<f;e++){var g=a.aoData[c[e].row];(!0===b&&g._selected_cells&&!0===g._selected_cells[c[e].column]||!(!1!==b||g._selected_cells&&g._selected_cells[c[e].column]))&&d.push(c[e])}return d});var n=g.Api.register,q=g.Api.registerPlural;n("select()",function(){return this.iterator("table",function(a){g.select.init(new g.Api(a))})});n("select.blurable()",
29
function(a){return a===h?this.context[0]._select.blurable:this.iterator("table",function(b){b._select.blurable=a})});n("select.toggleable()",function(a){return a===h?this.context[0]._select.toggleable:this.iterator("table",function(b){b._select.toggleable=a})});n("select.info()",function(a){return B===h?this.context[0]._select.info:this.iterator("table",function(b){b._select.info=a})});n("select.items()",function(a){return a===h?this.context[0]._select.items:this.iterator("table",function(b){b._select.items=
30
a;m(new g.Api(b),"selectItems",[a])})});n("select.style()",function(a){return a===h?this.context[0]._select.style:this.iterator("table",function(b){b._select.style=a;b._select_init||D(b);var c=new g.Api(b);v(c);"api"!==a&&A(c);m(new g.Api(b),"selectStyle",[a])})});n("select.selector()",function(a){return a===h?this.context[0]._select.selector:this.iterator("table",function(b){v(new g.Api(b));b._select.selector=a;"api"!==b._select.style&&A(new g.Api(b))})});q("rows().select()","row().select()",function(a){var b=
31
this;if(!1===a)return this.deselect();this.iterator("row",function(b,a){r(b);b.aoData[a]._select_selected=!0;f(b.aoData[a].nTr).addClass(b._select.className)});this.iterator("table",function(a,d){m(b,"select",["row",b[d]],!0)});return this});q("columns().select()","column().select()",function(a){var b=this;if(!1===a)return this.deselect();this.iterator("column",function(b,a){r(b);b.aoColumns[a]._select_selected=!0;a=(new g.Api(b)).column(a);f(a.header()).addClass(b._select.className);f(a.footer()).addClass(b._select.className);
32
a.nodes().to$().addClass(b._select.className)});this.iterator("table",function(a,d){m(b,"select",["column",b[d]],!0)});return this});q("cells().select()","cell().select()",function(a){var b=this;if(!1===a)return this.deselect();this.iterator("cell",function(b,a,e){r(b);a=b.aoData[a];a._selected_cells===h&&(a._selected_cells=[]);a._selected_cells[e]=!0;a.anCells&&f(a.anCells[e]).addClass(b._select.className)});this.iterator("table",function(a,d){m(b,"select",["cell",b[d]],!0)});return this});q("rows().deselect()",
33
"row().deselect()",function(){var a=this;this.iterator("row",function(a,c){a.aoData[c]._select_selected=!1;f(a.aoData[c].nTr).removeClass(a._select.className)});this.iterator("table",function(b,c){m(a,"deselect",["row",a[c]],!0)});return this});q("columns().deselect()","column().deselect()",function(){var a=this;this.iterator("column",function(a,c){a.aoColumns[c]._select_selected=!1;var b=new g.Api(a),e=b.column(c);f(e.header()).removeClass(a._select.className);f(e.footer()).removeClass(a._select.className);
34
b.cells(null,c).indexes().each(function(b){var c=a.aoData[b.row],d=c._selected_cells;!c.anCells||d&&d[b.column]||f(c.anCells[b.column]).removeClass(a._select.className)})});this.iterator("table",function(b,c){m(a,"deselect",["column",a[c]],!0)});return this});q("cells().deselect()","cell().deselect()",function(){var a=this;this.iterator("cell",function(a,c,d){c=a.aoData[c];c._selected_cells[d]=!1;c.anCells&&!a.aoColumns[d]._select_selected&&f(c.anCells[d]).removeClass(a._select.className)});this.iterator("table",
35
function(b,c){m(a,"deselect",["cell",a[c]],!0)});return this});var y=0;f.extend(g.ext.buttons,{selected:{text:t("selected","Selected"),className:"buttons-selected",limitTo:["rows","columns","cells"],init:function(a,b,c){var d=this;c._eventNamespace=".select"+y++;a.on(x(c),function(){d.enable(E(a,c))});this.disable()},destroy:function(a,b,c){a.off(c._eventNamespace)}},selectedSingle:{text:t("selectedSingle","Selected single"),className:"buttons-selected-single",init:function(a,b,c){var d=this;c._eventNamespace=
36
".select"+y++;a.on(x(c),function(){var b=a.rows({selected:!0}).flatten().length+a.columns({selected:!0}).flatten().length+a.cells({selected:!0}).flatten().length;d.enable(1===b)});this.disable()},destroy:function(a,b,c){a.off(c._eventNamespace)}},selectAll:{text:t("selectAll","Select all"),className:"buttons-select-all",action:function(){this[this.select.items()+"s"]().select()}},selectNone:{text:t("selectNone","Deselect all"),className:"buttons-select-none",action:function(){r(this.settings()[0],
37
!0)},init:function(a,b,c){var d=this;c._eventNamespace=".select"+y++;a.on(x(c),function(){var b=a.rows({selected:!0}).flatten().length+a.columns({selected:!0}).flatten().length+a.cells({selected:!0}).flatten().length;d.enable(0<b)});this.disable()},destroy:function(a,b,c){a.off(c._eventNamespace)}}});f.each(["Row","Column","Cell"],function(a,b){var c=b.toLowerCase();g.ext.buttons["select"+b+"s"]={text:t("select"+b+"s","Select "+c+"s"),className:"buttons-select-"+c+"s",action:function(){this.select.items(c)},
38
init:function(a){var b=this;a.on("selectItems.dt.DT",function(a,d,e){b.active(e===c)})}}});f(p).on("preInit.dt.dtSelect",function(a,b){"dt"===a.namespace&&g.select.init(new g.Api(b))});return g.select});
(-)a/koha-tmpl/intranet-tmpl/lib/datatables/select.dataTables.min.css (+1 lines)
Line 0 Link Here
1
table.dataTable tbody>tr.selected,table.dataTable tbody>tr>.selected{background-color:#B0BED9}table.dataTable.stripe tbody>tr.odd.selected,table.dataTable.stripe tbody>tr.odd>.selected,table.dataTable.display tbody>tr.odd.selected,table.dataTable.display tbody>tr.odd>.selected{background-color:#acbad4}table.dataTable.hover tbody>tr.selected:hover,table.dataTable.hover tbody>tr>.selected:hover,table.dataTable.display tbody>tr.selected:hover,table.dataTable.display tbody>tr>.selected:hover{background-color:#aab7d1}table.dataTable.order-column tbody>tr.selected>.sorting_1,table.dataTable.order-column tbody>tr.selected>.sorting_2,table.dataTable.order-column tbody>tr.selected>.sorting_3,table.dataTable.order-column tbody>tr>.selected,table.dataTable.display tbody>tr.selected>.sorting_1,table.dataTable.display tbody>tr.selected>.sorting_2,table.dataTable.display tbody>tr.selected>.sorting_3,table.dataTable.display tbody>tr>.selected{background-color:#acbad5}table.dataTable.display tbody>tr.odd.selected>.sorting_1,table.dataTable.order-column.stripe tbody>tr.odd.selected>.sorting_1{background-color:#a6b4cd}table.dataTable.display tbody>tr.odd.selected>.sorting_2,table.dataTable.order-column.stripe tbody>tr.odd.selected>.sorting_2{background-color:#a8b5cf}table.dataTable.display tbody>tr.odd.selected>.sorting_3,table.dataTable.order-column.stripe tbody>tr.odd.selected>.sorting_3{background-color:#a9b7d1}table.dataTable.display tbody>tr.even.selected>.sorting_1,table.dataTable.order-column.stripe tbody>tr.even.selected>.sorting_1{background-color:#acbad5}table.dataTable.display tbody>tr.even.selected>.sorting_2,table.dataTable.order-column.stripe tbody>tr.even.selected>.sorting_2{background-color:#aebcd6}table.dataTable.display tbody>tr.even.selected>.sorting_3,table.dataTable.order-column.stripe tbody>tr.even.selected>.sorting_3{background-color:#afbdd8}table.dataTable.display tbody>tr.odd>.selected,table.dataTable.order-column.stripe tbody>tr.odd>.selected{background-color:#a6b4cd}table.dataTable.display tbody>tr.even>.selected,table.dataTable.order-column.stripe tbody>tr.even>.selected{background-color:#acbad5}table.dataTable.display tbody>tr.selected:hover>.sorting_1,table.dataTable.order-column.hover tbody>tr.selected:hover>.sorting_1{background-color:#a2aec7}table.dataTable.display tbody>tr.selected:hover>.sorting_2,table.dataTable.order-column.hover tbody>tr.selected:hover>.sorting_2{background-color:#a3b0c9}table.dataTable.display tbody>tr.selected:hover>.sorting_3,table.dataTable.order-column.hover tbody>tr.selected:hover>.sorting_3{background-color:#a5b2cb}table.dataTable.display tbody>tr:hover>.selected,table.dataTable.display tbody>tr>.selected:hover,table.dataTable.order-column.hover tbody>tr:hover>.selected,table.dataTable.order-column.hover tbody>tr>.selected:hover{background-color:#a2aec7}table.dataTable tbody td.select-checkbox,table.dataTable tbody th.select-checkbox{position:relative}table.dataTable tbody td.select-checkbox:before,table.dataTable tbody td.select-checkbox:after,table.dataTable tbody th.select-checkbox:before,table.dataTable tbody th.select-checkbox:after{display:block;position:absolute;top:1.2em;left:50%;width:12px;height:12px;box-sizing:border-box}table.dataTable tbody td.select-checkbox:before,table.dataTable tbody th.select-checkbox:before{content:' ';margin-top:-6px;margin-left:-6px;border:1px solid black;border-radius:3px}table.dataTable tr.selected td.select-checkbox:after,table.dataTable tr.selected th.select-checkbox:after{content:'\2714';margin-top:-11px;margin-left:-4px;text-align:center;text-shadow:1px 1px #B0BED9, -1px -1px #B0BED9, 1px -1px #B0BED9, -1px 1px #B0BED9}div.dataTables_wrapper span.select-info,div.dataTables_wrapper span.select-item{margin-left:0.5em}@media screen and (max-width: 640px){div.dataTables_wrapper span.select-info,div.dataTables_wrapper span.select-item{margin-left:0;display:block}}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc (+1 lines)
Lines 2-5 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% INCLUDE 'format_price.inc' %]
3
[% INCLUDE 'format_price.inc' %]
4
[% Asset.js("lib/datatables/datatables.min.js") | $raw %]
4
[% Asset.js("lib/datatables/datatables.min.js") | $raw %]
5
[% Asset.js("lib/datatables/dataTables.select.min.js") | $raw %]
5
[% Asset.js("js/datatables.js") | $raw %]
6
[% Asset.js("js/datatables.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc (+1 lines)
Lines 18-23 Link Here
18
[% Asset.css("lib/bootstrap/bootstrap-theme.min.css") | $raw %]
18
[% Asset.css("lib/bootstrap/bootstrap-theme.min.css") | $raw %]
19
[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
19
[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
20
[% Asset.css("lib/datatables/datatables.min.css") | $raw %]
20
[% Asset.css("lib/datatables/datatables.min.css") | $raw %]
21
[% Asset.css("lib/datatables/select.dataTables.min.css") | $raw %]
21
[% Asset.css("css/print.css", { media = "print" }) | $raw %]
22
[% Asset.css("css/print.css", { media = "print" }) | $raw %]
22
[% INCLUDE intranetstylesheet.inc %]
23
[% INCLUDE intranetstylesheet.inc %]
23
[% IF ( bidi ) %][% Asset.css("css/right-to-left.css") | $raw %][% END %]
24
[% IF ( bidi ) %][% Asset.css("css/right-to-left.css") | $raw %][% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-6 / +1127 lines)
Lines 31-37 Link Here
31
            <a href="#" aria-current="page">
31
            <a href="#" aria-current="page">
32
    Receive items from : [% name | html %] [% IF ( invoice ) %]
32
    Receive items from : [% name | html %] [% IF ( invoice ) %]
33
    [[% invoice | html %]]
33
    [[% invoice | html %]]
34
    [% END %] (order #[% order.ordernumber | html %])
34
    [% END %] (order #[% order.ordernumber || multiple_orders | html %])
35
            </a>
35
            </a>
36
        </li>
36
        </li>
37
    </ol>
37
    </ol>
Lines 39-51 Link Here
39
39
40
<div class="main container-fluid">
40
<div class="main container-fluid">
41
    <div class="row">
41
    <div class="row">
42
    [% AcqCreateItem = order.basket.effective_create_items %]
43
        <div class="col-sm-10 col-sm-push-2">
42
        <div class="col-sm-10 col-sm-push-2">
44
            <main>
43
            <main>
45
44
46
<h1>Receive items from : [% name | html %] [% IF ( invoice ) %][[% invoice | html %]] [% END %] (order #[% order.ordernumber | html %])</h1>
45
<h1>Receive items from : [% name | html %] [% IF ( invoice ) %][[% invoice | html %]] [% END %] (order #[% order.ordernumber || multiple_orders | html %])</h1>
47
46
48
[% IF ( order ) %]
47
[% IF ( order ) %]
48
    [% AcqCreateItem = order.basket.effective_create_items %]
49
    <form action="/cgi-bin/koha/acqui/finishreceive.pl" class="noEnterSubmit" method="post" onsubmit="return Check(this);">
49
    <form action="/cgi-bin/koha/acqui/finishreceive.pl" class="noEnterSubmit" method="post" onsubmit="return Check(this);">
50
<div class="row">
50
<div class="row">
51
<div class="col-sm-6">
51
<div class="col-sm-6">
Lines 309-315 Link Here
309
                    [% IF ( order.items.count ) %]
309
                    [% IF ( order.items.count ) %]
310
                        <input readonly="readonly" type="text" size="20" name="quantityrec" id="quantity" value="[% order.quantityreceived + 1 | html %]" />
310
                        <input readonly="readonly" type="text" size="20" name="quantityrec" id="quantity" value="[% order.quantityreceived + 1 | html %]" />
311
                    [% ELSE %]
311
                    [% ELSE %]
312
                        <input type="text" size="20" name="quantityrec" id="quantity" value="[% quantityreceived + 1 | html %]" />
312
                        <input type="text" size="20" name="quantityrec" id="quantity" value="[% order.quantityreceived + 1 | html %]" />
313
                    [% END %]
313
                    [% END %]
314
                    <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="[% order.quantityreceived | html %]" />
314
                    <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="[% order.quantityreceived | html %]" />
315
                [% END %]
315
                [% END %]
Lines 370-376 Link Here
370
        </li>
370
        </li>
371
        <li id="select_currency">
371
        <li id="select_currency">
372
            <label for="unitprice_currency"></label>
372
            <label for="unitprice_currency"></label>
373
            <input type="text" size="20" name="unitprice" id="unitprice_currency" value="" />
373
            <input type="text" size="20" name="unitprice_currency" id="unitprice_currency" value="" />
374
            [% IF currencies.count %]
374
            [% IF currencies.count %]
375
                <select name="currency">
375
                <select name="currency">
376
                    <option value="[% active_currency.rate | html %]" selected="selected">[% active_currency.currency | html %] ([% active_currency.symbol | html %])</option>
376
                    <option value="[% active_currency.rate | html %]" selected="selected">[% active_currency.currency | html %] ([% active_currency.symbol | html %])</option>
Lines 392-397 Link Here
392
        <input type="submit"  value="Save" class="button" accesskey="w" />
392
        <input type="submit"  value="Save" class="button" accesskey="w" />
393
        <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Cancel</a>
393
        <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Cancel</a>
394
</fieldset></div>    </form>
394
</fieldset></div>    </form>
395
[% ELSIF multiple_orders %]
396
    <table id="multiple_orders" class="table table-bordered table-striped">
397
        <thead>
398
            <tr>
399
                <th>Order</td>
400
                <th>Title</th>
401
                <th>Author</th>
402
                <th>ISBN</th>
403
                <th>Date received</th>
404
                <th>Fund</th>
405
                <th>Quantity</th>
406
                <th>&nbsp;</th>
407
            </tr>
408
        </thead>
409
    </table>
410
411
    <div class="col">
412
        <fieldset class="action">
413
            <button class="save">Save</button>
414
            <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1">Return</a>
415
        </fieldset>
416
        <div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
417
        <div id="jobfailed"></div>
418
    </div>
419
420
    <div class="modal fade" id="order_edit" tabindex="-1" role="dialog" aria-labelledby="Order edit">
421
        <div class="modal-dialog" role="document">
422
            <div class="modal-content modal-lg">
423
                <div class="modal-header row">
424
                    <h4 class="col-md-11 modal-title"></h4>
425
                    <button type="button" class="close col-md-1" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
426
                </div>
427
                <div class="modal-body">
428
                    <div class="hide" id="loading">Loading ...</div>
429
                    <div id="modal-order-main">
430
                        <ul>
431
                            <li><a href="#info-panel">Info</a></li>
432
                            <li><a href="#accounting-panel">Accounting</a></li>
433
                            <li><a href="#history-panel">Receipt history</a></li>
434
                            <li><a href="#items-panel">Items</a></li>
435
                        </ul>
436
437
438
                        <div id="info-panel">
439
                            <div>
440
                                <h4>Catalog details</h4>
441
442
                                <div class="row"> <span class="lbl col-sm-4">Title: </span><span class="col-sm-8" id="biblio_title"></span></div>
443
                                <div class="row"> <span class="lbl col-sm-4">Author: </span><span class="col-sm-8" id="biblio_author"></span></div>
444
                                <div class="row"> <span class="lbl col-sm-4">Copyright: </span><span class="col-sm-8" id="biblio_copyright_date"></span></div>
445
                                <div class="row"> <span class="lbl col-sm-4">ISBN: </span><span class="col-sm-8" id="biblio_isbn"></span></div>
446
                                <div class="row"> <span class="lbl col-sm-4">Series: </span><span class="col-sm-8" id="biblio_series_title"></span></div>
447
448
                            </div>
449
                            <div id="suggestion_fieldset">
450
                                <h4>Suggestion</h4>
451
                                <div class="row">
452
                                    <span class="lbl col-sm-4">Suggested by: </span> <span class="col-sm-8" id="biblio_suggestion_suggester"></span>
453
                                </div>
454
                                <div class="row" id="suggestion_reason">
455
                                    <span class="lbl col-sm-4">Reason:</span>
456
                                    <div class="col-sm-8">
457
                                        [% SET suggestion_reasons = AuthorisedValues.GetAuthValueDropbox( 'SUGGEST' ) %]
458
                                        <select class="select-reason" id="reason" name="reason">
459
                                            <option value=""> -- Choose a reason -- </option>
460
                                            [% FOREACH reason IN suggestion_reasons %]
461
                                            <option value="[% reason.lib | html %]">[% reason.lib | html %]</option>
462
                                            [% END %]
463
                                            <option value="other">Others...</option>
464
                                        </select>
465
466
                                        <span id="other_reason" name="other_reason">
467
                                            <input type="text" size="31" id="select-other_reason" name="other_reason" placeholder="please note your reason here..." />
468
                                            <a href="#back">Cancel</a>
469
                                        </span>
470
                                    </div>
471
                                </div>
472
                            </div>
473
                        </div>
474
                        <div id="history-panel">
475
                            <div id="child_orders">
476
                                <h4>Receipt history for this subscription</h4>
477
                                <table id="child_orders_table">
478
                                    <thead>
479
                                        <tr>
480
                                            <th>Invoice</th>
481
                                            <th>Order number</th>
482
                                            <th class="title-string">Creation date</th>
483
                                            <th class="title-string">Receive date</th>
484
                                            <th>Quantity received</th>
485
                                            <th class="title-string">Status</th>
486
                                            <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
487
                                            <th>Internal note</th>
488
                                        </tr>
489
                                    </thead>
490
                                </table>
491
                            </div>
492
                        </div>
493
                        <div id="items-panel">
494
                            <div id="acq-create-receiving">
495
                                <div id="items_list" style="display: none">
496
                                    <h4>Items list</h4>
497
                                    <div style="width:100%;overflow:auto;">
498
                                        <table>
499
                                            <thead>
500
                                                <tr>
501
                                                    <th>Actions</th>
502
                                                    <th>Barcode</th>
503
                                                    <th>Home library</th>
504
                                                    <th>Holding library</th>
505
                                                    <th>Not for loan</th>
506
                                                    <th>Restricted</th>
507
                                                    <th>Location</th>
508
                                                    <th>Call number</th>
509
                                                    <th>Copy number</th>
510
                                                    <th>Inventory number</th>
511
                                                    <th>Collection</th>
512
                                                    <th>Item type</th>
513
                                                    <th>Materials</th>
514
                                                    <th>Notes</th>
515
                                                </tr>
516
                                            </thead>
517
                                            <tbody>
518
                                            </tbody>
519
                                        </table>
520
                                    </div>
521
                                </div>
522
523
                                <div id="itemfieldset">
524
                                    <h4>Item</h4>
525
                                    [% IF ( NoACQframework ) %]
526
                                        <p class="required">
527
                                            No ACQ framework, using default. You should create a
528
                                            framework with code ACQ, the items framework would be
529
                                            used
530
                                        </p>
531
                                    [% END %]
532
                                    <div id="outeritemblock"></div>
533
                                </div>
534
                            </div>
535
                            <div id="acq-create-ordering">
536
                                <h4>Items</h4>
537
                                <div style="width:100%;overflow:auto">
538
                                    <table>
539
                                        <thead>
540
                                            <tr>
541
                                                <th>Receive?</th>
542
                                                <th>&nbsp;</th>
543
                                                <th>Barcode</th>
544
                                                <th>Home library</th>
545
                                                <th>Current library</th>
546
                                                <th>Not for loan</th>
547
                                                <th>Restricted</th>
548
                                                <th>Location</th>
549
                                                <th>Call number</th>
550
                                                <th>Copy number</th>
551
                                                <th>Inventory number</th>
552
                                                <th>Collection</th>
553
                                                <th>Item type</th>
554
                                                <th>Materials</th>
555
                                                <th>Notes</th>
556
                                            </tr>
557
                                        </thead>
558
                                        <tbody>
559
                                        </tbody>
560
                                    </table>
561
                                </div>
562
                            </div>
563
                        </div>
564
                        <div id="accounting-panel">
565
                            <h4>Accounting details</h4>
566
                            <ol>
567
                                <li>
568
                                    <label for="datereceived">Date received: </label>
569
                                    <input type="text" size="10" id="datereceived" name="datereceived" class="datepicker" />
570
                                </li>
571
                                <li>
572
                                    <label for="bookfund">Fund: </label>
573
                                    <select id="bookfund" name="bookfund">
574
                                        <option value=""></option>
575
                                        [% FOREACH period IN budget_loop %]
576
                                        <optgroup label="[% period.description | html %]">
577
                                        [% FOREACH fund IN period.funds %]
578
                                            <option value="[% fund.b_id | html %]">[% fund.b_txt | html %]</option>
579
                                        [% END %]
580
                                        </optgroup>
581
                                        [% END %]
582
                                    </select>
583
                                </li>
584
                                <li>
585
                                    <label>&nbsp;</label>
586
                                    <span id="current-fund"></span>
587
                                </li>
588
                                <li>
589
                                    <label for="creator">Ordered by: </label>
590
                                    <span id="creator"></span>
591
                                </li>
592
                                <li>
593
                                    <label for="quantity_to_receive">Quantity ordered: </label>
594
                                    <input type="text" readonly="readonly" id="quantity_to_receive" name="quantity" />
595
                                </li>
596
                                <li>
597
                                    <label for="quantity">Quantity received: </label>
598
                                    <input type="text" size="20" name="quantityrec" id="quantity" />
599
                                    <div id="qtyrecerror" style="display:none">
600
                                        <p class="error">Warning, you have entered more items than expected.
601
                                        Items will not be created.</p>
602
                                    </div>
603
                                </li>
604
605
                                [% IF ( gst_values ) %]
606
                                <li>
607
                                    <label for="tax_rate">Tax rate: </label>
608
                                    <select name="tax_rate" id="tax_rate">
609
                                    [% FOREACH gst IN gst_values %]
610
                                        <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
611
                                    [% END %]
612
                                    </select>
613
                                </li>
614
                                [% END %]
615
616
                                <li>
617
                                    <label for="rrp">Retail price: </label>
618
                                    <span id="rrp"></span>
619
                                <li>
620
                                    <label for="replacementprice">Replacement price:</label>
621
                                    <input type="text" size="20" name="replacementprice" id="replacementprice" />
622
                                </li>
623
                                <li>
624
                                    <label for="ecost">Budgeted cost: </label>
625
                                    <span id="ecost"></span>
626
                                </li>
627
                                <li>
628
                                    <label for="unitprice">Actual cost:</label>
629
                                    <input type="text" size="20" name="unitprice" id="unitprice" />
630
                                    <span id="unitprice_hint" class="hint"></span>
631
                                    <label style="font-weight: inherit; float:none;"><input type="checkbox" name="change_currency">Change currency</label>
632
                                </li>
633
                                <li id="select_currency">
634
                                    <label for="unitprice_currency"></label>
635
                                    <input type="text" size="20" name="unitprice_currency" id="unitprice_currency" value="" />
636
                                    [% IF currencies.count %]
637
                                    <select name="currency">
638
                                        <option value="[% active_currency.rate | html %]" selected="selected">[% active_currency.currency | html %] ([% active_currency.symbol | html %])</option>
639
                                        [% FOR currency IN currencies %]
640
                                        <option value="[% currency.rate | html %]">[% currency.currency | html %] ([% currency.symbol | html %])</option>
641
                                        [% END %]
642
                                    </select>
643
                                    [% END %]
644
                                </li>
645
                                <li>
646
                                    <label for="order_internalnote">Internal note: </label>
647
                                    <textarea name="order_internalnote" id="order_internalnote" width="40" rows="8" ></textarea>
648
                                </li>
649
                                <li>
650
                                    <label for="order_vendornote">Vendor note: </label>
651
                                    <span id="order_vendornote"></span>
652
                                </li>
653
                            </ol>
654
                        </div>
655
                    </div>
656
                </div>
657
                <div class="modal-footer">
658
                    <button type="button" class="btn btn-defualt modal-prev">Previous</button>
659
                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
660
                    <button type="button" class="btn btn-primary modal-save">Save changes</button>
661
                    <button type="button" class="btn btn-defualt modal-next">Next</button>
662
                </div>
663
            </div>
664
        </div>
665
    </div>
395
[% ELSE %]
666
[% ELSE %]
396
    This ordernumber does not exist.
667
    This ordernumber does not exist.
397
[% END %]
668
[% END %]
Lines 407-416 Link Here
407
</div> <!-- /.row -->
678
</div> <!-- /.row -->
408
[% MACRO jsinclude BLOCK %]
679
[% MACRO jsinclude BLOCK %]
409
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
680
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
410
[% INCLUDE 'calendar.inc' %]
681
    [% INCLUDE 'calendar.inc' %]
411
    [% Asset.js("js/additem.js") | $raw %]
682
    [% Asset.js("js/additem.js") | $raw %]
412
    [% Asset.js("js/cataloging.js") | $raw %]
683
    [% Asset.js("js/cataloging.js") | $raw %]
684
    [% INCLUDE 'datatables.inc' %]
685
    [% INCLUDE 'js-date-format.inc' %]
686
    [% INCLUDE 'format_price.inc' %]
687
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
688
    <style>
689
        .lbl {
690
            font-weight: 700;
691
            text-align: right;
692
        }
693
        .modal-body ol {
694
            list-style-type: none;
695
        }
696
697
        .modal-body ol li {
698
            list-style-type: none;
699
            padding-bottom: 1em;
700
            width: 100%;
701
        }
702
703
        .modal-body h4 {
704
            margin-left: 1em;
705
            padding: .2em .5em;
706
            margin-bottom: 17px;
707
        }
708
709
        .modal-body label {
710
            margin-right: 1em;
711
            text-align: right;
712
            width: 11em;
713
            display: inline-block;
714
            font-weight: 700;
715
        }
716
717
        .modal-body textarea {
718
            vertical-align: text-top;
719
        }
720
    </style>
413
    <script>
721
    <script>
722
        [% IF order %]
414
        function Check(form) {
723
        function Check(form) {
415
            [% IF (AcqCreateItem == 'receiving') %]
724
            [% IF (AcqCreateItem == 'receiving') %]
416
                var total_errors = CheckMandatorySubfields(form);
725
                var total_errors = CheckMandatorySubfields(form);
Lines 561-566 Link Here
561
            });
870
            });
562
871
563
        });
872
        });
873
        [% ELSIF multiple_orders %]
874
875
        var _build_item = function(item, tr) {
876
            var chb = $('<input type="checkbox" name="items_to_receive" value="'+item.item_id+'" />')
877
                .prop('checked', item._checked)
878
                .change(function() {
879
                    item._checked = $(this).prop('checked');
880
                });
881
            tr.append($('<td style="text-align:center"></td>').append(chb));
882
            tr.append('<td><a style="cursor:pointer" onclick="PopupEditPage('+item.biblio_id+', '+item.item_id+');">'+EDIT[0].toUpperCase()+EDIT.substr(1).toLowerCase()+'</a></td>');
883
            tr.append('<td>'+(item.external_id||'')+'</td>');
884
            tr.append('<td>'+(item.home_branch && item.home_branch.name||'')+'</td>');
885
            tr.append('<td>'+(item.holding_branch && item.holding_branch.name||'')+'</td>');
886
            tr.append('<td>'+(item._authorised_values.not_for_loan_status && item._authorised_values.not_for_loan_status.lib||'')+'</td>');
887
            tr.append('<td>'+(item._authorised_values.restricted_status && item._authorised_values.restricted_status.lib||'')+'</td>');
888
            tr.append('<td><span class="shelvingloc">'+(item._authorised_values.location && item._authorised_values.location.lib||'')+'</span></td>');
889
            tr.append('<td>'+(item.callnumber||'')+'</td>');
890
            tr.append('<td>'+(item.copy_number||'')+'</td>');
891
            tr.append('<td>'+(item.inventory_number||'')+'</td>');
892
            tr.append('<td>'+(item._authorised_values.collection_code && item._authorised_values.collection_code.lib||'')+'</td>');
893
            tr.append('<td>'+(item.itemtype && item.itemtype.description || '')+'</td>');
894
            tr.append('<td>'+(item._authorised_values.materials_notes && item._authorised_values.materials_notes.lib||'')+'</td>')
895
            tr.append('<td>'+(item.public_notes||'')+'</td>');
896
        };
897
898
        var items_columns = [null, null, 'external_id', 'home_library_id',
899
                'holding_library_id', 'not_for_loan_status', 'restricted_status', 'location',
900
                'callnumber', 'copy_number', 'inventory_number', 'collection_code',
901
                'item_type', 'materials_notes', 'public_notes'];
902
903
        function PopupEditPage(biblionumber, itemnumber) {
904
            var url = "/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber="
905
                + biblionumber + "&itemnumber=" + itemnumber + "&popup=1#edititem";
906
            var w = window.open(url);
907
            var watchClose = setInterval(function() {
908
                if (w.closed) {
909
                    clearTimeout(watchClose);
910
                    $.ajax({
911
                        dataType: "json",
912
                        headers: {
913
                            "x-koha-embed": "home_branch,holding_branch,itemtype",
914
                            "x-koha-av": "1"
915
                        },
916
                        url: '/api/v1/items/'+itemnumber,
917
                        success: function(item) {
918
                            var tr = $("#item_"+itemnumber);
919
                            tr.html('');
920
                            _build_item(item, tr);
921
                        }
922
                    });
923
                }
924
            }, 500);
925
        }
926
927
        var periods={};
928
        var funds={};
929
        var funds_tree = [];
930
931
        var QTY_TOTAL = _("Receiving %0$s out of %1$s");
932
        var EDIT = _("edit");
933
        var MOD_TITLE = _("Edit %s");
934
        var SUGGESTION = _("suggestion #%s");
935
        var FUND_KEEP = _("Keep current (%0$s - %1$s)");
936
        var FUNC_CUR = _("(Current: %0$s - %1$s)");
937
        var ADJ_TAX_INC = _("(adjusted for %s, tax inclusive)");
938
        var ADJ_TAX_EXC = _("(adjusted for %s, tax exclusive)");
939
        var TAX_INC = _("(tax inclusive)");
940
        var TAX_EXC = _("(tax exclusive)");
941
        var SAVE_WARNING = _("Order %s: Warning, you have entered more items than expected. Items will not be created.");
942
        var SAVE_WARNING_NO_ITEMS = _("Order %s: No quantity to receive set. No items will be created.");
943
        var SAVE_ERROR = _("Order %s: An error occurred while saving");
944
945
946
        var CAN_user_acquisition = "[% CAN_user_acquisition | html %]";
947
        var AcqCreateItem = "[% Koha.Preference('AcqCreateItem') | html %]";
948
        var edit_mode = "[% edit | html %]";
949
        var invoiceincgst = "[% invoiceincgst | html %]";
950
        var active_currency = "[% active_currency.currency | html %]";
951
        var invoice_id = "[% invoiceid | html %]";
952
953
        $(document).ready(function(){
954
            var base_query = { "order_id": {"in": [[% multiple_orders | html %]]}};
955
            var pending_orders_url = "/api/v1/acquisitions/orders?only_active=1";
956
            var options = {
957
                "ajax": {
958
                    "url": pending_orders_url + "&q=" + encodeURI(JSON.stringify(base_query)),
959
                    "headers": {
960
                        'x-koha-av': '1'
961
                    }
962
                },
963
                "header_filter": true,
964
                "embed": [
965
                    "basket",
966
                    "biblio.suggestions.suggester",
967
                    "fund.budget",
968
                    "items.home_branch",
969
                    "items.holding_branch",
970
                    "items.itemtype",
971
                    "creator"
972
                ],
973
                'dom': 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
974
                "columns": [
975
                    {
976
                        "data": "order_id",
977
                        "searchable": true,
978
                        "orderable": true
979
                    },
980
                    {
981
                        "data": "biblio.title",
982
                        "searchable": true,
983
                        "orderable": true,
984
                        "render": function(data, type, row, meta) {
985
                            if ( data == null ) {
986
                                return "";
987
                            }
988
                            else {
989
                                return data;
990
                            }
991
                        }
992
                    },
993
                    {
994
                        "data": "biblio.author",
995
                        "searchable": true,
996
                        "orderable": true,
997
                        "render": function(data, type, row, meta) {
998
                            if ( data == null ) {
999
                                return "";
1000
                            }
1001
                            else {
1002
                                return data;
1003
                            }
1004
                        }
1005
                    },
1006
                    {
1007
                        "data": "biblio.isbn",
1008
                        "searchable": true,
1009
                        "orderable": true,
1010
                        "render": function(data, type, row, meta) {
1011
                            if ( data == null ) {
1012
                                return "";
1013
                            }
1014
                            else {
1015
                                return data;
1016
                            }
1017
                        }
1018
                    },
1019
                    {
1020
                        "searchable": false,
1021
                        "orderable": false,
1022
                        "data": function(row, type, val, meta) {
1023
                            return $date(row.date_received||new Date().toISOString());
1024
                        }
1025
                    },
1026
                    {
1027
                        "data": "fund.name",
1028
                        "searchable": true,
1029
                        "orderable": false,
1030
                        "render": function(data, type, row, meta) {
1031
                            return row.fund.budget.budget_period_description+" - "+row.fund.name;
1032
                        }
1033
                    },
1034
                    {
1035
                        "searchable": false,
1036
                        "orderable": true,
1037
                        "data": "quantity_received",
1038
                        "render": function(data, type, row, meta) {
1039
                            return QTY_TOTAL.format(row.subscription_id?row.quantity:row.quantity_received, row.quantity);
1040
                        }
1041
                    },
1042
                    {
1043
                        "searchable": false,
1044
                        "orderable": false,
1045
                        "render": function(data, type, row, meta) {
1046
                            return '<a data-toggle="modal" href="#order_edit" data-row="'+meta.row+'" class="order_edit_toggle">'+EDIT+'</a>';
1047
                        }
1048
                    }
1049
                ]
1050
            };
1051
            var orders_table = $("#multiple_orders").api(options);
1052
            var api = orders_table.api();
1053
1054
            api.on('preDraw', function() {
1055
                var saved = $("#order_edit").data('saved');
1056
                if(saved) {
1057
                    var data = api.data();
1058
                    for(var i = 0; i<data.length; i++) {
1059
                        var row = data[i];
1060
                        var srow = saved[row.order_id];
1061
                        if(srow) {
1062
                            if(row.fund_id != srow.fund_id) {
1063
                                row.fund.budget.budget_period_description = $("#bookfund option[value="+srow.fund_id+"]").parent().attr('label');
1064
                                row.fund.name = $("#bookfund option[value="+srow.fund_id+"]").html();
1065
                            }
1066
                            row.date_received = srow.date_received;
1067
                            row.quantity = srow.quantity;
1068
                            row.quantity_received = srow.quantity_received;
1069
                        }
1070
                    }
1071
                }
1072
            });
1073
1074
            var _doSave = function(params) {
1075
                $.ajax($.extend({
1076
                    method: 'POST',
1077
                    url: '/cgi-bin/koha/acqui/finishreceive.pl'
1078
                }, params));
1079
            };
1080
1081
            var _set_error = function(error) {
1082
                if($('#jobfailed').html() == '') $('#jobfailed').append('<ul/>');
1083
                $('#jobfailed ul').append('<li>'+error+'</li>');
1084
            };
1085
1086
            var _transform_row = function(row, origrec) {
1087
                var params = {};
1088
                params['biblionumber'] = row.biblio_id;
1089
                params['invoiceid'] = invoice_id;
1090
                params['ordernumber'] = row.order_id;
1091
                params['booksellerid'] = row.basket.vendor_id;
1092
1093
                if(row.biblio.suggestions.length && row.biblio.suggestions[0].reason) {
1094
                    params["suggestionid"] = row.biblio.suggestions[0].suggestion_id;
1095
                    if($("#reason option[value='"+row.biblio.suggestions[0].reason+"']").length) {
1096
                        params['reason'] =  row.biblio.suggestions[0].reason;
1097
                    } else {
1098
                        params['reason'] = 'other';
1099
                        params['other_reason'] = row.biblio.suggestions[0].reason;
1100
                    }
1101
                }
1102
                params['datereceived'] = row.date_received;
1103
                params['bookfund'] = row.fund_id;
1104
                params['quantity'] = row.quantity;
1105
                params['quantityrec'] = row.quantity_received;
1106
                params['origquantityrec'] = origrec;
1107
                var effective_create_items = row.basket.create_items || AcqCreateItem;
1108
                params['tax_rate'] = (effective_create_items == 'receiving')?row.tax_rate_on_receiving:row.tax_rate_on_ordering;
1109
                params['replacementprice'] = row.replacement_price;
1110
                params['unitprice'] = invoiceincgst=="1"?row.unit_price_tax_included:row.unit_price_tax_excluded;
1111
                params['order_internalnote'] = row.internal_note;
1112
                if(effective_create_items == 'receiving') {
1113
                    Object.keys(row.items).forEach(function(key) {
1114
                        var item = row.items[key];
1115
                        Object.keys(item).forEach(function(key) {
1116
                            var field = item[key];
1117
                            Object.keys(field).forEach(function(key) {
1118
                                if(!params[key]) params[key] = [];
1119
                                params[key].push(item[key]);
1120
                            });
1121
                        });
1122
                    });
1123
                } else if(effective_create_items == 'ordering') {
1124
                    params['items_to_receive'] = (row.items||[])
1125
                        .filter(function(item) {
1126
                            return item._checked
1127
                        })
1128
                        .map(function(item) {
1129
                            item.item_id;
1130
                        })
1131
                }
1132
                return params;
1133
            };
1134
1135
            $('.save').click(function() {
1136
                var data = $("#order_edit").data();
1137
                var rows = api.rows().data();
1138
                $('this').prop('disabled', true);
1139
                var redirect = true;
1140
                if(rows.length) {
1141
                    $('#jobfailed, #jobpanel, #jobstatus').show();
1142
1143
                    var loopRows = function(i) {
1144
                        var row = rows[i];
1145
                        if(!row) {
1146
                            if(redirect) {
1147
                                location.href = "/cgi-bin/koha/acqui/parcel.pl?invoiceid="+invoice_id
1148
                            }
1149
                            return;
1150
                        }
1151
                        if(data.saved && data.saved[row.order_id]) {
1152
                            row = data.saved[row.order_id];
1153
                            var origrec = data.origrec[row.order_id];
1154
                        } else {
1155
                            var origrec = row.quantity_received;
1156
                        }
1157
                        if(row.subscription_id) row.quantity_received = row.quantity;
1158
                        var _set_percentage = function() {
1159
                            var percentage = Math.round(( (i+1) / rows.length) * 100);
1160
                            var bgproperty = (parseInt(percentage*2)-300)+"px 0px";
1161
                            $("#jobprogress").css("background-position",bgproperty);
1162
                            $("#jobprogresspercent").text(percentage);
1163
                        }
1164
                        if(row.quantity_received > row.quantity) {
1165
                            _set_error(SAVE_WARNING.format(row.order_id));
1166
                            row.quantity_received = row.quantity;
1167
                        }
1168
                        if(row.quantity_received == '0') {
1169
                            _set_error(SAVE_WARNING_NO_ITEMS.format(row.order_id));
1170
                        }
1171
                        _doSave({
1172
                            data: _transform_row(row, origrec),
1173
                            success: function() {
1174
                                _set_percentage();
1175
                                loopRows(i+1);
1176
                            },
1177
                            error: function() {
1178
                                _set_percentage()
1179
                                _set_error(SAVE_ERROR.format(row.order_id));
1180
                                redirect = false;
1181
                                loopRows(i+1);
1182
                            }
1183
                        });
1184
                    };
1185
                    loopRows(0)
1186
                }
1187
            });
1188
1189
            $("#order_edit").on("change", "#reason", function() {
1190
                var val = $(this).val();
1191
                var row = $("#order_edit").data('row');
1192
                if(val == 'other') {
1193
                    $("#other_reason").show();
1194
                    $(this).hide();
1195
                } else {
1196
                    row.biblio.suggestions[0].reason = val;
1197
                }
1198
            });
1199
1200
            $("#order_edit").on("change", "#select-other_reason", function() {
1201
                var val = $(this).val();
1202
                var row = $("#order_edit").data('row');
1203
                row.biblio.suggestions[0].reason = val;
1204
            });
1205
1206
            $("#order_edit").on("click", "#other_reason a", function() {
1207
                $("#other_reason").hide();
1208
                $("#reason").val(null).show();
1209
            });
1210
1211
            $("#order_edit").on("change", "#datereceived", function() {
1212
                var val = $(this).val();
1213
                var row = $("#order_edit").data('row');
1214
                row.date_received = val;
1215
            });
1216
1217
            $("#order_edit").on("change", "#bookfund", function() {
1218
                var val = $(this).val();
1219
                var row = $("#order_edit").data('row');
1220
                row.fund_id = val;
1221
            });
1222
1223
            $("#order_edit").on("change", "#quantity_to_receive", function() {
1224
                var val = $(this).val();
1225
                var row = $("#order_edit").data('row');
1226
                row.quantity = val;
1227
                if(row.subscription_id) {
1228
                    $("#quantity").val(val).change();
1229
                }
1230
            });
1231
1232
            $("#order_edit").on("change", "#quantity", function() {
1233
                var val = $(this).val();
1234
                var row = $("#order_edit").data('row');
1235
                row.quantity_received = val;
1236
                var qtyto = parseInt($("#quantity_to_receive").val());
1237
                if(parseInt(val) > qtyto) {
1238
                    $("#qtyrecerror").show();
1239
                } else {
1240
                    $("#qtyrecerror").hide();
1241
                }
1242
                $("input[name='items_to_receive']").each(function() {
1243
                    $(this).prop('checked', false).change();
1244
                });
1245
                $("input[name='items_to_receive']:lt("+val+")").each(function () {
1246
                    $(this).prop('checked', true).change();
1247
                });
1248
            });
1249
1250
            $("#order_edit").on("change", "input[name='items_to_receive']", function() {
1251
                var qty = $("input[name='items_to_receive']:checked").length;
1252
                $("#quantity").val(qty);
1253
                var row = $("#order_edit").data('row');
1254
                row.quantity_received = qty;
1255
            })
1256
1257
            $("#order_edit").on("change", "#tax_rate", function() {
1258
                var val = $(this).val();
1259
                if(val === null) $(this).val($('option:first-child', this).attr('value'));
1260
                val = $(this).val();
1261
                var row = $("#order_edit").data('row');
1262
                var effective_create_items = row.basket.create_items || AcqCreateItem;
1263
                if(effective_create_items == 'receiving') {
1264
                    row.tax_rate_on_receiving = val;
1265
                } else {
1266
                    row.tax_rate_on_ordering = val;
1267
                }
1268
1269
            });
1270
1271
            $("#order_edit").on("change", "#unitprice", function() {
1272
                var val = $(this).val();
1273
                var row = $("#order_edit").data('row');
1274
                if(invoiceincgst == "1") {
1275
                    row.unit_price_tax_included = val;
1276
                } else {
1277
                    row.unit_price_tax_excluded = val;
1278
                }
1279
1280
            });
1281
1282
            $("#order_edit").on("change", "input[name='change_currency']", function(){
1283
                if ( $(this).is(":checked") ) {
1284
                    $("#select_currency").show();
1285
                    $("#unitprice").prop("readonly", "true");
1286
                } else {
1287
                    $("#select_currency").hide();
1288
                    $("#unitprice").prop("readonly", "");
1289
                }
1290
            });
1291
1292
            function _update_unitprice() {
1293
                var rate = Number($("select[name='currency'] option:selected").val());
1294
                var unitprice = $("#unitprice_currency").val();
1295
                var new_unitprice = Number( unitprice * rate ).toFixed(2);
1296
                $("#unitprice").val(new_unitprice).change();
1297
            }
1298
            $("#order_edit").on("change", "select[name='currency']", _update_unitprice );
1299
            $("#order_edit").on("change", "#unitprice_currency", _update_unitprice );
1300
1301
            $("#order_edit").on("change", "#replacementprice", function() {
1302
                var val = $(this).val();
1303
                var row = $("#order_edit").data('row');
1304
                row.replacement_price = val;
1305
            });
1306
1307
            $("#order_edit").on("change", "#order_internalnote", function() {
1308
                var val = $(this).val();
1309
                var row = $("#order_edit").data('row');
1310
                row.internal_note = val;
1311
1312
            });
1313
1314
            var keep_row = function() {
1315
                var row = $("#order_edit").data('row');
1316
                var kept = $("#order_edit").data('kept')||{};
1317
                if($('#items_list tbody tr').length) {
1318
                    row.items = [];
1319
                    $('#items_list tbody tr').each(function() {
1320
                        var item = {};
1321
                        $('#'+$(this).attr('idblock')).find('*[name=kohafield]').each(function() {
1322
                            var kf = $(this).val();
1323
                            var obj = {};
1324
                            $(this).parent().find('*[name]').each(function() {
1325
                                obj[$(this).prop('name')] = $(this).val();
1326
                            });
1327
                            item[kf] = obj;
1328
                        });
1329
                        row.items.push(item);
1330
                    });
1331
                }
1332
                kept[row.order_id] = row;
1333
                $("#order_edit").data('kept', kept);
1334
            };
1335
1336
            var save_row = function() {
1337
                keep_row();
1338
                var saved = $("#order_edit").data('saved')||{};
1339
                var kept = $("#order_edit").data('kept');
1340
                $("#order_edit").data('saved', $.extend(saved, kept));
1341
                api.draw();
1342
            }
1343
1344
            var set_modal_buttons = function() {
1345
                var n = $("#order_edit").data('n');
1346
                var info = api.page.info();
1347
1348
                $('.modal-prev').prop('disabled', info.page == 0 && n == 0);
1349
                $('.modal-next').prop('disabled', info.pages - 1 == info.page && info.end - info.start - 1 == n);
1350
            };
1351
1352
            var show_subs = function(row) {
1353
                //$("#child_orders").show();
1354
                var had_rows = false;
1355
                var base_query = { "subscription_id": row.subscription_id, "parent_order_id": row.order_id, "order_id": {"!=": row.order_id}};
1356
                var pending_orders_url = "/api/v1/acquisitions/orders";
1357
                var options = {
1358
                    "ajax": {
1359
                        "url": pending_orders_url + "?q=" + encodeURI(JSON.stringify(base_query))
1360
                    },
1361
                    "header_filter": true,
1362
                    "embed": [
1363
                        "invoice",
1364
                        "basket"
1365
                    ],
1366
                    "order": [[1, 'asc']],
1367
                    'dom': 'C<"top pager"ilpfB>tr<"bottom pager"ip>',
1368
                    "columns": [
1369
                        {
1370
                            "searchable": false,
1371
                            "orderable": false,
1372
                            "data": function(row, type, val, meta) {
1373
                                if(row.invoice) {
1374
                                    if(CAN_user_acquisition) {
1375
                                        return '<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid='+row.invoice_id+'" title="Invoice detail page">'+row.invoice.invoice_number+"</a>";
1376
                                    }
1377
                                    return row.invoice.invoice_number;
1378
                                }
1379
                            }
1380
                        },
1381
                        {
1382
                            "data": "order_id",
1383
                            "searchable": false,
1384
                            "orderable": false
1385
                        },
1386
                        {
1387
                            "searchable": false,
1388
                            "orderable": false,
1389
                            "data": "basket.creation_date",
1390
                            "render": function(data, type, row, meta) {
1391
                                return $date(row.basket.creation_date);
1392
                            }
1393
                        },
1394
                        {
1395
                            "searchable": false,
1396
                            "orderable": false,
1397
                            "data": function(row, type, val, meta) {
1398
                                return $date(row.date_received);
1399
                            }
1400
                        },
1401
                        {
1402
                            "searchable": false,
1403
                            "orderable": false,
1404
                            "data": function(row, type, val, meta) {
1405
                                return row.quantity_received;
1406
                            }
1407
                        },
1408
                        {
1409
                            "searchable": false,
1410
                            "orderable": true,
1411
                            "data": function(row, type, val, meta) {
1412
                                if(!row.status) return;
1413
                                var first_letter = row.status[0].toUpperCase();
1414
                                return first_letter+row.status.substr(1).toLowerCase();
1415
                            }
1416
                        },
1417
                        {
1418
                            "searchable": false,
1419
                            "orderable": false,
1420
                            "data": function(row, type, val, meta) {
1421
                                if(!row.date_received) return;
1422
                                return Number(row.unit_price_tax_excluded * row.quantity_received).format_price()+' / '+Number(row.unit_price_tax_included * row.quantity_received).format_price()
1423
                            }
1424
                        },
1425
                        {
1426
                            "searchable": false,
1427
                            "orderable": false,
1428
                            "data": function(row, type, val, meta) {
1429
                                return row.internal_note;
1430
                            }
1431
                        }
1432
                    ]
1433
                };
1434
                var child_orders_table = $("#child_orders_table").api(options);
1435
                var child_api = child_orders_table.api();
1436
                child_api.on('preDraw', function() {
1437
                    if(!child_api.data().length && !had_rows) return;
1438
                    $("#child_orders").show();
1439
                    had_rows = true;
1440
                });
1441
            };
1442
1443
            var set_editor = function() {
1444
                var modal = $("#order_edit");
1445
                var row = modal.data('row');
1446
                var origrec = $("#order_edit").data('origrec')||{};
1447
                if(!origrec.hasOwnProperty(row.order_id)) {
1448
                    origrec[row.order_id] = row.quantity_received;
1449
                    $("#order_edit").data('origrec', origrec);
1450
                }
1451
                if(row.subscription_id) {
1452
                    row.quantity_received = row.quantity;
1453
                }
1454
                var keep = $("#order_edit").data('kept');
1455
                if(keep && keep[row.order_id]) {
1456
                    row = keep[row.order_id];
1457
                    modal.data('row', row);
1458
                }
1459
                $('input, select, textarea', '.modal-body').val(null)
1460
                modal.find(".modal-title").text(MOD_TITLE.format(row.biblio.title));
1461
                ["title", "author", "copyright_date", "isbn", "series_title"].forEach(function(key){
1462
                    var o = modal.find(".modal-body #biblio_"+key);
1463
                    if(row.biblio[key] !== null) {
1464
                        o.parent().show();
1465
                        o.html(row.biblio[key]);
1466
                    } else {
1467
                        o.parent().hide();
1468
                    }
1469
                });
1470
                if(row.biblio.suggestions.length) {
1471
                    $("#suggestion_fieldset").show();
1472
                    if(row.biblio.suggestions[0].suggester) {
1473
                        $("#biblio_suggestion_suggester").parent().show();
1474
                        $("#biblio_suggestion_suggester")
1475
                            .html(
1476
                                [row.biblio.suggestions[0].suggester.surname, row.biblio.suggestions[0].suggester.firstname]
1477
                                    .filter(function(name){
1478
                                        return name
1479
                                    })
1480
                                    .join(', ')+' (<a href="http://localhost:8081/cgi-bin/koha/suggestion/suggestion.pl?suggestionid='+row.biblio.suggestions[0].suggestionid+'&op=show">'+SUGGESTION.format(row.biblio.suggestions[0].suggestionid)+'</a>)'
1481
                            );
1482
                    } else {
1483
                        $("#biblio_suggestion_suggester").parent().hide();
1484
                    }
1485
                    if(row.biblio.suggestions[0].reason) {
1486
                        $("#suggestion_reason").show();
1487
                        if($("#reason option[value='"+row.biblio.suggestions[0].reason+"']").length) {
1488
                             $("#other_reason a").click();
1489
                            $("#reason").val(row.biblio.suggestions[0].reason);
1490
                            $("#select-other_reason").val(null);
1491
                        } else {
1492
                            $("#reason").val("other").change();
1493
                            $("#select-other_reason").val(row.biblio.suggestions[0].reason);
1494
                        }
1495
1496
                    } else {
1497
                        $("#suggestion_reason").hide();
1498
                    }
1499
                } else {
1500
                    $("#suggestion_fieldset").hide();
1501
                }
1502
1503
                var effective_create_items = row.basket.create_items || AcqCreateItem;
1504
                $("#datereceived").val(row.date_received||$date(new Date().toISOString())).change();
1505
                $("#bookfund option[value='']").html(FUND_KEEP.format(row.fund.budget.budget_period_description, row.fund.name));
1506
                if(row.fund_id != row.fund.fund_id) {
1507
                    $("#bookfund").val(row.fund_id);
1508
                }
1509
                $("#current-fund").html(FUNC_CUR.format(row.fund.budget.budget_period_description, row.fund.name));
1510
                $("#creator").html([row.creator.surname, row.creator.firstname].filter(function(name){return name}).join(', ')+" ("+row.creator.patron_id+')')
1511
                $("#quantity_to_receive").val(row.quantity).prop('readonly', !row.subscription_id);
1512
                $("#quantity").val(row.quantity_received).prop('readonly', !row.subscription_id && effective_create_items == 'receiving');
1513
                $('#qtyrecerror').hide();
1514
                var tax_rate = row.tax_rate_on_receiving || row.tax_rate_on_ordering;
1515
                $("#tax_rate").val(tax_rate).change();
1516
                var rrp_txt;
1517
                var ecost_txt;
1518
                if(invoiceincgst == "1") {
1519
                    rrp_txt = Number(row.rrp_tax_included).format_price()+'<span class="hint">'+ADJ_TAX_INC.format(active_currency)+"</span>";
1520
                    ecost_txt = Number(row.ecost_tax_included).format_price()+'<span class="hint">'+TAX_INC+"</span>";
1521
                    $("#unitprice").val(row.unit_price_tax_included);
1522
                    $("#unitprice_hint").html(TAX_INC);
1523
                } else {
1524
                    rrp_txt = Number(row.rrp_tax_excluded).format_price()+'<span class="hint">'+ADJ_TAX_EXC.format(active_currency)+"</span>";
1525
                    ecost_txt = Number(row.ecost_tax_excluded).format_price()+'<span class="hint">'+TAX_EXC+"</span>";
1526
                    $("#unitprice").val(row.unit_price_tax_excluded);
1527
                    $("#unitprice_hint").html(TAX_EXC);
1528
                }
1529
                $("#rrp").html(rrp_txt);
1530
                $("#replacementprice").val(row.replacement_price);
1531
                $("#ecost").html(ecost_txt);
1532
                $("#order_internalnote").val(row.internal_note);
1533
                if(row.vendor_note) {
1534
                    $("#order_vendornote").html(row.vendor_note);
1535
                    $("#order_vendornote").parent().show();
1536
                } else {
1537
                    $("#order_vendornote").parent().hide();
1538
                }
1539
1540
1541
                $("#child_orders").hide();
1542
1543
                $('#items_list tbody tr, #outeritemblock > *, #acq-create-ordering tbody tr').remove();
1544
                $('#items_list').hide();
1545
                if(row.subscription_id) {
1546
                    $('#modal-order-main').tabs("disable", "#items-panel");
1547
                    $('#modal-order-main').tabs("enable", "#history-panel");
1548
                    if($('#modal-order-main').tabs( "option", "active" ) == 3) {
1549
                        $('#modal-order-main').tabs( "option", "active", 0);
1550
                    }
1551
                } else {
1552
                    $('#modal-order-main').tabs("enable", "#items-panel");
1553
                    $('#modal-order-main').tabs("disable", "#history-panel");
1554
                    if($('#modal-order-main').tabs( "option", "active" ) == 2) {
1555
                        $('#modal-order-main').tabs( "option", "active", 0);
1556
                    }
1557
                    if(effective_create_items == 'receiving') {
1558
                        $("#acq-create-receiving").show();
1559
                        $("#acq-create-ordering").hide();
1560
                        if(row.items && row.items.length) {
1561
                            row.items.forEach(function(item, index) {
1562
                                cloneItemBlock(index, '[% UniqueItemFields | html %]', function(block_id) {
1563
                                    var block = $('#'+block_id).hide();
1564
                                    Object.keys(item).forEach(function(key) {
1565
                                        block
1566
                                            .find('*[name=kohafield][value="'+key+'"]')
1567
                                            .parent()
1568
                                            .find('*[name=field_value]')
1569
                                            .val(item[key].field_value);
1570
                                    });
1571
                                    addItemInList(block_id, '[% UniqueItemFields | html %]');
1572
                                    block.find("input[name='buttonPlus']").val( (window.MSG_ADDITEM_JS_UPDATEITEM ) );
1573
                                    block.find("input[name='buttonPlusMulti']").remove();
1574
                                    block.find("input[name='multiValue']").remove();
1575
                                });
1576
                            });
1577
                        }
1578
                        cloneItemBlock((row.items && row.items.length) || 0, '[% UniqueItemFields | html %]');
1579
                    } else if (effective_create_items == 'ordering') {
1580
                        $("#acq-create-receiving").hide();
1581
                        $("#acq-create-ordering").show();
1582
                        if(row.items.length) {
1583
                            $("#acq-create-ordering tbody").append(
1584
                                row.items.map(function(item) {
1585
                                    var tr = $('<tr id="item_'+item.item_id+'"/>');
1586
                                    _build_item(item, tr);
1587
                                    return tr;
1588
                                })
1589
                            );
1590
                        }
1591
                    } else {
1592
                        if($('#modal-order-main').tabs( "option", "active" ) == 3) {
1593
                            $('#modal-order-main').tabs( "option", "active", 0);
1594
                        }
1595
                        $('#modal-order-main').tabs("disable", "#items-panel");
1596
                    }
1597
                }
1598
                $("#select_currency").hide();
1599
                $("#unitprice").prop("readonly", "");
1600
                $("input[name='change_currency']").prop('checked', false);
1601
                set_modal_buttons();
1602
            };
1603
1604
            $('.modal-prev').click(function() {
1605
                var modal = $("#order_edit");
1606
                keep_row();
1607
                var n = modal.data('n');
1608
                if(n > 0) {
1609
                    n--;
1610
                    modal.data('row', JSON.parse(JSON.stringify(api.row(n).data())));
1611
                    modal.data('n', n);
1612
                    set_editor();
1613
                } else {
1614
                    $('.modal-next, .modal-prev').prop('disabled', true);
1615
                    orders_table.one('draw.dt', function() {
1616
                        var info = api.page.info();
1617
                        n = info.end - info.start - 1;
1618
                        modal.data('row', JSON.parse(JSON.stringify(api.row(n).data())));
1619
                        modal.data('n', n);
1620
                        set_editor();
1621
                    });
1622
                    api.page('previous').draw( 'page' );
1623
                }
1624
            });
1625
1626
            $('.modal-next').click(function() {
1627
                var modal = $("#order_edit");
1628
                keep_row();
1629
                var n = modal.data('n');
1630
                var info = api.page.info();
1631
                if(n < info.end - info.start - 1) {
1632
                    n++;
1633
                    modal.data('row', JSON.parse(JSON.stringify(api.row(n).data())));
1634
                    modal.data('n', n);
1635
                    set_editor();
1636
                } else {
1637
                    $('.modal-next, .modal-prev').prop('disabled', true);
1638
                    orders_table.one('draw.dt', function() {
1639
                        var info = api.page.info();
1640
                        n = 0;
1641
                        modal.data('row', JSON.parse(JSON.stringify(api.row(n).data())));
1642
                        modal.data('n', n);
1643
                        set_editor();
1644
                    });
1645
                    api.page('next').draw( 'page' );
1646
                }
1647
            });
1648
1649
            $('.modal-save').click(function() {
1650
                save_row();
1651
                $("#order_edit").modal('hide');
1652
            })
1653
1654
            $('#modal-order-main').tabs({
1655
                activate: function(event, ui) {
1656
                    var active = ui.newPanel.attr('id')
1657
                    if(active == 'history-panel') {
1658
                        show_subs($("#order_edit").data('row'));
1659
                    }
1660
                }
1661
            });
1662
1663
            $("#order_edit").on("show.bs.modal", function (event) {
1664
                var anchor = $(event.relatedTarget);
1665
                var n = anchor.data("row");
1666
                var row = api.row(n).data();
1667
1668
                var modal = $(this);
1669
                modal.data('row', JSON.parse(JSON.stringify(row)));
1670
                modal.data('n', n);
1671
                modal.data('keep', modal.data('saved')||{});
1672
                $('#modal-order-main').tabs("option", "active", 0);
1673
                set_editor();
1674
            });
1675
/*            $("#order_edit").on("shown.bs.modal", function() {
1676
                var modal = $(this);
1677
1678
                if(modal.data('show_subs')) show_subs(modal.data('row'));
1679
            });*/
1680
            $("#order_edit").on("hide.bs.modal", function() {
1681
                $("#child_orders_table").DataTable().off('preDraw').destroy();
1682
            });
1683
        });
1684
        [% END %]
564
    </script>
1685
    </script>
565
[% END %]
1686
[% END %]
566
1687
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-5 / +66 lines)
Lines 117-122 Link Here
117
        <table id="pending_orders" class="table table-bordered table-striped">
117
        <table id="pending_orders" class="table table-bordered table-striped">
118
            <thead>
118
            <thead>
119
                <tr>
119
                <tr>
120
                    [% IF Koha.Preference('AcqReceiveMultipleOrderLines') %]
121
                    <th><!--input type="checkbox" id="selectAll"/--></th>
122
                    [% END %]
120
                    <th>Basket</th>
123
                    <th>Basket</th>
121
                    <th>Basket group</th>
124
                    <th>Basket group</th>
122
                    <th>Order line</th>
125
                    <th>Order line</th>
Lines 132-137 Link Here
132
                </tr>
135
                </tr>
133
            </thead>
136
            </thead>
134
        </table>
137
        </table>
138
      [% IF Koha.Preference('AcqReceiveMultipleOrderLines') %]
139
      <fieldset class="action">
140
        <button id="select_multiple"></button>
141
      </fieldset>
142
      [% END %]
135
    </div>
143
    </div>
136
[% ELSE %]
144
[% ELSE %]
137
    <p>
145
    <p>
Lines 344-351 Link Here
344
    [% INCLUDE 'datatables.inc' %]
352
    [% INCLUDE 'datatables.inc' %]
345
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
353
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
346
    <style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
354
    <style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
355
    <style>fieldset.action { margin-bottom: 20px }</style>
347
    <script>
356
    <script>
348
        dt_overwrite_html_sorting_localeCompare();
357
        dt_overwrite_html_sorting_localeCompare();
358
        var PENDING_MULTI_SELECTION = _("Receive selected (%s)");
349
        var columns_filter = {};
359
        var columns_filter = {};
350
360
351
        $(document).ready(function(){
361
        $(document).ready(function(){
Lines 377-383 Link Here
377
                }));
387
                }));
378
            }
388
            }
379
389
380
            var pending_orders_table = $("#pending_orders").api({
390
            var options = {
381
                "ajax": {
391
                "ajax": {
382
                    "url": '/api/v1/acquisitions/orders?only_active=1'
392
                    "url": '/api/v1/acquisitions/orders?only_active=1'
383
                },
393
                },
Lines 405-411 Link Here
405
                },
415
                },
406
                "columns": [
416
                "columns": [
407
                    { "data": "basket.name",
417
                    { "data": "basket.name",
408
                    "searchable": true,
418
                      "searchable": true,
409
                      "orderable": true,
419
                      "orderable": true,
410
                      "render": function(data, type, row, meta) {
420
                      "render": function(data, type, row, meta) {
411
                        if (type != 'display') return escape_str(data);
421
                        if (type != 'display') return escape_str(data);
Lines 514-520 Link Here
514
524
515
                            return result;
525
                            return result;
516
                        },
526
                        },
517
                        "orderable": false,
527
                        "orderable": false
518
                    },
528
                    },
519
                    {
529
                    {
520
                        "data": "",
530
                        "data": "",
Lines 634-640 Link Here
634
                        "searchable": false
644
                        "searchable": false
635
                    }
645
                    }
636
                ]
646
                ]
637
            }, {}, 1, {"basket.vendor_id": [% booksellerid | html %]});
647
           };
648
649
            [% IF Koha.Preference('AcqReceiveMultipleOrderLines') %]
650
            var selected_rows = {};
651
            $('#select_multiple').click(function() {
652
              var ids = Object.keys(selected_rows);
653
              if(!ids.length) return;
654
              if(ids.length == 1) {
655
                location.href = 'orderreceive.pl?ordernumber='+ids[0]+ '&invoiceid=[% invoiceid | uri %]';
656
              } else {
657
                location.href = 'orderreceive.pl?multiple_orders='+ids.join(',')+ '&invoiceid=[% invoiceid | uri %]';
658
              }
659
            }).html(PENDING_MULTI_SELECTION.format('0'))
660
            options.select = {
661
              style: 'api'
662
            };
663
            options.order = [[1, 'asc']];
664
            options.columns.unshift({
665
              "data": function(row, type, val, meta) {
666
                  return '<input type="checkbox" class="selOrder" />';
667
              },
668
              "searchable": false,
669
              "orderable": false
670
            });
671
            [% END %]
672
673
            var pending_orders_table = $("#pending_orders").api(options, {}, 1, {"basket.vendor_id": [% booksellerid | html %]});
674
675
            [% IF Koha.Preference('AcqReceiveMultipleOrderLines') %]
676
            var api = pending_orders_table.api();
677
            api.on('draw', function() {
678
              api.rows().every(function() {
679
                var row = this;
680
                var data = row.data();
681
                $('.selOrder', row.node()).on('click', function(event) {
682
                  if($(this).prop('checked')) {
683
                    row.select();
684
                    selected_rows[data.order_id] = data;
685
                  } else {
686
                    row.deselect();
687
                    delete selected_rows[data.order_id];
688
                  }
689
                  $('#select_multiple').html(PENDING_MULTI_SELECTION.format(Object.keys(selected_rows).length));
690
                });
691
                if(selected_rows[data.order_id]) {
692
                  row.select();
693
                  $('.selOrder', row.node()).prop('checked', true);
694
                }
695
              });
696
            });
697
698
            [% END %]
699
638
700
639
            $(".previewData").on("click", function(e){
701
            $(".previewData").on("click", function(e){
640
                e.preventDefault();
702
                e.preventDefault();
641
- 

Return to bug 8179