From a323d0daf730434b2ba5ccb812df186fe1528e47 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Tue, 18 May 2021 12:59:44 +0200 Subject: [PATCH] =?utf8?q?Zeiterfassung:=20Eingabe:=20Bei=20Auftrags-Wechs?= =?utf8?q?el=20nicht=20Projekt-Wechsel-Event=20ausf=C3=BChren?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sonst wird im Fall "Projekt leer" das Kundenfeld wieder entsperrt. zu "Zeiterfassung: Eingabe: Projekt-Wechsel mit on('set_item:...') registrieren, …" --- js/kivi.TimeRecording.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/js/kivi.TimeRecording.js b/js/kivi.TimeRecording.js index b897b764f..710f27294 100644 --- a/js/kivi.TimeRecording.js +++ b/js/kivi.TimeRecording.js @@ -21,7 +21,10 @@ 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); @@ -41,7 +44,12 @@ namespace('kivi.TimeRecording', function(ns) { }); }; - 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) { -- 2.20.1