PartPicker kann auch nach EAN suchen

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 53d51ced503f6d59b608c245a64e2e4b982d7036..e4bb71226a2c39769fe8a257ecd03086cd18003f 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -549,6 +549,7 @@ sub action_ajax_autocomplete {
      id          => $_->id,
      partnumber  => $_->partnumber,
      description => $_->description,
+     ean         => $_->ean,
      part_type   => $_->part_type,
      unit        => $_->unit,
      cvars       => { map { ($_->config->name => { value => $_->value_as_text, is_valid => $_->is_valid }) } @{ $_->cvars_by_config } },

diff --git a/SL/DB/Manager/Part.pm b/SL/DB/Manager/Part.pm
index 088d4c838c63789ee373890675aa03498f3dc832..d24954bdb62164095071c7ef1796baea5342806f 100644 (file)
--- a/SL/DB/Manager/Part.pm
+++ b/SL/DB/Manager/Part.pm
@@ -22,7 +22,7 @@ __PACKAGE__->add_filter_specs(
   },
   all => sub {
     my ($key, $value, $prefix) = @_;
-    return or => [ map { $prefix . $_ => $value } qw(partnumber description) ]
+    return or => [ map { $prefix . $_ => $value } qw(partnumber description ean) ]
   }
 );
 

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index 6e8e035e95747d7bd524ef4a0dd7430fc7d5c843..94a1fa6f062c2106d9de1e9c7133fc2a58e4b83f 100644 (file)
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -480,6 +480,10 @@ div.cpc_block span.cpc_block_number
 {
   float:left;
 }
+div.ppp_block span.ppp_block_ean {
+  float:left;
+  margin-left:1em;
+}
 div.ppp_block span.ppp_block_description {
   float:right;
   margin-left:1em;
@@ -490,6 +494,11 @@ div.cpc_block span.cpc_block_description {
   margin-left:1em;
   font-weight:bold;
 }
+div.ppp_line span.ppp_block_number,
+div.ppp_line span.ppp_block_ean {
+  float:left;
+  margin-left:1em;
+}
 div.ppp_line span.ppp_block_description,
 div.cpc_line span.cpc_block_description
 {

diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css
index 1bdc788252221c86beff778fabe90d222eca168f..20760f116ff90547df66c7948fa92e095c3b0aef 100644 (file)
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -468,11 +468,20 @@ div.ppp_block span.ppp_block_description {
   float:right;
   font-weight:bold;
 }
+div.ppp_block span.ppp_block_ean {
+  float:left;
+  margin-left:1em;
+}
 div.cpc_block span.cpc_block_description {
   float:left;
   margin-left:1em;
   font-weight:bold;
 }
+div.ppp_line span.ppp_block_number,
+div.ppp_line span.ppp_block_ean {
+  float:left;
+  margin-left:1em;
+}
 div.ppp_line span.ppp_block_description,
 div.cpc_line span.cpc_block_description
 {

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index 9280fcf9c5734ea7066c511c5e662c934554ba24..dc05a9add04799aa3afe5049d1adef43bf9ff0f2 100644 (file)
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -560,6 +560,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(),

diff --git a/templates/webpages/part/_part_picker_result.html b/templates/webpages/part/_part_picker_result.html
index 677e772dbea007fb11fe1e4cb07303ae20b5ef93..ed8ad788ea679b6785141c7d5c13c4b941adf1c8 100644 (file)
--- a/templates/webpages/part/_part_picker_result.html
+++ b/templates/webpages/part/_part_picker_result.html
@@ -11,8 +11,10 @@
   <input type='hidden' class='part_picker_id' value='[% part.id %]'>
   <input type='hidden' class='part_picker_partnumber' value='[% part.partnumber %]'>
   <input type='hidden' class='part_picker_description' value='[% part.displayable_name %]'>
+  <input type='hidden' class='part_picker_ean' value='[% part.ean %]'>
   <input type='hidden' class='part_picker_unit' value='[% part.unit %]'>
   <span class='ppp_block_number'>[% part.partnumber | html %]</span>
+  <span class='ppp_block_ean'>[% part.ean | html %]</span>
   <span class='ppp_block_description'>[% part.description | html %]</span>
   <div style='clear:both;'></div>
   <span class='ppp_block_sellprice'>[% 'Sellprice' | $T8 %]: [% part.sellprice_as_number | html %]</span>