Lines 60-66
Link Here
|
60 |
|
60 |
|
61 |
<div class="col"> |
61 |
<div class="col"> |
62 |
<fieldset class="action"> |
62 |
<fieldset class="action"> |
63 |
<button class="save btn btn-primary" disabled>Save</button> |
63 |
<button class="save btn btn-primary" disabled>Confirm</button> |
64 |
<a class="cancel btn btn-default" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1">Cancel</a> |
64 |
<a class="cancel btn btn-default" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1">Cancel</a> |
65 |
</fieldset> |
65 |
</fieldset> |
66 |
<div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div> |
66 |
<div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div> |
Lines 217-223
Link Here
|
217 |
<ol> |
217 |
<ol> |
218 |
<li> |
218 |
<li> |
219 |
<label for="datereceived">Date received: </label> |
219 |
<label for="datereceived">Date received: </label> |
220 |
<input type="text" size="10" id="datereceived" name="datereceived" class="datepicker" /> |
220 |
<input type="text" size="10" id="datereceived" name="datereceived" class="flatpickr" /> |
221 |
</li> |
221 |
</li> |
222 |
<li> |
222 |
<li> |
223 |
<label for="bookfund">Fund: </label> |
223 |
<label for="bookfund">Fund: </label> |
Lines 358-364
Link Here
|
358 |
<style> |
358 |
<style> |
359 |
@media (min-width: 1200px) { |
359 |
@media (min-width: 1200px) { |
360 |
#receive-modal, #receive-modal .modal-content { |
360 |
#receive-modal, #receive-modal .modal-content { |
361 |
width: 1150px; |
361 |
width: 98%; |
362 |
} |
362 |
} |
363 |
} |
363 |
} |
364 |
#receive-modal .modal-body { |
364 |
#receive-modal .modal-body { |
Lines 461-468
Link Here
|
461 |
var funds_tree = []; |
461 |
var funds_tree = []; |
462 |
|
462 |
|
463 |
var QTY_TOTAL = _("Receiving %0$s out of %1$s"); |
463 |
var QTY_TOTAL = _("Receiving %0$s out of %1$s"); |
464 |
var EDIT = _("edit"); |
464 |
var EDIT = _("Edit"); |
465 |
var MOD_TITLE = _("Edit %s"); |
465 |
var MOD_TITLE = _("Edit order #%s (%s)"); |
466 |
var SUGGESTION = _("suggestion #%s"); |
466 |
var SUGGESTION = _("suggestion #%s"); |
467 |
var FUND_KEEP = _("Keep current (%0$s - %1$s)"); |
467 |
var FUND_KEEP = _("Keep current (%0$s - %1$s)"); |
468 |
var FUNC_CUR = _("(Current: %0$s - %1$s)"); |
468 |
var FUNC_CUR = _("(Current: %0$s - %1$s)"); |
Lines 572-578
Link Here
|
572 |
"searchable": false, |
572 |
"searchable": false, |
573 |
"orderable": false, |
573 |
"orderable": false, |
574 |
"render": function(data, type, row, meta) { |
574 |
"render": function(data, type, row, meta) { |
575 |
return '<a data-toggle="modal" href="#order_edit" data-row="'+meta.row+'" class="order_edit_toggle">'+EDIT+'</a>'; |
575 |
return '<a class="btn btn-default btn-xs" data-toggle="modal" href="#order_edit" data-row="'+meta.row+'" class="order_edit_toggle" role="button"><i class="fa fa-pencil" aria-hidden="true"></i> '+EDIT+'</a>'; |
576 |
} |
576 |
} |
577 |
} |
577 |
} |
578 |
] |
578 |
] |
Lines 1024-1030
Link Here
|
1024 |
modal.data('row', row); |
1024 |
modal.data('row', row); |
1025 |
} |
1025 |
} |
1026 |
$('input, select, textarea', '.modal-body').val(null) |
1026 |
$('input, select, textarea', '.modal-body').val(null) |
1027 |
modal.find(".modal-title").text(MOD_TITLE.format(row.biblio.title)); |
1027 |
modal.find(".modal-title").text(MOD_TITLE.format(escape_str(row.order_id),escape_str(row.biblio.title))); |
1028 |
["title", "author", "copyright_date", "isbn", "series_title"].forEach(function(key){ |
1028 |
["title", "author", "copyright_date", "isbn", "series_title"].forEach(function(key){ |
1029 |
var o = modal.find(".modal-body #biblio_"+key); |
1029 |
var o = modal.find(".modal-body #biblio_"+key); |
1030 |
if(row.biblio[key] !== null) { |
1030 |
if(row.biblio[key] !== null) { |
Lines 1068-1074
Link Here
|
1068 |
} |
1068 |
} |
1069 |
|
1069 |
|
1070 |
var effective_create_items = row.basket.create_items || AcqCreateItem; |
1070 |
var effective_create_items = row.basket.create_items || AcqCreateItem; |
1071 |
$("#datereceived").val(row.date_received||$date(new Date().toISOString())).change(); |
1071 |
$("#datereceived").val(row.date_received||$date(new Date().toISOString())); |
1072 |
$("#bookfund option[value='']").html(FUND_KEEP.format(row.fund.budget.budget_period_description, row.fund.name)); |
1072 |
$("#bookfund option[value='']").html(FUND_KEEP.format(row.fund.budget.budget_period_description, row.fund.name)); |
1073 |
if(row.fund_id != row.fund.fund_id) { |
1073 |
if(row.fund_id != row.fund.fund_id) { |
1074 |
$("#bookfund").val(row.fund_id); |
1074 |
$("#bookfund").val(row.fund_id); |
Lines 1083-1095
Link Here
|
1083 |
var rrp_txt; |
1083 |
var rrp_txt; |
1084 |
var ecost_txt; |
1084 |
var ecost_txt; |
1085 |
if(invoiceincgst == "1") { |
1085 |
if(invoiceincgst == "1") { |
1086 |
rrp_txt = Number(row.rrp_tax_included).format_price()+'<span class="hint">'+ADJ_TAX_INC.format(active_currency)+"</span>"; |
1086 |
rrp_txt = Number(row.rrp_tax_included).format_price()+'<span class="hint"> '+ADJ_TAX_INC.format(active_currency)+"</span>"; |
1087 |
ecost_txt = Number(row.ecost_tax_included).format_price()+'<span class="hint">'+TAX_INC+"</span>"; |
1087 |
ecost_txt = Number(row.ecost_tax_included).format_price()+'<span class="hint"> '+TAX_INC+"</span>"; |
1088 |
$("#unitprice").val(row.unit_price_tax_included); |
1088 |
$("#unitprice").val(row.unit_price_tax_included); |
1089 |
$("#unitprice_hint").html(TAX_INC); |
1089 |
$("#unitprice_hint").html(TAX_INC); |
1090 |
} else { |
1090 |
} else { |
1091 |
rrp_txt = Number(row.rrp_tax_excluded).format_price()+'<span class="hint">'+ADJ_TAX_EXC.format(active_currency)+"</span>"; |
1091 |
rrp_txt = Number(row.rrp_tax_excluded).format_price()+'<span class="hint"> '+ADJ_TAX_EXC.format(active_currency)+"</span>"; |
1092 |
ecost_txt = Number(row.ecost_tax_excluded).format_price()+'<span class="hint">'+TAX_EXC+"</span>"; |
1092 |
ecost_txt = Number(row.ecost_tax_excluded).format_price()+'<span class="hint"> '+TAX_EXC+"</span>"; |
1093 |
$("#unitprice").val(row.unit_price_tax_excluded); |
1093 |
$("#unitprice").val(row.unit_price_tax_excluded); |
1094 |
$("#unitprice_hint").html(TAX_EXC); |
1094 |
$("#unitprice_hint").html(TAX_EXC); |
1095 |
} |
1095 |
} |
1096 |
- |
|
|