From: Sven Donath <lxo@dexo.de>
Date: Thu, 18 Oct 2012 15:17:12 +0000 (+0200)
Subject: Merge branch 'frameless_w_fixed_header-div'
X-Git-Tag: release-3.0.0beta1~108
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/b18b770e26a958e8d2c29ce48efe6fcbdd78cd17?hp=80050a86b3e95b525d72492602a47d996dbb842a

Merge branch 'frameless_w_fixed_header-div'
---

diff --git a/SL/IC.pm b/SL/IC.pm
index 8895bf888..0f4187094 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -793,7 +793,7 @@ sub all_parts {
   my @apoe_filters         = qw(transdate);
   my @like_filters         = (@simple_filters, @invoice_oi_filters);
   my @all_columns          = (@simple_filters, @makemodel_filters, @apoe_filters, @project_filters, qw(serialnumber));
-  my @simple_l_switches    = (@all_columns, qw(listprice sellprice lastcost priceupdate weight unit bin rop image));
+  my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit bin rop image));
   my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
   my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module qty);
   my @deliverydate_flags   = qw(deliverydate);
@@ -1094,7 +1094,7 @@ sub all_parts {
   if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
     $query =
       qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,
-           p.unit, p.bin,
+           p.unit, p.bin, p.notes,
            p.sellprice, p.listprice, p.lastcost,
            p.rop, p.weight, p.priceupdate,
            p.image, p.drawing, p.microfiche,
diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 90c8661e9..0e65e8acd 100644
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -8,11 +8,11 @@ sub javascripts_inline {
   _setup_focus(),
 }
 
-sub use_javascripts {
+sub use_javascript {
   'js/common.js'
 }
 
-sub use_stylesheets {
+sub use_stylesheet {
   'main.css'
 }
 
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 95fbbdeec..2cbad4f62 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1024,6 +1024,7 @@ sub generate_report {
     'bin'                => { 'text' => $locale->text('Bin'), },
     'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
     'description'        => { 'text' => $locale->text('Part Description'), },
+    'notes'              => { 'text' => $locale->text('Notes'), },
     'drawing'            => { 'text' => $locale->text('Drawing'), },
     'ean'                => { 'text' => $locale->text('EAN'), },
     'image'              => { 'text' => $locale->text('Image'), },
@@ -1206,7 +1207,7 @@ sub generate_report {
   IC->all_parts(\%myconfig, \%$form);
 
   my @columns = qw(
-    partnumber description partsgroup bin onhand rop soldtotal unit listprice
+    partnumber description notes partsgroup bin onhand rop soldtotal unit listprice
     linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
     priceupdate weight image drawing microfiche invnumber ordnumber quonumber
     transdate name serialnumber deliverydate ean projectnumber projectdescription
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index aa9efa203..ffdf29bc2 100644
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -285,6 +285,13 @@
           </td>
          </tr>
 
+         <tr>
+          <td>
+           <input name="l_notes" id="l_notes" class="checkbox" type="checkbox" value="Y">
+           <label for="l_notes">[% 'Notes' | $T8 %]</label>
+          </td>
+         </tr>
+
          [% CUSTOM_VARIABLES_INCLUSION_CODE %]
         </table>
        </td>