X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=b2a4da64a9da486cb8a38a97677ea9be11798207;hb=8e58d69a5a65f4887c7722dfae72a658b883eeec;hp=05a4e4983c2b951d450c570886cf5223b41eb53f;hpb=15a5a90c003d147b7f842253515cd27fe23bd97f;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 05a4e4983..b2a4da64a 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|
|;
@@ -2700,9 +2715,12 @@ sub update {
sub save {
$lxdebug->enter_sub();
- # check if there is a part number
+ # check if there is a part number - commented out, cause there is an automatic allocation of numbers
# $form->isblank("partnumber", $locale->text(ucfirst $form->{item}." Part Number missing!"));
+ # check if there is a description
+ $form->isblank("description", $locale->text("Part Description missing!"));
+
if ($form->{obsolete}) {
$form->error(
$locale->text(