Merge branch 'f-phone-number-lookup'

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

diff --git a/js/kivi.CustomerVendor.js b/js/kivi.CustomerVendor.js
index 14e02e0..f809e34 100644 (file)
--- a/js/kivi.CustomerVendor.js
+++ b/js/kivi.CustomerVendor.js
@@ -71,7 +71,10 @@ namespace('kivi.CustomerVendor', function(ns) {
         $('#action_delete_contact').show();
       else
         $('#action_delete_contact').hide();
-
+      if (data.contact.disable_cp_main === 1)
+        $("#contact_cp_main").prop("disabled", true);
+      else
+        $("#contact_cp_main").prop("disabled", false);
       if ( params.onFormSet )
         params.onFormSet();
     });
@@ -208,6 +211,7 @@ namespace('kivi.CustomerVendor', function(ns) {
   };
 
   this.inline_report = function(target, source, data){
+//    alert("HALLO S " + source + " --T " + target + " tt D " + data);
     $.ajax({
       url:        source,
       success:    function (rsp) {
@@ -271,7 +275,7 @@ namespace('kivi.CustomerVendor', function(ns) {
         'filter.all:substr:multi::ilike': term,
         'filter.obsolete': 0,
         current:  this.$real.val(),
-        type:     this.o.type,
+        type:     this.o.cv_type,
       };
     },
     set_item: function(item) {
@@ -364,6 +368,7 @@ namespace('kivi.CustomerVendor', function(ns) {
           self.handle_changed_text();
         }
         if (event.which == KEY.ENTER) {
+          event.preventDefault();
           self.handle_changed_text({
             match_none: self.o.action.commit_none,
             match_one:  self.o.action.commit_one,
@@ -394,6 +399,9 @@ namespace('kivi.CustomerVendor', function(ns) {
         },
         select: function(event, ui) {
           self.set_item(ui.item);
+          if (self.o.action.commit_one) {
+            self.run_action(self.o.action.commit_one);
+          }
         },
         search: function(event, ui) {
           if ((event.which == KEY.SHIFT) || (event.which == KEY.CTRL) || (event.which == KEY.ALT))