From 9b3c19f327c600ad9bd08a373176b1cf100dbd61 Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Wed, 31 May 2006 10:09:52 +0000 Subject: [PATCH] =?utf8?q?Deliverydate=20als=20Option=20bei=20Waren-/Diens?= =?utf8?q?tleistungs-/Erzeugnisberichten=20eingefuegt.=20Dies=20ist=20sehr?= =?utf8?q?=20nuetzlich=20f=C3=BCr=20die=20Fahrtkostenabrechnung=20beim=20F?= =?utf8?q?inanzamt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/IC.pm | 2 +- bin/mozilla/ic.pl | 17 ++++++++++++++++- locale/de/ic | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) 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|  | . $locale->text('soldtotal') . qq| +  | + . $locale->text('deliverydate') . qq| @@ -1419,8 +1421,12 @@ sub generate_report { $option .= $locale->text('soldtotal') . qq| : $form->{soldtotal}
|; } + 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||; + $column_header{deliverydate} = + qq|{revers}&lastsort=$form->{lastsort}>| + . $locale->text('deliverydate') + . qq||; + $form->header; $colspan = $#column_index + 1; @@ -1708,6 +1719,8 @@ sub generate_report { . $form->format_amount(\%myconfig, $ref->{soldtotal}, '', " ") . ""; + $column_data{deliverydate} = "$ref->{deliverydate}"; + $i++; $i %= 2; print ""; @@ -2612,6 +2625,8 @@ sub assembly_row { $column_data{total} = qq|$linetotal|; + $column_data{deliverydate} = qq|$deliverydate|; + print qq| |; 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', -- 2.20.1