projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OrderController - Funtion umbenannt (dependend->dependant)
[kivitendo-erp.git]
/
js
/
kivi.Order.js
diff --git
a/js/kivi.Order.js
b/js/kivi.Order.js
index
eea906d
..
c4aabf7
100644
(file)
--- a/
js/kivi.Order.js
+++ b/
js/kivi.Order.js
@@
-1,12
+1,12
@@
namespace('kivi.Order', function(ns) {
ns.check_cv = function() {
if ($('#type').val() == 'sales_order') {
namespace('kivi.Order', function(ns) {
ns.check_cv = function() {
if ($('#type').val() == 'sales_order') {
- if ($('#order_customer_id').val() == '') {
+ if ($('#order_customer_id').val() ==
=
'') {
alert(kivi.t8('Please select a customer.'));
return false;
}
} else {
alert(kivi.t8('Please select a customer.'));
return false;
}
} else {
- if ($('#order_vendor_id').val() == '') {
+ if ($('#order_vendor_id').val() ==
=
'') {
alert(kivi.t8('Please select a vendor.'));
return false;
}
alert(kivi.t8('Please select a vendor.'));
return false;
}
@@
-138,7
+138,7
@@
namespace('kivi.Order', function(ns) {
email_dialog.dialog("close");
};
email_dialog.dialog("close");
};
- ns.reload_cv_depend
end
_selections = function() {
+ ns.reload_cv_depend
ant
_selections = function() {
var data = $('#order_form').serializeArray();
data.push({ name: 'action', value: 'Order/customer_vendor_changed' });
var data = $('#order_form').serializeArray();
data.push({ name: 'action', value: 'Order/customer_vendor_changed' });
@@
-198,17
+198,18
@@
namespace('kivi.Order', function(ns) {
kivi.run_once_for('.row_entry', 'on_kbd_click_show_hide', function(elt) {
$(elt).keydown(function(event) {
kivi.run_once_for('.row_entry', 'on_kbd_click_show_hide', function(elt) {
$(elt).keydown(function(event) {
- if(event.keyCode == 40 && event.shiftKey == true) {
+ var row;
+ if(event.keyCode == 40 && event.shiftKey === true) {
// shift arrow down
event.preventDefault();
// shift arrow down
event.preventDefault();
-
var
row = $(event.target).parents(".row_entry").first();
+ row = $(event.target).parents(".row_entry").first();
$(row).children().not(':first').show();
return false;
}
$(row).children().not(':first').show();
return false;
}
- if(event.keyCode == 38 && event.shiftKey == true) {
+ if(event.keyCode == 38 && event.shiftKey ==
=
true) {
// shift arrow up
event.preventDefault();
// shift arrow up
event.preventDefault();
-
var
row = $(event.target).parents(".row_entry").first();
+ row = $(event.target).parents(".row_entry").first();
$(row).children().not(':first').hide();
return false;
}
$(row).children().not(':first').hide();
return false;
}
@@
-245,7
+246,7
@@
namespace('kivi.Order', function(ns) {
} else {
dir = "1";
src = "image/down.png";
} else {
dir = "1";
src = "image/down.png";
- }
;
+ }
$('#' + order_by + '_header_id a').append('<img border=0 data-sort-dir=' + dir + ' src=' + src + ' alt="' + kivi.t8('sort items') + '">');
$('#' + order_by + '_header_id a').append('<img border=0 data-sort-dir=' + dir + ' src=' + src + ' alt="' + kivi.t8('sort items') + '">');
@@
-268,7
+269,7
@@
namespace('kivi.Order', function(ns) {
};
ns.add_item = function() {
};
ns.add_item = function() {
- if ($('#add_item_parts_id').val() == '') return;
+ if ($('#add_item_parts_id').val() ==
=
'') return;
if (!ns.check_cv()) return;
$('#row_table_id thead a img').remove();
if (!ns.check_cv()) return;
$('#row_table_id thead a img').remove();
@@
-378,7
+379,7
@@
namespace('kivi.Order', function(ns) {
var editable_div_elt = $(row).find('[name="editable_price"]');
var not_editable_div_elt = $(row).find('[name="not_editable_price"]');
var editable_div_elt = $(row).find('[name="editable_price"]');
var not_editable_div_elt = $(row).find('[name="not_editable_price"]');
- if (price_editable == 1 && source == '') {
+ if (price_editable == 1 && source ==
=
'') {
// editable
$(editable_div_elt).show();
$(not_editable_div_elt).hide();
// editable
$(editable_div_elt).show();
$(not_editable_div_elt).hide();
@@
-413,7
+414,7
@@
namespace('kivi.Order', function(ns) {
var editable_div_elt = $(row).find('[name="editable_discount"]');
var not_editable_div_elt = $(row).find('[name="not_editable_discount"]');
var editable_div_elt = $(row).find('[name="editable_discount"]');
var not_editable_div_elt = $(row).find('[name="not_editable_discount"]');
- if (price_editable == 1 && source == '') {
+ if (price_editable == 1 && source ==
=
'') {
// editable
$(editable_div_elt).show();
$(not_editable_div_elt).hide();
// editable
$(editable_div_elt).show();
$(not_editable_div_elt).hide();
@@
-442,9
+443,9
@@
namespace('kivi.Order', function(ns) {
$(function(){
if ($('#type').val() == 'sales_order') {
$(function(){
if ($('#type').val() == 'sales_order') {
- $('#order_customer_id').change(kivi.Order.reload_cv_depend
end
_selections);
+ $('#order_customer_id').change(kivi.Order.reload_cv_depend
ant
_selections);
} else {
} else {
- $('#order_vendor_id').change(kivi.Order.reload_cv_depend
end
_selections);
+ $('#order_vendor_id').change(kivi.Order.reload_cv_depend
ant
_selections);
}
if ($('#type').val() == 'sales_order') {
}
if ($('#type').val() == 'sales_order') {