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 1198-1203 sub _after_item_action_hooks { Link Here
1198
    );
1200
    );
1199
}
1201
}
1200
1202
1203
=head3 _fetch_authorised_values
1204
1205
Retrieves for each column name the unblessed authorised value.
1206
1207
=cut
1208
1209
sub _fetch_authorised_values {
1210
    my ($self, $av_expand) = @_;
1211
1212
    my $columns_info = $self->_result->result_source->columns_info;
1213
    my $framworkcode = $self->biblio->frameworkcode;
1214
    # Handle not null and default values for integers and dates
1215
    my $avs = {};
1216
    foreach my $col ( keys %{$columns_info} ) {
1217
        next unless defined $self->$col;
1218
        my $field = $self->_result->result_source->name.'.'.$col;
1219
        my $mss = Koha::MarcSubfieldStructures->find({frameworkcode => $framworkcode, kohafield => $field});
1220
        if ($mss && $mss->authorised_value) {
1221
            my $av = Koha::AuthorisedValues->find({category => $mss->authorised_value, authorised_value => $self->$col});
1222
            $avs->{$col} = $av->unblessed if $av;
1223
        };
1224
    }
1225
    return $avs;
1226
}
1227
1201
=head3 _type
1228
=head3 _type
1202
1229
1203
=cut
1230
=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 / +1130 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 id="f" action="/cgi-bin/koha/acqui/finishreceive.pl" class="noEnterSubmit" method="post" onsubmit="return Check(this);">
49
    <form id="f" 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 322-328 Link Here
322
                    [% IF ( order.items.count ) %]
322
                    [% IF ( order.items.count ) %]
323
                        <input readonly="readonly" type="text" size="20" name="quantityrec" id="quantity" value="[% order.quantityreceived + 1 | html %]" />
323
                        <input readonly="readonly" type="text" size="20" name="quantityrec" id="quantity" value="[% order.quantityreceived + 1 | html %]" />
324
                    [% ELSE %]
324
                    [% ELSE %]
325
                        <input type="text" size="20" name="quantityrec" id="quantity" value="[% quantityreceived + 1 | html %]" />
325
                        <input type="text" size="20" name="quantityrec" id="quantity" value="[% order.quantityreceived + 1 | html %]" />
326
                    [% END %]
326
                    [% END %]
327
                    <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="[% order.quantityreceived | html %]" />
327
                    <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="[% order.quantityreceived | html %]" />
328
                [% END %]
328
                [% END %]
Lines 383-389 Link Here
383
        </li>
383
        </li>
384
        <li id="select_currency">
384
        <li id="select_currency">
385
            <label for="unitprice_currency"></label>
385
            <label for="unitprice_currency"></label>
386
            <input type="text" size="20" name="unitprice" id="unitprice_currency" value="" />
386
            <input type="text" size="20" name="unitprice_currency" id="unitprice_currency" value="" />
387
            [% IF currencies.count %]
387
            [% IF currencies.count %]
388
                <select name="currency">
388
                <select name="currency">
389
                    <option value="[% active_currency.rate | html %]" selected="selected">[% active_currency.currency | html %] ([% active_currency.symbol | html %])</option>
389
                    <option value="[% active_currency.rate | html %]" selected="selected">[% active_currency.currency | html %] ([% active_currency.symbol | html %])</option>
Lines 405-410 Link Here
405
        <input type="submit"  value="Save" class="button" accesskey="w" />
405
        <input type="submit"  value="Save" class="button" accesskey="w" />
406
        <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Cancel</a>
406
        <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Cancel</a>
407
</fieldset></div>    </form>
407
</fieldset></div>    </form>
408
[% ELSIF multiple_orders %]
409
    <table id="multiple_orders" class="table table-bordered table-striped">
410
        <thead>
411
            <tr>
412
                <th>Order</td>
413
                <th>Title</th>
414
                <th>Author</th>
415
                <th>ISBN</th>
416
                <th>Date received</th>
417
                <th>Fund</th>
418
                <th>Quantity</th>
419
                <th>&nbsp;</th>
420
            </tr>
421
        </thead>
422
    </table>
423
424
    <div class="col">
425
        <div id="jobfailed" class="dialog alert"></div>
426
        <fieldset class="action">
427
            <button class="save">Save</button>
428
            <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1">Return</a>
429
        </fieldset>
430
        <div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
431
    </div>
432
433
    <div class="modal fade" id="order_edit" tabindex="-1" role="dialog" aria-labelledby="Order edit">
434
        <div class="modal-dialog" role="document">
435
            <div class="modal-content modal-lg">
436
                <div class="modal-header row">
437
                    <h4 class="col-md-11 modal-title"></h4>
438
                    <button type="button" class="close col-md-1" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
439
                </div>
440
                <div class="modal-body">
441
                    <div class="hide" id="loading">Loading ...</div>
442
                    <div id="modal-order-main">
443
                        <ul>
444
                            <li><a href="#info-panel">Info</a></li>
445
                            <li><a href="#accounting-panel">Accounting</a></li>
446
                            <li><a href="#history-panel">Receipt history</a></li>
447
                            <li><a href="#items-panel">Items</a></li>
448
                        </ul>
449
450
451
                        <div id="info-panel">
452
                            <div>
453
                                <h4>Catalog details</h4>
454
455
                                <div class="row"> <span class="lbl col-sm-4">Title: </span><span class="col-sm-8" id="biblio_title"></span></div>
456
                                <div class="row"> <span class="lbl col-sm-4">Author: </span><span class="col-sm-8" id="biblio_author"></span></div>
457
                                <div class="row"> <span class="lbl col-sm-4">Copyright: </span><span class="col-sm-8" id="biblio_copyright_date"></span></div>
458
                                <div class="row"> <span class="lbl col-sm-4">ISBN: </span><span class="col-sm-8" id="biblio_isbn"></span></div>
459
                                <div class="row"> <span class="lbl col-sm-4">Series: </span><span class="col-sm-8" id="biblio_series_title"></span></div>
460
461
                            </div>
462
                            <div id="suggestion_fieldset">
463
                                <h4>Suggestion</h4>
464
                                <div class="row">
465
                                    <span class="lbl col-sm-4">Suggested by: </span> <span class="col-sm-8" id="biblio_suggestion_suggester"></span>
466
                                </div>
467
                                <div class="row" id="suggestion_reason">
468
                                    <span class="lbl col-sm-4">Reason:</span>
469
                                    <div class="col-sm-8">
470
                                        [% SET suggestion_reasons = AuthorisedValues.GetAuthValueDropbox( 'SUGGEST' ) %]
471
                                        <select class="select-reason" id="reason" name="reason">
472
                                            <option value=""> -- Choose a reason -- </option>
473
                                            [% FOREACH reason IN suggestion_reasons %]
474
                                            <option value="[% reason.lib | html %]">[% reason.lib | html %]</option>
475
                                            [% END %]
476
                                            <option value="other">Others...</option>
477
                                        </select>
478
479
                                        <span id="other_reason" name="other_reason">
480
                                            <input type="text" size="31" id="select-other_reason" name="other_reason" placeholder="please note your reason here..." />
481
                                            <a href="#back">Cancel</a>
482
                                        </span>
483
                                    </div>
484
                                </div>
485
                            </div>
486
                        </div>
487
                        <div id="history-panel">
488
                            <div id="child_orders">
489
                                <h4>Receipt history for this subscription</h4>
490
                                <table id="child_orders_table">
491
                                    <thead>
492
                                        <tr>
493
                                            <th>Invoice</th>
494
                                            <th>Order number</th>
495
                                            <th>Creation date</th>
496
                                            <th>Receive date</th>
497
                                            <th>Quantity received</th>
498
                                            <th>Status</th>
499
                                            <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
500
                                            <th>Internal note</th>
501
                                        </tr>
502
                                    </thead>
503
                                </table>
504
                            </div>
505
                        </div>
506
                        <div id="items-panel">
507
                            <div id="acq-create-receiving">
508
                                <div id="items_list" style="display: none">
509
                                    <h4>Items list</h4>
510
                                    <div style="width:100%;overflow:auto;">
511
                                        <table>
512
                                            <thead>
513
                                                <tr>
514
                                                    <th>Actions</th>
515
                                                    <th>Barcode</th>
516
                                                    <th>Home library</th>
517
                                                    <th>Holding library</th>
518
                                                    <th>Not for loan</th>
519
                                                    <th>Restricted</th>
520
                                                    <th>Location</th>
521
                                                    <th>Call number</th>
522
                                                    <th>Copy number</th>
523
                                                    <th>Inventory number</th>
524
                                                    <th>Collection</th>
525
                                                    <th>Item type</th>
526
                                                    <th>Materials</th>
527
                                                    <th>Notes</th>
528
                                                </tr>
529
                                            </thead>
530
                                            <tbody>
531
                                            </tbody>
532
                                        </table>
533
                                    </div>
534
                                </div>
535
536
                                <div id="itemfieldset">
537
                                    <h4>Item</h4>
538
                                    [% IF ( NoACQframework ) %]
539
                                        <p class="required">
540
                                            No ACQ framework, using default. You should create a
541
                                            framework with code ACQ, the items framework would be
542
                                            used
543
                                        </p>
544
                                    [% END %]
545
                                    <div id="outeritemblock"></div>
546
                                </div>
547
                            </div>
548
                            <div id="acq-create-ordering">
549
                                <h4>Items</h4>
550
                                <div style="width:100%;overflow:auto">
551
                                    <table>
552
                                        <thead>
553
                                            <tr>
554
                                                <th>Receive?</th>
555
                                                <th>&nbsp;</th>
556
                                                <th>Barcode</th>
557
                                                <th>Home library</th>
558
                                                <th>Current library</th>
559
                                                <th>Not for loan</th>
560
                                                <th>Restricted</th>
561
                                                <th>Location</th>
562
                                                <th>Call number</th>
563
                                                <th>Copy number</th>
564
                                                <th>Inventory number</th>
565
                                                <th>Collection</th>
566
                                                <th>Item type</th>
567
                                                <th>Materials</th>
568
                                                <th>Notes</th>
569
                                            </tr>
570
                                        </thead>
571
                                        <tbody>
572
                                        </tbody>
573
                                    </table>
574
                                </div>
575
                            </div>
576
                        </div>
577
                        <div id="accounting-panel">
578
                            <h4>Accounting details</h4>
579
                            <ol>
580
                                <li>
581
                                    <label for="datereceived">Date received: </label>
582
                                    <input type="text" size="10" id="datereceived" name="datereceived" class="datepicker" />
583
                                </li>
584
                                <li>
585
                                    <label for="bookfund">Fund: </label>
586
                                    <select id="bookfund" name="bookfund">
587
                                        <option value=""></option>
588
                                        [% FOREACH period IN budget_loop %]
589
                                        <optgroup label="[% period.description | html %]">
590
                                        [% FOREACH fund IN period.funds %]
591
                                            <option value="[% fund.b_id | html %]">[% fund.b_txt | html %]</option>
592
                                        [% END %]
593
                                        </optgroup>
594
                                        [% END %]
595
                                    </select>
596
                                </li>
597
                                <li>
598
                                    <label>&nbsp;</label>
599
                                    <span id="current-fund"></span>
600
                                </li>
601
                                <li>
602
                                    <label for="creator">Ordered by: </label>
603
                                    <span id="creator"></span>
604
                                </li>
605
                                <li>
606
                                    <label for="quantity_to_receive">Quantity ordered: </label>
607
                                    <input type="text" readonly="readonly" id="quantity_to_receive" name="quantity" />
608
                                </li>
609
                                <li>
610
                                    <label for="quantity">Quantity received: </label>
611
                                    <input type="text" size="20" name="quantityrec" id="quantity" />
612
                                    <div id="qtyrecerror" style="display:none">
613
                                        <p class="error">Warning, you have entered more items than expected.
614
                                        Items will not be created.</p>
615
                                    </div>
616
                                </li>
617
618
                                [% IF ( gst_values ) %]
619
                                <li>
620
                                    <label for="tax_rate">Tax rate: </label>
621
                                    <select name="tax_rate" id="tax_rate">
622
                                    [% FOREACH gst IN gst_values %]
623
                                        <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
624
                                    [% END %]
625
                                    </select>
626
                                </li>
627
                                [% END %]
628
629
                                <li>
630
                                    <label for="rrp">Retail price: </label>
631
                                    <span id="rrp"></span>
632
                                <li>
633
                                    <label for="replacementprice">Replacement price:</label>
634
                                    <input type="text" size="20" name="replacementprice" id="replacementprice" />
635
                                </li>
636
                                <li>
637
                                    <label for="ecost">Budgeted cost: </label>
638
                                    <span id="ecost"></span>
639
                                </li>
640
                                <li>
641
                                    <label for="unitprice">Actual cost:</label>
642
                                    <input type="text" size="20" name="unitprice" id="unitprice" />
643
                                    <span id="unitprice_hint" class="hint"></span>
644
                                    <label style="font-weight: inherit; float:none;"><input type="checkbox" name="change_currency">Change currency</label>
645
                                </li>
646
                                <li id="select_currency">
647
                                    <label for="unitprice_currency"></label>
648
                                    <input type="text" size="20" name="unitprice_currency" id="unitprice_currency" value="" />
649
                                    [% IF currencies.count %]
650
                                    <select name="currency">
651
                                        <option value="[% active_currency.rate | html %]" selected="selected">[% active_currency.currency | html %] ([% active_currency.symbol | html %])</option>
652
                                        [% FOR currency IN currencies %]
653
                                        <option value="[% currency.rate | html %]">[% currency.currency | html %] ([% currency.symbol | html %])</option>
654
                                        [% END %]
655
                                    </select>
656
                                    [% END %]
657
                                </li>
658
                                <li>
659
                                    <label for="order_internalnote">Internal note: </label>
660
                                    <textarea name="order_internalnote" id="order_internalnote" width="40" rows="8" ></textarea>
661
                                </li>
662
                                <li>
663
                                    <label for="order_vendornote">Vendor note: </label>
664
                                    <span id="order_vendornote"></span>
665
                                </li>
666
                            </ol>
667
                        </div>
668
                    </div>
669
                </div>
670
                <div class="modal-footer">
671
                    <button type="button" class="btn btn-defualt modal-prev">Previous</button>
672
                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
673
                    <button type="button" class="btn btn-primary modal-save">Save changes</button>
674
                    <button type="button" class="btn btn-defualt modal-next">Next</button>
675
                </div>
676
            </div>
677
        </div>
678
    </div>
408
[% ELSE %]
679
[% ELSE %]
409
    This ordernumber does not exist.
680
    This ordernumber does not exist.
410
[% END %]
681
[% END %]
Lines 420-429 Link Here
420
</div> <!-- /.row -->
691
</div> <!-- /.row -->
421
[% MACRO jsinclude BLOCK %]
692
[% MACRO jsinclude BLOCK %]
422
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
693
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
423
[% INCLUDE 'calendar.inc' %]
694
    [% INCLUDE 'calendar.inc' %]
424
    [% Asset.js("js/additem.js") | $raw %]
695
    [% Asset.js("js/additem.js") | $raw %]
425
    [% Asset.js("js/cataloging.js") | $raw %]
696
    [% Asset.js("js/cataloging.js") | $raw %]
697
    [% INCLUDE 'datatables.inc' %]
698
    [% INCLUDE 'js-date-format.inc' %]
699
    [% INCLUDE 'format_price.inc' %]
700
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
701
    <style>
702
        .lbl {
703
            font-weight: 700;
704
            text-align: right;
705
        }
706
        .modal-body ol {
707
            list-style-type: none;
708
        }
709
710
        .modal-body ol li {
711
            list-style-type: none;
712
            padding-bottom: 1em;
713
            width: 100%;
714
        }
715
716
        .modal-body h4 {
717
            margin-left: 1em;
718
            padding: .2em .5em;
719
            margin-bottom: 17px;
720
        }
721
722
        .modal-body label {
723
            margin-right: 1em;
724
            text-align: right;
725
            width: 11em;
726
            display: inline-block;
727
            font-weight: 700;
728
        }
729
730
        .modal-body textarea {
731
            vertical-align: text-top;
732
        }
733
    </style>
426
    <script>
734
    <script>
735
        [% IF order %]
427
        function Check(form) {
736
        function Check(form) {
428
            [% IF (AcqCreateItem == 'receiving') %]
737
            [% IF (AcqCreateItem == 'receiving') %]
429
                var total_errors = CheckMandatorySubfields(form);
738
                var total_errors = CheckMandatorySubfields(form);
Lines 574-579 Link Here
574
            });
883
            });
575
884
576
        });
885
        });
886
        [% ELSIF multiple_orders %]
887
888
        var _build_item = function(item, tr) {
889
            var chb = $('<input type="checkbox" name="items_to_receive" value="'+item.item_id+'" />')
890
                .prop('checked', item._checked)
891
                .change(function() {
892
                    item._checked = $(this).prop('checked');
893
                });
894
            tr.append($('<td style="text-align:center"></td>').append(chb));
895
            tr.append('<td><a style="cursor:pointer" onclick="PopupEditPage('+item.biblio_id+', '+item.item_id+');">'+EDIT[0].toUpperCase()+EDIT.substr(1).toLowerCase()+'</a></td>');
896
            tr.append('<td>'+(item.external_id||'')+'</td>');
897
            tr.append('<td>'+(item.home_branch && item.home_branch.name||'')+'</td>');
898
            tr.append('<td>'+(item.holding_branch && item.holding_branch.name||'')+'</td>');
899
            tr.append('<td>'+(item._authorised_values.not_for_loan_status && item._authorised_values.not_for_loan_status.lib||'')+'</td>');
900
            tr.append('<td>'+(item._authorised_values.restricted_status && item._authorised_values.restricted_status.lib||'')+'</td>');
901
            tr.append('<td><span class="shelvingloc">'+(item._authorised_values.location && item._authorised_values.location.lib||'')+'</span></td>');
902
            tr.append('<td>'+(item.callnumber||'')+'</td>');
903
            tr.append('<td>'+(item.copy_number||'')+'</td>');
904
            tr.append('<td>'+(item.inventory_number||'')+'</td>');
905
            tr.append('<td>'+(item._authorised_values.collection_code && item._authorised_values.collection_code.lib||'')+'</td>');
906
            tr.append('<td>'+(item.itemtype && item.itemtype.description || '')+'</td>');
907
            tr.append('<td>'+(item._authorised_values.materials_notes && item._authorised_values.materials_notes.lib||'')+'</td>')
908
            tr.append('<td>'+(item.public_notes||'')+'</td>');
909
        };
910
911
        var items_columns = [null, null, 'external_id', 'home_library_id',
912
                'holding_library_id', 'not_for_loan_status', 'restricted_status', 'location',
913
                'callnumber', 'copy_number', 'inventory_number', 'collection_code',
914
                'item_type', 'materials_notes', 'public_notes'];
915
916
        function PopupEditPage(biblionumber, itemnumber) {
917
            var url = "/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber="
918
                + biblionumber + "&itemnumber=" + itemnumber + "&popup=1#edititem";
919
            var w = window.open(url);
920
            var watchClose = setInterval(function() {
921
                if (w.closed) {
922
                    clearTimeout(watchClose);
923
                    $.ajax({
924
                        dataType: "json",
925
                        headers: {
926
                            "x-koha-embed": "home_branch,holding_branch,itemtype",
927
                            "x-koha-av": "1"
928
                        },
929
                        url: '/api/v1/items/'+itemnumber,
930
                        success: function(item) {
931
                            var tr = $("#item_"+itemnumber);
932
                            tr.html('');
933
                            _build_item(item, tr);
934
                        }
935
                    });
936
                }
937
            }, 500);
938
        }
939
940
        var periods={};
941
        var funds={};
942
        var funds_tree = [];
943
944
        var QTY_TOTAL = _("Receiving %0$s out of %1$s");
945
        var EDIT = _("edit");
946
        var MOD_TITLE = _("Edit %s");
947
        var SUGGESTION = _("suggestion #%s");
948
        var FUND_KEEP = _("Keep current (%0$s - %1$s)");
949
        var FUNC_CUR = _("(Current: %0$s - %1$s)");
950
        var ADJ_TAX_INC = _("(adjusted for %s, tax inclusive)");
951
        var ADJ_TAX_EXC = _("(adjusted for %s, tax exclusive)");
952
        var TAX_INC = _("(tax inclusive)");
953
        var TAX_EXC = _("(tax exclusive)");
954
        var SAVE_WARNING = _("Order %s: Warning, you have entered more items than expected. Items will not be created.");
955
        var SAVE_WARNING_NO_ITEMS = _("Order %s: No quantity to receive set. No items will be created.");
956
        var SAVE_ERROR = _("Order %s: An error occurred while saving");
957
958
959
        var CAN_user_acquisition = "[% CAN_user_acquisition | html %]";
960
        var AcqCreateItem = "[% Koha.Preference('AcqCreateItem') | html %]";
961
        var edit_mode = "[% edit | html %]";
962
        var invoiceincgst = "[% invoiceincgst | html %]";
963
        var active_currency = "[% active_currency.currency | html %]";
964
        var invoice_id = "[% invoiceid | html %]";
965
966
        $(document).ready(function(){
967
            var base_query = { "order_id": {"in": [[% multiple_orders | html %]]}};
968
            var pending_orders_url = "/api/v1/acquisitions/orders?only_active=1";
969
            var options = {
970
                "ajax": {
971
                    "url": pending_orders_url + "&q=" + encodeURI(JSON.stringify(base_query)),
972
                    "headers": {
973
                        'x-koha-av': '1'
974
                    }
975
                },
976
                "header_filter": true,
977
                "embed": [
978
                    "basket",
979
                    "biblio.suggestions.suggester",
980
                    "fund.budget",
981
                    "items.home_branch",
982
                    "items.holding_branch",
983
                    "items.itemtype",
984
                    "creator"
985
                ],
986
                'dom': 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
987
                "columns": [
988
                    {
989
                        "data": "order_id",
990
                        "searchable": true,
991
                        "orderable": true
992
                    },
993
                    {
994
                        "data": "biblio.title",
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.author",
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
                        "data": "biblio.isbn",
1021
                        "searchable": true,
1022
                        "orderable": true,
1023
                        "render": function(data, type, row, meta) {
1024
                            if ( data == null ) {
1025
                                return "";
1026
                            }
1027
                            else {
1028
                                return data;
1029
                            }
1030
                        }
1031
                    },
1032
                    {
1033
                        "searchable": false,
1034
                        "orderable": false,
1035
                        "data": function(row, type, val, meta) {
1036
                            return $date(row.date_received||new Date().toISOString());
1037
                        }
1038
                    },
1039
                    {
1040
                        "data": "fund.name",
1041
                        "searchable": true,
1042
                        "orderable": false,
1043
                        "render": function(data, type, row, meta) {
1044
                            return row.fund.budget.budget_period_description+" - "+row.fund.name;
1045
                        }
1046
                    },
1047
                    {
1048
                        "searchable": false,
1049
                        "orderable": true,
1050
                        "data": "quantity_received",
1051
                        "render": function(data, type, row, meta) {
1052
                            var data = $("#order_edit").data();
1053
                            return QTY_TOTAL.format(row.subscription_id&&(!data.saved||!data.saved.hasOwnProperty(row.order_id))?row.quantity:row.quantity_received, row.quantity);
1054
                        }
1055
                    },
1056
                    {
1057
                        "searchable": false,
1058
                        "orderable": false,
1059
                        "render": function(data, type, row, meta) {
1060
                            return '<a data-toggle="modal" href="#order_edit" data-row="'+meta.row+'" class="order_edit_toggle">'+EDIT+'</a>';
1061
                        }
1062
                    }
1063
                ]
1064
            };
1065
            var orders_table = $("#multiple_orders").api(options);
1066
            var api = orders_table.api();
1067
1068
            api.on('preDraw', function() {
1069
                var saved = $("#order_edit").data('saved');
1070
                if(saved) {
1071
                    var data = api.data();
1072
                    for(var i = 0; i<data.length; i++) {
1073
                        var row = data[i];
1074
                        var srow = saved[row.order_id];
1075
                        if(srow) {
1076
                            if(row.fund_id != srow.fund_id) {
1077
                                row.fund.budget.budget_period_description = $("#bookfund option[value="+srow.fund_id+"]").parent().attr('label');
1078
                                row.fund.name = $("#bookfund option[value="+srow.fund_id+"]").html();
1079
                            }
1080
                            row.date_received = srow.date_received;
1081
                            row.quantity = srow.quantity;
1082
                            row.quantity_received = srow.quantity_received;
1083
                        }
1084
                    }
1085
                }
1086
            });
1087
1088
            var _doSave = function(params) {
1089
                $.ajax($.extend({
1090
                    method: 'POST',
1091
                    url: '/cgi-bin/koha/acqui/finishreceive.pl'
1092
                }, params));
1093
            };
1094
1095
            var _set_error = function(error) {
1096
                if($('#jobfailed').html() == '') $('#jobfailed').append('<ul/>');
1097
                $('#jobfailed').show();
1098
                $('#jobfailed ul').append('<li>'+error+'</li>');
1099
            };
1100
1101
            var _transform_row = function(row, origrec) {
1102
                var params = {};
1103
                params['biblionumber'] = row.biblio_id;
1104
                params['invoiceid'] = invoice_id;
1105
                params['ordernumber'] = row.order_id;
1106
                params['booksellerid'] = row.basket.vendor_id;
1107
1108
                if(row.biblio.suggestions.length && row.biblio.suggestions[0].reason) {
1109
                    params["suggestionid"] = row.biblio.suggestions[0].suggestion_id;
1110
                    if($("#reason option[value='"+row.biblio.suggestions[0].reason+"']").length) {
1111
                        params['reason'] =  row.biblio.suggestions[0].reason;
1112
                    } else {
1113
                        params['reason'] = 'other';
1114
                        params['other_reason'] = row.biblio.suggestions[0].reason;
1115
                    }
1116
                }
1117
                params['datereceived'] = row.date_received;
1118
                params['bookfund'] = row.fund_id;
1119
                params['quantity'] = row.quantity;
1120
                params['quantityrec'] = row.quantity_received;
1121
                params['origquantityrec'] = origrec;
1122
                var effective_create_items = row.basket.create_items || AcqCreateItem;
1123
                params['tax_rate'] = (effective_create_items == 'receiving')?row.tax_rate_on_receiving:row.tax_rate_on_ordering;
1124
                params['replacementprice'] = row.replacement_price;
1125
                params['unitprice'] = invoiceincgst=="1"?row.unit_price_tax_included:row.unit_price_tax_excluded;
1126
                params['order_internalnote'] = row.internal_note;
1127
                if(effective_create_items == 'receiving') {
1128
                    Object.keys(row.items).forEach(function(key) {
1129
                        var item = row.items[key];
1130
                        Object.keys(item).forEach(function(key) {
1131
                            var field = item[key];
1132
                            Object.keys(field).forEach(function(key) {
1133
                                if(!params[key]) params[key] = [];
1134
                                params[key].push(item[key]);
1135
                            });
1136
                        });
1137
                    });
1138
                } else if(effective_create_items == 'ordering') {
1139
                    params['items_to_receive'] = (row.items||[])
1140
                        .filter(function(item) {
1141
                            return item._checked
1142
                        })
1143
                        .map(function(item) {
1144
                            item.item_id;
1145
                        })
1146
                }
1147
                return params;
1148
            };
1149
1150
            $('.save').click(function() {
1151
                var data = $("#order_edit").data();
1152
                var rows = api.rows().data();
1153
                $('this').prop('disabled', true);
1154
                var redirect = true;
1155
                if(rows.length) {
1156
                    $('#jobpanel, #jobstatus').show();
1157
1158
                    var loopRows = function(i) {
1159
                        var row = rows[i];
1160
                        if(!row) {
1161
                            if(redirect) {
1162
                                location.href = "/cgi-bin/koha/acqui/parcel.pl?invoiceid="+invoice_id
1163
                            }
1164
                            return;
1165
                        }
1166
                        if(data.saved && data.saved[row.order_id]) {
1167
                            row = data.saved[row.order_id];
1168
                            var origrec = data.origrec[row.order_id];
1169
                        } else {
1170
                            var origrec = row.quantity_received;
1171
                        }
1172
                        var _set_percentage = function() {
1173
                            var percentage = Math.round(( (i+1) / rows.length) * 100);
1174
                            var bgproperty = (parseInt(percentage*2)-300)+"px 0px";
1175
                            $("#jobprogress").css("background-position",bgproperty);
1176
                            $("#jobprogresspercent").text(percentage);
1177
                        }
1178
                        if(row.quantity_received > row.quantity) {
1179
                            redirect = false;
1180
                            _set_error(SAVE_WARNING.format(row.order_id));
1181
                            row.quantity_received = row.quantity;
1182
                        }
1183
                        if(row.quantity_received == '0') {
1184
                            redirect = false;
1185
                            _set_error(SAVE_WARNING_NO_ITEMS.format(row.order_id));
1186
                        }
1187
                        _doSave({
1188
                            data: _transform_row(row, origrec),
1189
                            success: function() {
1190
                                _set_percentage();
1191
                                loopRows(i+1);
1192
                            },
1193
                            error: function() {
1194
                                _set_percentage()
1195
                                _set_error(SAVE_ERROR.format(row.order_id));
1196
                                redirect = false;
1197
                                loopRows(i+1);
1198
                            }
1199
                        });
1200
                    };
1201
                    loopRows(0)
1202
                }
1203
            });
1204
1205
            $("#order_edit").on("change", "#reason", function() {
1206
                var val = $(this).val();
1207
                var row = $("#order_edit").data('row');
1208
                if(val == 'other') {
1209
                    $("#other_reason").show();
1210
                    $(this).hide();
1211
                } else {
1212
                    row.biblio.suggestions[0].reason = val;
1213
                }
1214
            });
1215
1216
            $("#order_edit").on("change", "#select-other_reason", function() {
1217
                var val = $(this).val();
1218
                var row = $("#order_edit").data('row');
1219
                row.biblio.suggestions[0].reason = val;
1220
            });
1221
1222
            $("#order_edit").on("click", "#other_reason a", function() {
1223
                $("#other_reason").hide();
1224
                $("#reason").val(null).show();
1225
            });
1226
1227
            $("#order_edit").on("change", "#datereceived", function() {
1228
                var val = $(this).val();
1229
                var row = $("#order_edit").data('row');
1230
                row.date_received = val;
1231
            });
1232
1233
            $("#order_edit").on("change", "#bookfund", function() {
1234
                var val = $(this).val();
1235
                var row = $("#order_edit").data('row');
1236
                row.fund_id = val;
1237
            });
1238
1239
            $("#order_edit").on("change", "#quantity_to_receive", function() {
1240
                var val = $(this).val();
1241
                var row = $("#order_edit").data('row');
1242
                row.quantity = val;
1243
                if(row.subscription_id) {
1244
                    $("#quantity").val(val).change();
1245
                }
1246
            });
1247
1248
            $("#order_edit").on("change", "#quantity", function() {
1249
                var val = $(this).val();
1250
                var row = $("#order_edit").data('row');
1251
                row.quantity_received = val;
1252
                var qtyto = parseInt($("#quantity_to_receive").val());
1253
                if(parseInt(val) > qtyto) {
1254
                    $("#qtyrecerror").show();
1255
                } else {
1256
                    $("#qtyrecerror").hide();
1257
                }
1258
                $("input[name='items_to_receive']").each(function() {
1259
                    $(this).prop('checked', false).change();
1260
                });
1261
                $("input[name='items_to_receive']:lt("+val+")").each(function () {
1262
                    $(this).prop('checked', true).change();
1263
                });
1264
            });
1265
1266
            $("#order_edit").on("change", "input[name='items_to_receive']", function() {
1267
                var qty = $("input[name='items_to_receive']:checked").length;
1268
                $("#quantity").val(qty);
1269
                var row = $("#order_edit").data('row');
1270
                row.quantity_received = qty;
1271
            })
1272
1273
            $("#order_edit").on("change", "#tax_rate", function() {
1274
                var val = $(this).val();
1275
                if(val === null) $(this).val($('option:first-child', this).attr('value'));
1276
                val = $(this).val();
1277
                var row = $("#order_edit").data('row');
1278
                var effective_create_items = row.basket.create_items || AcqCreateItem;
1279
                if(effective_create_items == 'receiving') {
1280
                    row.tax_rate_on_receiving = val;
1281
                } else {
1282
                    row.tax_rate_on_ordering = val;
1283
                }
1284
1285
            });
1286
1287
            $("#order_edit").on("change", "#unitprice", function() {
1288
                var val = $(this).val();
1289
                var row = $("#order_edit").data('row');
1290
                if(invoiceincgst == "1") {
1291
                    row.unit_price_tax_included = val;
1292
                } else {
1293
                    row.unit_price_tax_excluded = val;
1294
                }
1295
1296
            });
1297
1298
            $("#order_edit").on("change", "input[name='change_currency']", function(){
1299
                if ( $(this).is(":checked") ) {
1300
                    $("#select_currency").show();
1301
                    $("#unitprice").prop("readonly", "true");
1302
                } else {
1303
                    $("#select_currency").hide();
1304
                    $("#unitprice").prop("readonly", "");
1305
                }
1306
            });
1307
1308
            function _update_unitprice() {
1309
                var rate = Number($("select[name='currency'] option:selected").val());
1310
                var unitprice = $("#unitprice_currency").val();
1311
                var new_unitprice = Number( unitprice * rate ).toFixed(2);
1312
                $("#unitprice").val(new_unitprice).change();
1313
            }
1314
            $("#order_edit").on("change", "select[name='currency']", _update_unitprice );
1315
            $("#order_edit").on("change", "#unitprice_currency", _update_unitprice );
1316
1317
            $("#order_edit").on("change", "#replacementprice", function() {
1318
                var val = $(this).val();
1319
                var row = $("#order_edit").data('row');
1320
                row.replacement_price = val;
1321
            });
1322
1323
            $("#order_edit").on("change", "#order_internalnote", function() {
1324
                var val = $(this).val();
1325
                var row = $("#order_edit").data('row');
1326
                row.internal_note = val;
1327
1328
            });
1329
1330
            var keep_row = function() {
1331
                var row = $("#order_edit").data('row');
1332
                var kept = $("#order_edit").data('kept')||{};
1333
                if($('#items_list tbody tr').length) {
1334
                    row.items = [];
1335
                    $('#items_list tbody tr').each(function() {
1336
                        var item = {};
1337
                        $('#'+$(this).attr('idblock')).find('*[name=kohafield]').each(function() {
1338
                            var kf = $(this).val();
1339
                            var obj = {};
1340
                            $(this).parent().find('*[name]').each(function() {
1341
                                obj[$(this).prop('name')] = $(this).val();
1342
                            });
1343
                            item[kf] = obj;
1344
                        });
1345
                        row.items.push(item);
1346
                    });
1347
                }
1348
                kept[row.order_id] = row;
1349
                $("#order_edit").data('kept', kept);
1350
            };
1351
1352
            var save_row = function() {
1353
                keep_row();
1354
                var saved = $("#order_edit").data('saved')||{};
1355
                var kept = $("#order_edit").data('kept');
1356
                $("#order_edit").data('saved', $.extend(saved, kept));
1357
                api.draw();
1358
            }
1359
1360
            var set_modal_buttons = function() {
1361
                var n = $("#order_edit").data('n');
1362
                var info = api.page.info();
1363
1364
                $('.modal-prev').prop('disabled', info.page == 0 && n == 0);
1365
                $('.modal-next').prop('disabled', info.pages - 1 == info.page && info.end - info.start - 1 == n);
1366
            };
1367
1368
            var show_subs = function(row) {
1369
                //$("#child_orders").show();
1370
                var had_rows = false;
1371
                var base_query = { "subscription_id": row.subscription_id, "parent_order_id": row.order_id, "order_id": {"!=": row.order_id}};
1372
                var pending_orders_url = "/api/v1/acquisitions/orders";
1373
                var options = {
1374
                    "ajax": {
1375
                        "url": pending_orders_url + "?q=" + encodeURI(JSON.stringify(base_query))
1376
                    },
1377
                    "header_filter": true,
1378
                    "embed": [
1379
                        "invoice",
1380
                        "basket"
1381
                    ],
1382
                    "order": [[1, 'asc']],
1383
                    'dom': 'C<"top pager"ilpfB>tr<"bottom pager"ip>',
1384
                    "columns": [
1385
                        {
1386
                            "searchable": false,
1387
                            "orderable": false,
1388
                            "data": function(row, type, val, meta) {
1389
                                if(row.invoice) {
1390
                                    if(CAN_user_acquisition) {
1391
                                        return '<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid='+row.invoice_id+'" title="Invoice detail page">'+row.invoice.invoice_number+"</a>";
1392
                                    }
1393
                                    return row.invoice.invoice_number;
1394
                                }
1395
                            }
1396
                        },
1397
                        {
1398
                            "data": "order_id",
1399
                            "searchable": false,
1400
                            "orderable": false
1401
                        },
1402
                        {
1403
                            "searchable": false,
1404
                            "orderable": false,
1405
                            "data": "basket.creation_date",
1406
                            "render": function(data, type, row, meta) {
1407
                                return $date(row.basket.creation_date);
1408
                            }
1409
                        },
1410
                        {
1411
                            "searchable": false,
1412
                            "orderable": false,
1413
                            "data": function(row, type, val, meta) {
1414
                                return $date(row.date_received);
1415
                            }
1416
                        },
1417
                        {
1418
                            "searchable": false,
1419
                            "orderable": false,
1420
                            "data": function(row, type, val, meta) {
1421
                                return row.quantity_received;
1422
                            }
1423
                        },
1424
                        {
1425
                            "searchable": false,
1426
                            "orderable": true,
1427
                            "data": function(row, type, val, meta) {
1428
                                if(!row.status) return;
1429
                                var first_letter = row.status[0].toUpperCase();
1430
                                return first_letter+row.status.substr(1).toLowerCase();
1431
                            }
1432
                        },
1433
                        {
1434
                            "searchable": false,
1435
                            "orderable": false,
1436
                            "data": function(row, type, val, meta) {
1437
                                if(!row.date_received) return;
1438
                                return Number(row.unit_price_tax_excluded * row.quantity_received).format_price()+' / '+Number(row.unit_price_tax_included * row.quantity_received).format_price()
1439
                            }
1440
                        },
1441
                        {
1442
                            "searchable": false,
1443
                            "orderable": false,
1444
                            "data": function(row, type, val, meta) {
1445
                                return row.internal_note;
1446
                            }
1447
                        }
1448
                    ]
1449
                };
1450
                var child_orders_table = $("#child_orders_table").api(options);
1451
                var child_api = child_orders_table.api();
1452
                child_api.on('preDraw', function() {
1453
                    if(!child_api.data().length && !had_rows) return;
1454
                    $("#child_orders").show();
1455
                    had_rows = true;
1456
                });
1457
            };
1458
1459
            var set_editor = function() {
1460
                var modal = $("#order_edit");
1461
                var row = modal.data('row');
1462
                var origrec = $("#order_edit").data('origrec')||{};
1463
                if(!origrec.hasOwnProperty(row.order_id)) {
1464
                    origrec[row.order_id] = row.quantity_received;
1465
                    $("#order_edit").data('origrec', origrec);
1466
                }
1467
                if(row.subscription_id) {
1468
                    row.quantity_received = row.quantity;
1469
                }
1470
                var keep = $("#order_edit").data('kept');
1471
                if(keep && keep[row.order_id]) {
1472
                    row = keep[row.order_id];
1473
                    modal.data('row', row);
1474
                }
1475
                $('input, select, textarea', '.modal-body').val(null)
1476
                modal.find(".modal-title").text(MOD_TITLE.format(row.biblio.title));
1477
                ["title", "author", "copyright_date", "isbn", "series_title"].forEach(function(key){
1478
                    var o = modal.find(".modal-body #biblio_"+key);
1479
                    if(row.biblio[key] !== null) {
1480
                        o.parent().show();
1481
                        o.html(row.biblio[key]);
1482
                    } else {
1483
                        o.parent().hide();
1484
                    }
1485
                });
1486
                if(row.biblio.suggestions.length) {
1487
                    $("#suggestion_fieldset").show();
1488
                    if(row.biblio.suggestions[0].suggester) {
1489
                        $("#biblio_suggestion_suggester").parent().show();
1490
                        $("#biblio_suggestion_suggester")
1491
                            .html(
1492
                                [row.biblio.suggestions[0].suggester.surname, row.biblio.suggestions[0].suggester.firstname]
1493
                                    .filter(function(name){
1494
                                        return name
1495
                                    })
1496
                                    .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>)'
1497
                            );
1498
                    } else {
1499
                        $("#biblio_suggestion_suggester").parent().hide();
1500
                    }
1501
                    if(row.biblio.suggestions[0].reason) {
1502
                        $("#suggestion_reason").show();
1503
                        if($("#reason option[value='"+row.biblio.suggestions[0].reason+"']").length) {
1504
                             $("#other_reason a").click();
1505
                            $("#reason").val(row.biblio.suggestions[0].reason);
1506
                            $("#select-other_reason").val(null);
1507
                        } else {
1508
                            $("#reason").val("other").change();
1509
                            $("#select-other_reason").val(row.biblio.suggestions[0].reason);
1510
                        }
1511
1512
                    } else {
1513
                        $("#suggestion_reason").hide();
1514
                    }
1515
                } else {
1516
                    $("#suggestion_fieldset").hide();
1517
                }
1518
1519
                var effective_create_items = row.basket.create_items || AcqCreateItem;
1520
                $("#datereceived").val(row.date_received||$date(new Date().toISOString())).change();
1521
                $("#bookfund option[value='']").html(FUND_KEEP.format(row.fund.budget.budget_period_description, row.fund.name));
1522
                if(row.fund_id != row.fund.fund_id) {
1523
                    $("#bookfund").val(row.fund_id);
1524
                }
1525
                $("#current-fund").html(FUNC_CUR.format(row.fund.budget.budget_period_description, row.fund.name));
1526
                $("#creator").html([row.creator.surname, row.creator.firstname].filter(function(name){return name}).join(', ')+" ("+row.creator.patron_id+')')
1527
                $("#quantity_to_receive").val(row.quantity).prop('readonly', !row.subscription_id);
1528
                $("#quantity").val(row.quantity_received).prop('readonly', !row.subscription_id && effective_create_items == 'receiving');
1529
                $('#qtyrecerror').hide();
1530
                var tax_rate = row.tax_rate_on_receiving || row.tax_rate_on_ordering;
1531
                $("#tax_rate").val(tax_rate).change();
1532
                var rrp_txt;
1533
                var ecost_txt;
1534
                if(invoiceincgst == "1") {
1535
                    rrp_txt = Number(row.rrp_tax_included).format_price()+'<span class="hint">'+ADJ_TAX_INC.format(active_currency)+"</span>";
1536
                    ecost_txt = Number(row.ecost_tax_included).format_price()+'<span class="hint">'+TAX_INC+"</span>";
1537
                    $("#unitprice").val(row.unit_price_tax_included);
1538
                    $("#unitprice_hint").html(TAX_INC);
1539
                } else {
1540
                    rrp_txt = Number(row.rrp_tax_excluded).format_price()+'<span class="hint">'+ADJ_TAX_EXC.format(active_currency)+"</span>";
1541
                    ecost_txt = Number(row.ecost_tax_excluded).format_price()+'<span class="hint">'+TAX_EXC+"</span>";
1542
                    $("#unitprice").val(row.unit_price_tax_excluded);
1543
                    $("#unitprice_hint").html(TAX_EXC);
1544
                }
1545
                $("#rrp").html(rrp_txt);
1546
                $("#replacementprice").val(row.replacement_price);
1547
                $("#ecost").html(ecost_txt);
1548
                $("#order_internalnote").val(row.internal_note);
1549
                if(row.vendor_note) {
1550
                    $("#order_vendornote").html(row.vendor_note);
1551
                    $("#order_vendornote").parent().show();
1552
                } else {
1553
                    $("#order_vendornote").parent().hide();
1554
                }
1555
1556
1557
                $("#child_orders").hide();
1558
1559
                $('#items_list tbody tr, #outeritemblock > *, #acq-create-ordering tbody tr').remove();
1560
                $('#items_list').hide();
1561
                if(row.subscription_id) {
1562
                    $('#modal-order-main').tabs("disable", "#items-panel");
1563
                    $('#modal-order-main').tabs("enable", "#history-panel");
1564
                    if($('#modal-order-main').tabs( "option", "active" ) == 3) {
1565
                        $('#modal-order-main').tabs( "option", "active", 0);
1566
                    }
1567
                } else {
1568
                    $('#modal-order-main').tabs("enable", "#items-panel");
1569
                    $('#modal-order-main').tabs("disable", "#history-panel");
1570
                    if($('#modal-order-main').tabs( "option", "active" ) == 2) {
1571
                        $('#modal-order-main').tabs( "option", "active", 0);
1572
                    }
1573
                    if(effective_create_items == 'receiving') {
1574
                        $("#acq-create-receiving").show();
1575
                        $("#acq-create-ordering").hide();
1576
                        if(row.items && row.items.length) {
1577
                            row.items.forEach(function(item, index) {
1578
                                cloneItemBlock(index, '[% UniqueItemFields | html %]', function(block_id) {
1579
                                    var block = $('#'+block_id).hide();
1580
                                    Object.keys(item).forEach(function(key) {
1581
                                        block
1582
                                            .find('*[name=kohafield][value="'+key+'"]')
1583
                                            .parent()
1584
                                            .find('*[name=field_value]')
1585
                                            .val(item[key].field_value);
1586
                                    });
1587
                                    addItemInList(block_id, '[% UniqueItemFields | html %]');
1588
                                    block.find("input[name='buttonPlus']").val( (window.MSG_ADDITEM_JS_UPDATEITEM ) );
1589
                                    block.find("input[name='buttonPlusMulti']").remove();
1590
                                    block.find("input[name='multiValue']").remove();
1591
                                });
1592
                            });
1593
                        }
1594
                        cloneItemBlock((row.items && row.items.length) || 0, '[% UniqueItemFields | html %]');
1595
                    } else if (effective_create_items == 'ordering') {
1596
                        $("#acq-create-receiving").hide();
1597
                        $("#acq-create-ordering").show();
1598
                        if(row.items.length) {
1599
                            $("#acq-create-ordering tbody").append(
1600
                                row.items.map(function(item) {
1601
                                    var tr = $('<tr id="item_'+item.item_id+'"/>');
1602
                                    _build_item(item, tr);
1603
                                    return tr;
1604
                                })
1605
                            );
1606
                        }
1607
                    } else {
1608
                        if($('#modal-order-main').tabs( "option", "active" ) == 3) {
1609
                            $('#modal-order-main').tabs( "option", "active", 0);
1610
                        }
1611
                        $('#modal-order-main').tabs("disable", "#items-panel");
1612
                    }
1613
                }
1614
                $("#select_currency").hide();
1615
                $("#unitprice").prop("readonly", "");
1616
                $("input[name='change_currency']").prop('checked', false);
1617
                set_modal_buttons();
1618
            };
1619
1620
            $('.modal-prev').click(function() {
1621
                var modal = $("#order_edit");
1622
                keep_row();
1623
                var n = modal.data('n');
1624
                if(n > 0) {
1625
                    n--;
1626
                    modal.data('row', JSON.parse(JSON.stringify(api.row(n).data())));
1627
                    modal.data('n', n);
1628
                    set_editor();
1629
                } else {
1630
                    $('.modal-next, .modal-prev').prop('disabled', true);
1631
                    orders_table.one('draw.dt', function() {
1632
                        var info = api.page.info();
1633
                        n = info.end - info.start - 1;
1634
                        modal.data('row', JSON.parse(JSON.stringify(api.row(n).data())));
1635
                        modal.data('n', n);
1636
                        set_editor();
1637
                    });
1638
                    api.page('previous').draw( 'page' );
1639
                }
1640
            });
1641
1642
            $('.modal-next').click(function() {
1643
                var modal = $("#order_edit");
1644
                keep_row();
1645
                var n = modal.data('n');
1646
                var info = api.page.info();
1647
                if(n < info.end - info.start - 1) {
1648
                    n++;
1649
                    modal.data('row', JSON.parse(JSON.stringify(api.row(n).data())));
1650
                    modal.data('n', n);
1651
                    set_editor();
1652
                } else {
1653
                    $('.modal-next, .modal-prev').prop('disabled', true);
1654
                    orders_table.one('draw.dt', function() {
1655
                        var info = api.page.info();
1656
                        n = 0;
1657
                        modal.data('row', JSON.parse(JSON.stringify(api.row(n).data())));
1658
                        modal.data('n', n);
1659
                        set_editor();
1660
                    });
1661
                    api.page('next').draw( 'page' );
1662
                }
1663
            });
1664
1665
            $('.modal-save').click(function() {
1666
                save_row();
1667
                $("#order_edit").modal('hide');
1668
            })
1669
1670
            $('#modal-order-main').tabs({
1671
                activate: function(event, ui) {
1672
                    var active = ui.newPanel.attr('id')
1673
                    if(active == 'history-panel') {
1674
                        show_subs($("#order_edit").data('row'));
1675
                    }
1676
                }
1677
            });
1678
1679
            $("#order_edit").on("show.bs.modal", function (event) {
1680
                var anchor = $(event.relatedTarget);
1681
                var n = anchor.data("row");
1682
                var row = api.row(n).data();
1683
1684
                var modal = $(this);
1685
                modal.data('row', JSON.parse(JSON.stringify(row)));
1686
                modal.data('n', n);
1687
                modal.data('keep', modal.data('saved')||{});
1688
                $('#modal-order-main').tabs("option", "active", 0);
1689
                set_editor();
1690
            });
1691
/*            $("#order_edit").on("shown.bs.modal", function() {
1692
                var modal = $(this);
1693
1694
                if(modal.data('show_subs')) show_subs(modal.data('row'));
1695
            });*/
1696
            $("#order_edit").on("hide.bs.modal", function() {
1697
                $("#child_orders_table").DataTable().off('preDraw').destroy();
1698
            });
1699
        });
1700
        [% END %]
577
    </script>
1701
    </script>
578
[% END %]
1702
[% END %]
579
1703
(-)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