epic-s6ts

[kivitendo-erp.git] / js / kivi.TimeRecording.js

diff --git a/js/kivi.TimeRecording.js b/js/kivi.TimeRecording.js
index dd44411..710f272 100644 (file)
--- 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);
       }
     });
   };