X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=29970c4ee81e197e9836a9f8d67b26a5f37f4ed4;hb=566608b739ced48d1ca22dfa85a4ab4590e67c75;hp=1e3034129c418cc1a7a790ccd4cbac5bcb5aeeb6;hpb=54e4131e091831e00a861fe2c4f53e344b87ddca;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 1e3034129..29970c4ee 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -185,7 +185,7 @@ sub search {
|
| . $locale->text('From') . qq| |
$button1
- | . $locale->text('To') . qq| |
+ | . $locale->text('To (time)') . qq| |
$button2
@@ -235,7 +235,7 @@ sub search {
| . $locale->text('From') . qq| |
$button1
- | . $locale->text('To') . qq| |
+ | . $locale->text('To (time)') . qq| |
$button2
@@ -313,7 +313,7 @@ sub search {
|
@@ -1594,7 +1596,7 @@ sub generate_report {
if ($form->{transdateto}) {
$callback .= "&transdateto=$form->{transdateto}";
$option .= "\n
"
- . $locale->text('To')
+ . $locale->text('To (time)')
. " "
. $locale->date(\%myconfig, $form->{transdateto}, 1);
}
@@ -1646,8 +1648,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}) {
@@ -1784,6 +1790,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;
@@ -1935,6 +1946,8 @@ sub generate_report {
. $form->format_amount(\%myconfig, $ref->{soldtotal}, '', " ")
. "";
+ $column_data{deliverydate} = "$ref->{deliverydate} | ";
+
$i++;
$i %= 2;
print "";
@@ -2058,6 +2071,8 @@ sub edit {
IC->get_part(\%myconfig, \%$form);
+ $form->{"original_partnumber"} = $form->{"partnumber"};
+
$form->{title} = $locale->text('Edit ' . ucfirst $form->{item});
&link_part;
@@ -2209,7 +2224,7 @@ sub form_header {
}
$notes =
- qq||;
+ qq||;
if (($rows = $form->numtextrows($form->{description}, 40)) > 1) {
$description =
qq||;
@@ -2243,27 +2258,6 @@ sub form_header {
|;
- $form->{selectadr} = "";
- if (@{ $form->{ADR} }) {
- foreach $item (@{ $form->{ADR} }) {
- if ($item->{id} == $form->{adr_id}) {
- $form->{selectadr} .=
- "