Recommit von r1126 von udo_spallek: Deliverydate als Option bei Waren-/Dienstleistung...

diff --git a/SL/IC.pm b/SL/IC.pm
index 446176d362483de380447bc9a6982e5c5ccd4a37..1ef9dd18e0d6a0c85446a8af5131b8b1410e87e1 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1080,7 +1080,7 @@ sub all_parts {
                    p.priceupdate, p.image, p.drawing, p.microfiche,
                    pg.partsgroup,
                    a.invnumber, a.ordnumber, a.quonumber, i.trans_id,
                    p.priceupdate, p.image, p.drawing, p.microfiche,
                    pg.partsgroup,
                    a.invnumber, a.ordnumber, a.quonumber, i.trans_id,

-                   ct.name|;
+                   ct.name, i.deliverydate|;

 
       if ($form->{bought}) {
         $query = qq|
 
       if ($form->{bought}) {
         $query = qq|

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 29316789303e10415db60b60bd315cfe4df4a101..62758be3efbdbd2ef29902ba10befc444cf455a1 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -356,6 +356,8 @@ sub search {
     . $locale->text('Subtotal') . qq|</td>
                <td><input name=l_soldtotal class=checkbox type=checkbox value=Y>&nbsp;|
     . $locale->text('soldtotal') . qq|</td>
     . $locale->text('Subtotal') . qq|</td>
                <td><input name=l_soldtotal class=checkbox type=checkbox value=Y>&nbsp;|
     . $locale->text('soldtotal') . qq|</td>

+               <td><input name=l_deliverydate class=checkbox type=checkbox value=Y>&nbsp;|
+    . $locale->text('deliverydate') . qq|</td>    

              </tr>
             </table>
           </td>
              </tr>
             </table>
           </td>


@@ -1646,8 +1648,12 @@ sub generate_report {
     $option   .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
   }
 
     $option   .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
   }
 

+  if ($form->{l_deliverydate}) {
+    $callback .= "&deliverydate=$form->{deliverydate}";
+  }
+

   @columns = $form->sort_columns(
   @columns = $form->sort_columns(

-    qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)
+    qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal deliverydate)

   );
 
   if ($form->{l_linetotal}) {
   );
 
   if ($form->{l_linetotal}) {


@@ -1784,6 +1790,11 @@ sub generate_report {
     . $locale->text('soldtotal')
     . qq|</a></th>|;
 
     . $locale->text('soldtotal')
     . qq|</a></th>|;
 

+  $column_header{deliverydate} =
+    qq|<th nowrap><a class=listheading href=$callback&sort=deliverydate&revers=$form->{revers}&lastsort=$form->{lastsort}>|
+    . $locale->text('deliverydate')
+    . qq|</a></th>|;
+

   $form->header;
   $colspan = $#column_index + 1;
 
   $form->header;
   $colspan = $#column_index + 1;
 


@@ -1935,6 +1946,8 @@ sub generate_report {
       . $form->format_amount(\%myconfig, $ref->{soldtotal}, '', "&nbsp;")
       . "</td>";
 
       . $form->format_amount(\%myconfig, $ref->{soldtotal}, '', "&nbsp;")
       . "</td>";
 

+    $column_data{deliverydate} = "<td>$ref->{deliverydate}</td>";
+

     $i++;
     $i %= 2;
     print "<tr class=listrow$i>";
     $i++;
     $i %= 2;
     print "<tr class=listrow$i>";


@@ -2960,6 +2973,8 @@ sub assembly_row {
 
     $column_data{total} = qq|<td align=right>$linetotal</td>|;
 
 
     $column_data{total} = qq|<td align=right>$linetotal</td>|;
 

+    $column_data{deliverydate} = qq|<td align=right>$deliverydate</td>|;
+

     print qq|
         <tr>|;
 
     print qq|
         <tr>|;
 

diff --git a/locale/de/ic b/locale/de/ic
index 311b8db46e979b0edbd642df183dff75d66a3f8c..cebd96b71214c8f531e5555901115a1c37805897 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -212,6 +212,7 @@ aktualisieren wollen?',
   'button'                      => '?',
   'choice'                      => 'auswählen',
   'choice part'                 => 'Artikel auswählen',
   'button'                      => '?',
   'choice'                      => 'auswählen',
   'choice part'                 => 'Artikel auswählen',

+  'deliverydate'                => 'Lieferdatum',

   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'list'                        => 'auflisten',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'list'                        => 'auflisten',