PartPicker: auch nach ungültigen oder allen Artikeln suchen können.

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

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index 595db8c..0b0185b 100644 (file)
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -154,7 +154,7 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.add_assortment_item = function() {
-    if ($('#add_assortment_item_id').val() === '') return;
+    if ($('#assortment_picker').val() === '') return;
 
     $('#row_table_id thead a img').remove();
 
@@ -168,12 +168,12 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.add_assembly_item = function() {
-    if ($('#add_assembly_item_id').val() === '') return;
+    if ($('#assembly_picker').val() === '') return;
 
     var data = $('#assembly :input').serializeArray();
     data.push({ name: 'action', value: 'Part/add_assembly_item' },
               { name: 'part.id', value: $("#part_id").val()     },
-              { name: 'part.part_type', value: 'assortment'     });
+              { name: 'part.part_type', value: 'assembly'       });
     $('#assembly_picker').data('part_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
@@ -194,7 +194,7 @@ namespace('kivi.Part', function(ns) {
   ns.close_picker_dialogs = function() {
     $('.part_autocomplete').each(function(_, e) {
       var picker = $(e).data('part_picker');
-      if (picker) picker.close_dialog();
+      if (picker && picker.dialog) picker.close_dialog();
     });
   }
 
@@ -241,10 +241,11 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.add_makemodel_row = function() {
-    if ($('#add_makemodelid').val() === '') return;
+    if ($('#add_makemodel').val() === '') return;
 
     var data = $('#makemodel_table :input').serializeArray();
     data.push({ name: 'action', value: 'Part/add_makemodel_row' });
+    $('#add_makemodel').data('customer_vendor_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
@@ -253,6 +254,36 @@ namespace('kivi.Part', function(ns) {
     $("#makemodel_rows tr:last").find('input[type=text]').filter(':visible:first').focus();
   };
 
+
+  // customerprice
+  ns.customerprice_renumber_positions = function() {
+    $('.customerprice_row [name="position"]').each(function(idx, elt) {
+      $(elt).html(idx+1);
+    });
+  };
+
+  ns.delete_customerprice_row = function(clicked) {
+    var row = $(clicked).closest('tr');
+    $(row).remove();
+
+    ns.customerprice_renumber_positions();
+  };
+
+  ns.add_customerprice_row = function() {
+    if ($('#add_customerprice').val() === '') return;
+
+    var data = $('#customerprice_table :input').serializeArray();
+    data.push({ name: 'action', value: 'Part/add_customerprice_row' });
+    $('#add_customerprice').data('customer_vendor_picker').clear();
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.focus_last_customerprice_input = function () {
+    $("#customerprice_rows tr:last").find('input[type=text]').filter(':visible:first').focus();
+  };
+
+
   ns.reload_bin_selection = function() {
     $.post("controller.pl", { action: 'Part/warehouse_changed', warehouse_id: function(){ return $('#part_warehouse_id').val() } },   kivi.eval_json_result);
   }
@@ -274,7 +305,7 @@ namespace('kivi.Part', function(ns) {
 
   ns.Picker = function($real, options) {
     var self = this;
-    this.o = $.extend({
+    this.o = $.extend(true, {
       limit: 20,
       delay: 50,
       action: {
@@ -304,13 +335,18 @@ namespace('kivi.Part', function(ns) {
     ajax_data: function(term) {
       var data = {
         'filter.all:substr:multi::ilike': term,
-        'filter.obsolete': 0,
         current:  this.$real.val(),
       };
 
       if (this.o.part_type)
         data['filter.part_type'] = this.o.part_type.split(',');
 
+      if (this.o.status) {
+        if (this.o.status == 'active')   data['filter.obsolete'] = 0;
+        if (this.o.status == 'obsolete') data['filter.obsolete'] = 1;
+      } else
+        data['filter.obsolete'] = 0;
+
       if (this.o.classification_id)
         data['filter.classification_id'] = this.o.classification_id.split(',');
 
@@ -388,7 +424,7 @@ namespace('kivi.Part', function(ns) {
             if (callbacks && callbacks.match_many) self.run_action(callbacks.match_many, [ data ]);
           } else {
             self.state = self.STATES.UNDEFINED;
-            if (callbacks && callbacks.match_none) self.run_action(callbacks.match_none);
+            if (callbacks && callbacks.match_none) self.run_action(callbacks.match_none, [ self, self.$dummy.val() ]);
           }
           self.annotate_state();
         }
@@ -424,7 +460,9 @@ namespace('kivi.Part', 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,
             match_many: self.o.action.commit_many
           });
@@ -463,6 +501,9 @@ namespace('kivi.Part', 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))
@@ -558,6 +599,7 @@ namespace('kivi.Part', function(ns) {
             id:   $(this).children('input.part_picker_id').val(),
             name: $(this).children('input.part_picker_description').val(),
             classification_id: $(this).children('input.part_picker_classification_id').val(),
+            ean:  $(this).children('input.part_picker_ean').val(),
             unit: $(this).children('input.part_picker_unit').val(),
             partnumber:  $(this).children('input.part_picker_partnumber').val(),
             description: $(this).children('input.part_picker_description').val(),
@@ -712,6 +754,14 @@ namespace('kivi.Part', function(ns) {
       if (!$(elt).data('part_picker'))
         $(elt).data('part_picker', new kivi.Part.Picker($(elt)));
     });
+
+    kivi.run_once_for('#customerprice_rows', 'customerprice_row_sort_renumber', function(elt) {
+      $(elt).on('sortstop', kivi.Part.customerprice_renumber_positions);
+    });
+
+    kivi.run_once_for('#makemodel_rows', 'makemodel_row_sort_renumber', function(elt) {
+      $(elt).on('sortstop', kivi.Part.makemodel_renumber_positions);
+    });
   }
 
   ns.init = function() {
@@ -723,14 +773,6 @@ namespace('kivi.Part', function(ns) {
        ns.reformat_number(event);
     });
 
-    $('.add_makemodel_input').keydown(function(event) {
-      if(event.keyCode == 13) {
-        event.preventDefault();
-        ns.add_makemodel_row();
-        return false;
-      }
-    });
-
     $('#part_warehouse_id').change(kivi.Part.reload_bin_selection);
 
     ns.init();