From: Udo Spallek <info@wissensvermittlung.com>
Date: Wed, 31 May 2006 10:09:52 +0000 (+0000)
Subject: Deliverydate als Option bei Waren-/Dienstleistungs-/Erzeugnisberichten eingefuegt.
X-Git-Tag: release-2.4.0^2~274
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9b3c19f327c600ad9bd08a373176b1cf100dbd61;p=kivitendo-erp.git

Deliverydate als Option bei Waren-/Dienstleistungs-/Erzeugnisberichten eingefuegt.
Dies ist sehr nuetzlich für die Fahrtkostenabrechnung beim Finanzamt.
---

diff --git a/SL/IC.pm b/SL/IC.pm
index e002352a6..dda3b8b4d 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1001,7 +1001,7 @@ sub all_parts {
 		    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|
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 05a4e4983..ef246fa3d 100644
--- 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>
+		<td><input name=l_deliverydate class=checkbox type=checkbox value=Y>&nbsp;|
+    . $locale->text('deliverydate') . qq|</td>    
 	      </tr>
             </table>
           </td>
@@ -1419,8 +1421,12 @@ sub generate_report {
     $option   .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
   }
 
+  if ($form->{l_deliverydate}) {
+    $callback .= "&deliverydate=$form->{deliverydate}";
+  }
+
   @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}) {
@@ -1557,6 +1563,11 @@ sub generate_report {
     . $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;
 
@@ -1708,6 +1719,8 @@ sub generate_report {
       . $form->format_amount(\%myconfig, $ref->{soldtotal}, '', "&nbsp;")
       . "</td>";
 
+    $column_data{deliverydate} = "<td>$ref->{deliverydate}</td>";
+
     $i++;
     $i %= 2;
     print "<tr class=listrow$i>";
@@ -2612,6 +2625,8 @@ sub assembly_row {
 
     $column_data{total} = qq|<td align=right>$linetotal</td>|;
 
+    $column_data{deliverydate} = qq|<td align=right>$deliverydate</td>|;
+
     print qq|
         <tr>|;
 
diff --git a/locale/de/ic b/locale/de/ic
index c11470d8d..13d9c535a 100644
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -184,6 +184,7 @@ $self{texts} = {
   'button'                      => '?',
   'choice'                      => 'auswählen',
   'choice part'                 => 'Artikel auswählen',
+  'deliverydate'                => 'Lieferdatum',
   'ea'                          => 'St.',
   'emailed to'                  => 'gemailt an',
   'hr'                          => 'Stunde',