X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=6207569f672a10b77145dd651fb9d8e7a0c2d943;hb=ff159a4d47b9a2d10744dcfc23da2c63605c8a32;hp=dc05a9add04799aa3afe5049d1adef43bf9ff0f2;hpb=87b5c8e4245710eec1c6257ab4e291080bc900bd;p=kivitendo-erp.git

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index dc05a9add..6207569f6 100644
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -7,7 +7,7 @@ namespace('kivi.Part', function(ns) {
       url:    'controller.pl?action=Part/history&part.id=' + id,
       dialog: { title: kivi.t8('History') },
     });
-  }
+  };
 
   ns.save = function() {
     var data = $('#ic').serializeArray();
@@ -34,7 +34,7 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.set_tab_active_by_index = function (index) {
-    $("#ic_tabs").tabs({active: index})
+    $("#ic_tabs").tabs({active: index});
   };
 
   ns.set_tab_active_by_name= function (name) {
@@ -66,26 +66,32 @@ namespace('kivi.Part', function(ns) {
 
     $('#' + order_by + '_header_id a').append('<img border=0 data-sort-dir=' + dir + ' src=' + src + ' alt="' + kivi.t8('sort items') + '">');
 
-    data.push({ name: 'action',    value: 'Part/reorder_items' },
-              { name: 'order_by',  value: order_by             },
-              { name: 'part_type', value: part_type            },
-              { name: 'sort_dir',  value: dir                  });
+    data.push(
+      { name: 'action',    value: 'Part/reorder_items' },
+      { name: 'order_by',  value: order_by             },
+      { name: 'part_type', value: part_type            },
+      { name: 'sort_dir',  value: dir                  }
+    );
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
   ns.assortment_recalc = function() {
     var data = $('#assortment :input').serializeArray();
-    data.push({ name: 'action', value: 'Part/update_item_totals' },
-              { name: 'part_type', value: 'assortment'                   });
+    data.push(
+      { name: 'action', value: 'Part/update_item_totals' },
+      { name: 'part_type', value: 'assortment'           }
+    );
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
   ns.assembly_recalc = function() {
     var data = $('#assembly :input').serializeArray();
-    data.push( { name: 'action',    value: 'Part/update_item_totals' },
-               { name: 'part_type', value: 'assembly'                        });
+    data.push(
+      { name: 'action',    value: 'Part/update_item_totals' },
+      { name: 'part_type', value: 'assembly'                }
+    );
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
@@ -159,9 +165,11 @@ namespace('kivi.Part', function(ns) {
     $('#row_table_id thead a img').remove();
 
     var data = $('#assortment :input').serializeArray();
-    data.push({ name: 'action', value: 'Part/add_assortment_item' },
-              { name: 'part.id', value: $('#part_id').val()       },
-              { name: 'part.part_type', value: 'assortment'       });
+    data.push(
+      { name: 'action', value: 'Part/add_assortment_item' },
+      { name: 'part.id', value: $('#part_id').val()       },
+      { name: 'part.part_type', value: 'assortment'       }
+    );
     $('#assortment_picker').data('part_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
@@ -171,9 +179,11 @@ namespace('kivi.Part', function(ns) {
     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: 'assembly'       });
+    data.push(
+      { name: 'action', value: 'Part/add_assembly_item' },
+      { name: 'part.id', value: $("#part_id").val()     },
+      { name: 'part.part_type', value: 'assembly'       }
+    );
     $('#assembly_picker').data('part_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
@@ -183,20 +193,20 @@ namespace('kivi.Part', function(ns) {
     data.push({ name: 'part.id',        value: $('#part_id').val() });
     data.push({ name: 'part.part_type', value: $('#part_part_type').val() });
     $.post("controller.pl?action=Part/add_multi_assembly_items", data, kivi.eval_json_result);
-  }
+  };
 
   ns.set_multi_assortment_items = function(data) {
     data.push({ name: 'part.id', value: $('#part_id').val() });
     data.push({ name: 'part.part_type', value: $('#part_part_type').val() });
     $.post("controller.pl?action=Part/add_multi_assortment_items", data, kivi.eval_json_result);
-  }
+  };
 
   ns.close_picker_dialogs = function() {
     $('.part_autocomplete').each(function(_, e) {
       var picker = $(e).data('part_picker');
       if (picker && picker.dialog) picker.close_dialog();
     });
-  }
+  };
 
   ns.redisplay_items = function(data) {
     var old_rows;
@@ -245,6 +255,7 @@ namespace('kivi.Part', function(ns) {
 
     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,9 +264,39 @@ 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);
-  }
+    $.post("controller.pl", { action: 'Part/warehouse_changed', warehouse_id: function(){ return $('#part_warehouse_id').val(); } },   kivi.eval_json_result);
+  };
 
   var KEY = {
     TAB:       9,
@@ -281,7 +322,8 @@ namespace('kivi.Part', function(ns) {
         commit_none: function(){ },
         commit_one:  function(){ $('#update_button').click(); },
         commit_many: function(){ self.open_dialog(); }
-      }
+      },
+      multiple_limit: 100
     }, $real.data('part-picker-data'), options);
     this.$real              = $real;
     this.real_id            = $real.attr('id');
@@ -292,6 +334,7 @@ namespace('kivi.Part', function(ns) {
     this.last_dummy         = this.$dummy.val();
     this.timer              = undefined;
     this.dialog             = undefined;
+    this.multiple_default   = this.o.multiple;
 
     this.init();
   };
@@ -303,16 +346,20 @@ 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(',');
+        data['filter.classification_id:any'] = this.o.classification_id.replaceAll(',', ' ');
 
       if (this.o.unit)
         data['filter.unit'] = this.o.unit.split(',');
@@ -320,6 +367,15 @@ namespace('kivi.Part', function(ns) {
       if (this.o.convertible_unit)
         data['filter.unit_obj.convertible_to'] = this.o.convertible_unit;
 
+      var filter_name = 'all';
+      if (this.o.with_makemodel) {
+        filter_name = 'all_with_makemodel';
+      }
+      if (this.o.with_customer_partnumber) {
+        filter_name = 'all_with_customer_partnumber';
+      }
+      data['filter.' + filter_name + ':substr:multi::ilike'] = term;
+
       return data;
     },
     set_item: function(item) {
@@ -356,11 +412,11 @@ namespace('kivi.Part', function(ns) {
     make_defined_state: function() {
       if (this.state == this.STATES.PICKED) {
         this.annotate_state();
-        return true
-      } else if (this.state == this.STATES.UNDEFINED && this.$dummy.val() === '')
-        this.set_item({})
-      else {
-        this.set_item({ id: this.last_real, name: this.last_dummy })
+        return true;
+      } else if (this.state == this.STATES.UNDEFINED && this.$dummy.val() === '') {
+        this.set_item({});
+      } else {
+        this.set_item({ id: this.last_real, name: this.last_dummy });
       }
       this.annotate_state();
     },
@@ -443,6 +499,7 @@ namespace('kivi.Part', function(ns) {
     },
     open_dialog: function() {
       if (this.o.multiple) {
+        this.o.multiple = this.multiple_default;
         this.dialog = new ns.PickerMultiPopup(this);
       } else {
         this.dialog = new ns.PickerPopup(this);
@@ -460,13 +517,16 @@ namespace('kivi.Part', function(ns) {
             url:      'controller.pl?action=Part/ajax_autocomplete',
             dataType: "json",
             data:     self.ajax_data(req.term),
-            success:  function (data){ rsp(data) }
+            success:  function (data){ rsp(data); }
           }));
         },
         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) {
+        search: function(event) {
           if ((event.which == KEY.SHIFT) || (event.which == KEY.CTRL) || (event.which == KEY.ALT))
             event.preventDefault();
         },
@@ -477,7 +537,7 @@ namespace('kivi.Part', function(ns) {
           self.autocomplete_open = false;
         }
       });
-      this.$dummy.keydown(function(event){ self.handle_keydown(event) });
+      this.$dummy.keydown(function(event){ self.handle_keydown(event); });
       this.$dummy.on('paste', function(){
         setTimeout(function() {
           self.handle_changed_text();
@@ -485,16 +545,16 @@ namespace('kivi.Part', function(ns) {
       });
       this.$dummy.blur(function(){
         window.clearTimeout(self.timer);
-        self.timer = window.setTimeout(function() { self.annotate_state() }, 100);
+        self.timer = window.setTimeout(function() { self.annotate_state(); }, 100);
       });
 
       var popup_button = $('<span>').addClass('ppp_popup_button');
       this.$dummy.after(popup_button);
-      popup_button.click(function() { self.open_dialog() });
+      popup_button.click(function() { self.open_dialog(); });
     },
     run_action: function(code, args) {
       if (typeof code === 'function')
-        code.apply(this, args)
+        code.apply(this, args);
       else
         kivi.run(code, args);
     },
@@ -518,7 +578,9 @@ namespace('kivi.Part', function(ns) {
       var self = this;
       kivi.popup_dialog({
         url: 'controller.pl?action=Part/part_picker_search',
-        data: self.pp.ajax_data(this.pp.$dummy.val()),
+        data: $.extend({
+          real_id: self.pp.real_id,
+        }, self.pp.ajax_data(this.pp.$dummy.val())),
         id: 'part_selection',
         dialog: {
           title: kivi.t8('Part picker'),
@@ -532,8 +594,8 @@ namespace('kivi.Part', function(ns) {
     },
     init_search: function() {
       var self = this;
-      $('#part_picker_filter').keypress(function(e) { self.result_timer(e) }).focus();
-      $('#no_paginate').change(function() { self.update_results() });
+      $('#part_picker_filter').keypress(function(e) { self.result_timer(e); }).focus();
+      $('#no_paginate').change(function() { self.update_results(); });
       this.update_results();
     },
     update_results: function() {
@@ -544,7 +606,7 @@ namespace('kivi.Part', function(ns) {
           no_paginate: $('#no_paginate').prop('checked') ? 1 : 0,
         }, self.pp.ajax_data(function(){
           var val = $('#part_picker_filter').val();
-          return val === undefined ? '' : val
+          return val === undefined ? '' : val;
         })),
         success: function(data){
           $('#part_picker_result').html(data);
@@ -571,10 +633,10 @@ namespace('kivi.Part', function(ns) {
         });
       });
       $('#part_selection').keydown(function(e){
-         if (e.which == KEY.ESCAPE) {
-           self.close_dialog();
-           self.pp.$dummy.focus();
-         }
+        if (e.which == KEY.ESCAPE) {
+          self.close_dialog();
+          self.pp.$dummy.focus();
+        }
       });
     },
     result_timer: function(event) {
@@ -593,7 +655,7 @@ namespace('kivi.Part', function(ns) {
       if (event.which == KEY.ENTER) {
         self.update_results();
       } else {
-        this.timer = window.setTimeout(function() { self.update_results() }, 100);
+        this.timer = window.setTimeout(function() { self.update_results(); }, 100);
       }
     },
     close_dialog: function() {
@@ -616,6 +678,7 @@ namespace('kivi.Part', function(ns) {
         url: 'controller.pl?action=Part/show_multi_items_dialog',
         data: $.extend({
           real_id: self.pp.real_id,
+          show_pos_input: self.pp.o.multiple_pos_input,
         }, self.pp.ajax_data(this.pp.$dummy.val())),
         id: 'jq_multi_items_dialog',
         dialog: {
@@ -640,14 +703,20 @@ namespace('kivi.Part', function(ns) {
       });
 
       $('#multi_items_filter_all_substr_multi_ilike').focus();
-      $('#multi_items_filter_button').click(function(){ self.update_results() });
-      $('#multi_items_filter_reset').click(function(){ $("#multi_items_form").resetForm() });
-      $('#continue_button').click(function(){ self.add_multi_items() });
+      $('#multi_items_filter_button').click(function(){ self.update_results(); });
+      $('#multi_items_filter_reset').click(function(){ $("#multi_items_form").resetForm(); });
+      $('#continue_button').click(function(){ self.add_multi_items(); });
     },
     update_results: function() {
       var self = this;
       var data = $('#multi_items_form').serializeArray();
-      data.push({ name: 'type', value: self.pp.type });
+      data.push({ name: 'type',  value: self.pp.type });
+      data.push({ name: 'limit', value: self.pp.o.multiple_limit });
+      var ppdata = self.pp.ajax_data(function(){
+        var val = $('#multi_items_filter').val();
+        return val === undefined ? '' : val;
+      });
+      $.each(Object.keys(ppdata), function() {data.push({ name: 'multi_items.' + this, value: ppdata[this]});});
       $.ajax({
         url: 'controller.pl?action=Part/multi_items_update_result',
         data: data,
@@ -670,20 +739,20 @@ namespace('kivi.Part', function(ns) {
       $('#multi_items_all_qty').change(function(event){
         $('.multi_items_qty').val($(event.target).val());
       });
-      $('.multi_items_qty').click(function(){ self.set_qty_to_one(this) });
+      $('.multi_items_qty').click(function(){ self.set_qty_to_one(this); });
     },
-    result_timer: function(event) {
+    result_timer: function() {
     },
     close_dialog: function() {
       $('#jq_multi_items_dialog').dialog('close');
     },
     disable_continue: function() {
-      $('#multi_items_result input').off("keydown");
+      $('#multi_items_result input, #multi_items_position').off("keydown");
       $('#continue_button').prop('disabled', true);
     },
     enable_continue: function() {
       var self = this;
-      $('#multi_items_result input').keydown(function(event) {
+      $('#multi_items_result input, #multi_items_position').keydown(function(event) {
         if(event.keyCode == KEY.ENTER) {
           event.preventDefault();
           self.add_multi_items();
@@ -715,23 +784,23 @@ 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() {
     ns.reinit_widgets();
-  }
+  };
 
   $(function(){
     $('#ic').on('focusout', '.reformat_number', function(event) {
-       ns.reformat_number(event);
-    });
-
-    $('.add_makemodel_input').keydown(function(event) {
-      if(event.keyCode == 13) {
-        event.preventDefault();
-        ns.add_makemodel_row();
-        return false;
-      }
+      ns.reformat_number(event);
     });
 
     $('#part_warehouse_id').change(kivi.Part.reload_bin_selection);