X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=10e71ac17ae2e3365e226536d55f492c3462607d;hb=828bd68326ee5bd732d3d01e9f166dacb7424657;hp=d0ee922b533530f6d8fea5607230cd8ccf3ae206;hpb=8ec0d29a33e23ce962b807e87cc8b577c8c98ec2;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index d0ee922b5..10e71ac17 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -284,7 +284,6 @@ sub order_links {
sub prepare_order {
$lxdebug->enter_sub();
- $form->{media} = "screen";
$form->{formname} = $form->{type} unless $form->{formname};
my $i = 0;
@@ -328,8 +327,8 @@ sub prepare_order {
sub form_header {
$lxdebug->enter_sub();
- $checkedopen = ($form->{closed}) ? "" : "checked";
- $checkedclosed = ($form->{closed}) ? "checked" : "";
+ my $checkedclosed = $form->{"closed"} ? "checked" : "";
+ my $checkeddelivered = $form->{"delivered"} ? "checked" : "";
map { $form->{$_} =~ s/\"/"/g }
qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname
@@ -380,15 +379,20 @@ sub form_header {
$openclosed = qq|
-
- |
+
+
+|;
+
+ if (($form->{"type"} eq "sales_order") ||
+ ($form->{"type"} eq "purchase_order")) {
+ $openclosed .= qq|
+
+
+|;
+ }
+
+ $openclosed .= qq|
+
|;
}
@@ -698,7 +702,7 @@ sub form_header {
$onload = qq|alert('$credittext')|;
}
- $form->{"javascript"} .= qq||;
$form->header;
@@ -1383,6 +1387,19 @@ sub search {
|;
}
+ my $delivered;
+ if (($form->{"type"} eq "sales_order") ||
+ ($form->{"type"} eq "purchase_order")) {
+ $delivered = qq|
+
+
+ |
+
+ |
+
+|;
+ }
+
# use JavaScript Calendar or not
$form->{jsscript} = $jscalendar;
$jsscript = "";
@@ -1450,6 +1467,7 @@ sub search {
$openclosed
+ $delivered
| . $locale->text('ID') . qq| |
@@ -1525,7 +1543,7 @@ sub orders {
# construct href
$href =
- "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse";
+ "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse";
# construct callback
$number = $form->escape($form->{$ordnumber}, 1);
@@ -1534,17 +1552,20 @@ sub orders {
$warehouse = $form->escape($form->{warehouse}, 1);
$callback =
- "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse";
+ "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse";
@columns =
$form->sort_columns("transdate", "reqdate", "id", "$ordnumber",
"name", "netamount", "tax", "amount",
"curr", "employee", "shipvia", "open",
- "closed");
+ "closed", "delivered");
$form->{l_open} = $form->{l_closed} = "Y"
if ($form->{open} && $form->{closed});
+ $form->{"l_delivered"} = "Y"
+ if ($form->{"delivered"} && $form->{"notdelivered"});
+
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
@@ -1630,6 +1651,8 @@ sub orders {
qq|| . $locale->text('O') . qq| | |;
$column_header{closed} =
qq|| . $locale->text('C') . qq| | |;
+ $column_header{"delivered"} =
+ qq|| . $locale->text("Delivered") . qq| | |;
$column_header{employee} =
qq|$employee | |;
@@ -1757,6 +1780,9 @@ sub orders {
$column_data{closed} = " | ";
$column_data{open} = "X | ";
}
+ $column_data{"delivered"} = "" .
+ ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) .
+ " | ";
$i++;
$i %= 2;
|