X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.TimeRecording.js;h=710f272946a57ea5da73520f2586da5c6860f7a0;hb=b775c378552e6b5bf59f98046cdf4e577cd351df;hp=dd44411cf84c568c59faac5b07ee10e0ad8e314a;hpb=cc1f1d856a432cd669fcec19dfb6938d8c638767;p=kivitendo-erp.git diff --git a/js/kivi.TimeRecording.js b/js/kivi.TimeRecording.js index dd44411cf..710f27294 100644 --- a/js/kivi.TimeRecording.js +++ b/js/kivi.TimeRecording.js @@ -21,12 +21,16 @@ namespace('kivi.TimeRecording', function(ns) { $time.val(kivi.format_time(date)); }; + var order_changed_called; ns.order_changed = function(value) { + order_changed_called = true; + if (!value) { $('#time_recording_customer_id').data('customer_vendor_picker').set_item({}); $('#time_recording_customer_id_name').prop('disabled', false); $('#time_recording_project_id').data('project_picker').set_item({}); $('#time_recording_project_id_name').prop('disabled', false); + $('#time_recording_project_id ~ .ppp_popup_button').show() return; } @@ -36,10 +40,16 @@ namespace('kivi.TimeRecording', function(ns) { $('#time_recording_customer_id_name').prop('disabled', true); $('#time_recording_project_id').data('project_picker').set_item(data.project); $('#time_recording_project_id_name').prop('disabled', true); + $('#time_recording_project_id ~ .ppp_popup_button').hide() }); }; - ns.project_changed = function() { + ns.project_changed = function(event) { + if (order_changed_called) { + order_changed_called = false; + return; + } + var project_id = $('#time_recording_project_id').val(); if (!project_id) { @@ -65,6 +75,7 @@ namespace('kivi.TimeRecording', function(ns) { } if ("project" === elt) { $('#time_recording_project_id_name').prop('disabled', true); + setTimeout(function() {$('#time_recording_project_id ~ .ppp_popup_button').hide();}, 100); } }); };