X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=e076691a1b326263f13d93e0606ddbc42ec78d2c;hb=a9d015d8e68020faaed94c1d9db08e0151b84c92;hp=6bf3e938e5507d63110e6c7519c4bb619300d362;hpb=ddafc28fb762945a988c0ee5a48216fd4746163b;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 6bf3e938e..e076691a1 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -37,35 +37,68 @@ use SL::IR;
use SL::IS;
use SL::PE;
-require "$form->{path}/io.pl";
-require "$form->{path}/arap.pl";
+require "bin/mozilla/io.pl";
+require "bin/mozilla/arap.pl";
1;
# end of main
-sub add {
+# For locales.pl:
+# $locale->text('Edit the purchase_order');
+# $locale->text('Edit the sales_order');
+# $locale->text('Edit the request_quotation');
+# $locale->text('Edit the sales_quotation');
+
+# $locale->text('Workflow purchase_order');
+# $locale->text('Workflow sales_order');
+# $locale->text('Workflow request_quotation');
+# $locale->text('Workflow sales_quotation');
+
+sub set_headings {
$lxdebug->enter_sub();
+ my ($action) = @_;
+
if ($form->{type} eq 'purchase_order') {
- $form->{title} = $locale->text('Add Purchase Order');
- $form->{vc} = 'vendor';
+ $form->{title} = $action eq "edit" ?
+ $locale->text('Edit Purchase Order') :
+ $locale->text('Add Purchase Order');
+ $form->{heading} = $locale->text('Purchase Order');
+ $form->{vc} = 'vendor';
}
if ($form->{type} eq 'sales_order') {
- $form->{title} = $locale->text('Add Sales Order');
- $form->{vc} = 'customer';
+ $form->{title} = $action eq "edit" ?
+ $locale->text('Edit Sales Order') :
+ $locale->text('Add Sales Order');
+ $form->{heading} = $locale->text('Sales Order');
+ $form->{vc} = 'customer';
}
if ($form->{type} eq 'request_quotation') {
- $form->{title} = $locale->text('Add Request for Quotation');
- $form->{vc} = 'vendor';
+ $form->{title} = $action eq "edit" ?
+ $locale->text('Edit Request for Quotation') :
+ $locale->text('Add Request for Quotation');
+ $form->{heading} = $locale->text('Request for Quotation');
+ $form->{vc} = 'vendor';
}
if ($form->{type} eq 'sales_quotation') {
- $form->{title} = $locale->text('Add Quotation');
- $form->{vc} = 'customer';
+ $form->{title} = $action eq "edit" ?
+ $locale->text('Edit Quotation') :
+ $locale->text('Add Quotation');
+ $form->{heading} = $locale->text('Quotation');
+ $form->{vc} = 'customer';
}
+ $lxdebug->leave_sub();
+}
+
+sub add {
+ $lxdebug->enter_sub();
+
+ set_headings("add");
+
$form->{callback} =
- "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&path=$form->{path}&password=$form->{password}"
+ "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&order_links;
@@ -77,22 +110,29 @@ sub add {
sub edit {
$lxdebug->enter_sub();
+ # show history button
+ $form->{javascript} = qq||;
+ #/show hhistory button
+
+ $form->{simple_save} = 0;
+
+ set_headings("edit");
# editing without stuff to edit? try adding it first
if ($form->{rowcount}) {
- map { $id++ if $form->{"id_$_"} } (1 .. $form->{rowcount});
+ map { $id++ if $form->{"multi_id_$_"} } (1 .. $form->{rowcount});
if (!$id) {
# reset rowcount
undef $form->{rowcount};
&add;
+ $lxdebug->leave_sub();
return;
}
- } else {
- if (!$form->{id}) {
- &add;
- return;
- }
+ } elsif (!$form->{id}) {
+ &add;
+ $lxdebug->leave_sub();
+ return;
}
if ($form->{print_and_save}) {
@@ -102,26 +142,7 @@ sub edit {
$printer_id = $form->{printer_id};
}
- if ($form->{type} eq 'purchase_order') {
- $form->{title} = $locale->text('Edit Purchase Order');
- $form->{heading} = $locale->text('Purchase Order');
- $form->{vc} = 'vendor';
- }
- if ($form->{type} eq 'sales_order') {
- $form->{title} = $locale->text('Edit Sales Order');
- $form->{heading} = $locale->text('Sales Order');
- $form->{vc} = 'customer';
- }
- if ($form->{type} eq 'request_quotation') {
- $form->{title} = $locale->text('Edit Request for Quotation');
- $form->{heading} = $locale->text('Request for Quotation');
- $form->{vc} = 'vendor';
- }
- if ($form->{type} eq 'sales_quotation') {
- $form->{title} = $locale->text('Edit Quotation');
- $form->{heading} = $locale->text('Quotation');
- $form->{vc} = 'customer';
- }
+ set_headings("edit");
&order_links;
&prepare_order;
@@ -146,6 +167,8 @@ sub order_links {
# set jscalendar
$form->{jscalendar} = $jscalendar;
+ my $editing = $form->{id};
+
OE->retrieve(\%myconfig, \%$form);
if ($form->{payment_id}) {
@@ -158,6 +181,8 @@ sub order_links {
$taxzone_id = $form->{taxzone_id};
}
+ $salesman_id = $form->{salesman_id} if ($editing);
+
# if multiple rowcounts (== collective order) then check if the
# there were more than one customer (in that case OE::retrieve removes
@@ -187,7 +212,7 @@ sub order_links {
$intnotes = $form->{intnotes};
# get customer / vendor
- if ($form->{type} =~ /(purchase_order|request_quotation|receive_order)/) {
+ if ($form->{type} =~ /(purchase_order|request_quotation)/) {
IR->get_vendor(\%myconfig, \%$form);
#quote all_vendor Bug 133
@@ -196,7 +221,7 @@ sub order_links {
}
}
- if ($form->{type} =~ /(sales|ship)_(order|quotation)/) {
+ if ($form->{type} =~ /sales_(order|quotation)/) {
IS->get_customer(\%myconfig, \%$form);
#quote all_vendor Bug 133
@@ -215,7 +240,7 @@ sub order_links {
if ($taxzone_id) {
$form->{taxzone_id} = $taxzone_id;
}
- $form->{intnotes} = $intnotes;
+ $form->{intnotes} = $intnotes if $intnotes;
($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} };
$form->{"old$form->{vc}"} =
qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
@@ -224,7 +249,8 @@ sub order_links {
if (@{ $form->{"all_$form->{vc}"} }) {
$form->{ $form->{vc} } =
qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
- map { $form->{"select$form->{vc}"} .= "\n" }
(@{ $form->{"all_$form->{vc}"} });
}
@@ -234,7 +260,7 @@ sub order_links {
$form->{defaultcurrency} = $curr[0];
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
- map { $form->{selectcurrency} .= "\n" } @curr;
$form->{taxincluded} = $taxincluded if ($form->{id});
@@ -245,7 +271,7 @@ sub order_links {
map {
$form->{selectdepartment} .=
- "\n"
} (@{ $form->{all_departments} });
}
@@ -254,24 +280,22 @@ sub order_links {
# sales staff
if (@{ $form->{all_employees} }) {
$form->{selectemployee} = "";
- map { $form->{selectemployee} .= "\n" }
(@{ $form->{all_employees} });
}
# forex
$form->{forex} = $form->{exchangerate};
+ $form->{salesman_id} = $salesman_id if ($editing);
+
$lxdebug->leave_sub();
}
sub prepare_order {
$lxdebug->enter_sub();
- $form->{format} = "pdf";
- $form->{media} = "screen";
$form->{formname} = $form->{type} unless $form->{formname};
- map { $form->{$_} =~ s/\"/"/g }
- qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact);
my $i = 0;
foreach $ref (@{ $form->{form_details} }) {
$form->{rowcount} = ++$i;
@@ -313,8 +337,13 @@ 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
+ shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact
+ shiptophone shiptofax shiptodepartment_1 shiptodepartment_2);
# use JavaScript Calendar or not
$form->{jsscript} = $form->{jscalendar};
@@ -332,12 +361,12 @@ sub form_header {
# with JavaScript Calendar
$button1 = qq|
-
{transdate}> |
+ {transdate} onBlur=\"check_right_date_format(this)\"> |
text('button') . qq|> |
|;
$button2 = qq|
- {reqdate}> |
+ {reqdate} onBlur=\"check_right_date_format(this)\"> |
text('button') . qq|> |
|;
@@ -351,24 +380,31 @@ sub form_header {
# without JavaScript Calendar
$button1 = qq|
- {transdate}> | |;
+ {transdate} onBlur=\"check_right_date_format(this)\"> | |;
$button2 = qq|
- {reqdate}> | |;
+ {reqdate} onBlur=\"check_right_date_format(this)\"> | |;
+ }
+
+ my @tmp;
+
+ if (($form->{"type"} eq "sales_order") ||
+ ($form->{"type"} eq "purchase_order")) {
+ push(@tmp, qq|
+
+ |);
}
if ($form->{id}) {
- $openclosed = qq|
+ push(@tmp, qq|
+
+ |);
+ }
+
+ if (@tmp) {
+ $openclosed .= qq|
-
-
- |
+ | . join("\n", @tmp) . qq|
+ |
|;
}
@@ -383,53 +419,93 @@ sub form_header {
#quote select[customer|vendor] Bug 133
$form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"});
- #build contacts
- if ($form->{all_contacts}) {
-
- $form->{selectcontact} = "";
- foreach $item (@{ $form->{all_contacts} }) {
- my $department = ($item->{cp_abteilung}) ? "--$item->{cp_abteilung}" : "";
- if ($form->{cp_id} == $item->{cp_id}) {
- $form->{selectcontact} .=
- "";
- } else {
- $form->{selectcontact} .= "";
- }
- }
- } else {
- $form->{selectcontact} =~ s/ selected//g;
- if ($form->{cp_id} ne "") {
- $form->{selectcontact} =~ s/value=$form->{cp_id}/value=$form->{cp_id} selected/;
+ #substitute \n and \r to \s (bug 543)
+ $form->{"select$form->{vc}"} =~ s/[\n\r]/ /g;
+
+ my @old_project_ids = ($form->{"globalproject_id"});
+ map({ push(@old_project_ids, $form->{"project_id_$_"})
+ if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+
+ $form->get_lists("contacts" => "ALL_CONTACTS",
+ "shipto" => "ALL_SHIPTO",
+ "projects" => { "key" => "ALL_PROJECTS",
+ "all" => 0,
+ "old_id" => \@old_project_ids },
+ "employees" => "ALL_SALESMEN",
+ "taxzones" => "ALL_TAXZONES");
+
+ my %labels;
+ my @values = (undef);
+ foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
+ push(@values, $item->{"cp_id"});
+ $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
+ ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
+ }
+ my $contact =
+ NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+
+ %labels = ();
+ @values = ("");
+ foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
+ push(@values, $item->{"shipto_id"});
+ $labels{$item->{"shipto_id"}} =
+ $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
+ }
+
+ my $shipto = qq|
+ | . $locale->text('Shipping Address') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
+ . qq| | |;
+
+ %labels = ();
+ @values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+ my $globalprojectnumber =
+ NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
+ '-labels' => \%labels,
+ '-default' => $form->{"globalproject_id"}));
+
+ $salesman = "";
+ if ($form->{type} =~ /^sales_/) {
+ %labels = ();
+ @values = ("");
+ foreach my $item (@{ $form->{ALL_SALESMEN} }) {
+ push(@values, $item->{id});
+ $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
}
- }
-
-
- if (@{ $form->{SHIPTO} }) {
- $form->{selectshipto} = "";
- foreach $item (@{ $form->{SHIPTO} }) {
- if ($item->{id} == $form->{shipto_id}) {
- $form->{selectshipto} .=
- "";
- } else {
- $form->{selectshipto} .=
- "";
- }
- }
- } else {
- $form->{selectshipto} =~ s/ selected//g;
- if ($form->{shipto_id} ne "") {
- $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
- }
+ $salesman =
+ qq|
+ | . $locale->text('Salesman') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
+ '-values' => \@values, '-labels' => \%labels))
+ . qq| |
+
|;
}
- $shipto = qq|
- | . $locale->text('Shipping Address') . qq| |
- |
- |;
-
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_TAXZONES"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"description"};
+ }
+ $taxzone = qq|
+
+ | . $locale->text('Steuersatz') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
+ '-values' => \@values, '-labels' => \%labels)) . qq|
+ |
+
|;
$form->{exchangerate} =
$form->format_amount(\%myconfig, $form->{exchangerate});
@@ -445,11 +521,6 @@ sub form_header {
$form->{creditremaining} =
$form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
- $contact =
- ($form->{selectcontact})
- ? qq|\n|
- : qq||;
-
$exchangerate = qq|
{forex}>
|;
@@ -473,13 +544,7 @@ sub form_header {
$vclabel = ucfirst $form->{vc};
$vclabel = $locale->text($vclabel);
- $terms = qq|
-
- | . $locale->text('Terms: Net') . qq| |
- {terms}> |
- . $locale->text('days') . qq| |
-
-|;
+
if ($form->{business}) {
$business = qq|
@@ -513,39 +578,6 @@ sub form_header {
|;
}
- if (@{ $form->{TAXZONE} }) {
- $form->{selecttaxzone} = "";
- foreach $item (@{ $form->{TAXZONE} }) {
- if ($item->{id} == $form->{taxzone_id}) {
- $form->{selecttaxzone} .=
- "";
- } else {
- $form->{selecttaxzone} .=
- "";
- }
-
- }
- } else {
- $form->{selecttaxzone} =~ s/ selected//g;
- if ($form->{taxzone_id} ne "") {
- $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
- }
- }
-
- if ($form->{rowcount} >0) {
- $form->{selecttaxzone} =~ /\n" }
@{ $form->{"all_$form->{vc}"} };
$vclabel = ucfirst $form->{vc};
@@ -1340,7 +1352,7 @@ sub search {
$vc =
($vc)
- ? qq||
+ ? qq||
: qq|{vc} size=35>|;
# departments
@@ -1349,7 +1361,7 @@ sub search {
map {
$form->{selectdepartment} .=
- "\n"
} (@{ $form->{all_departments} });
}
@@ -1360,19 +1372,16 @@ sub search {
| if $form->{selectdepartment};
- if ($form->{type} !~ /(ship_order|receive_order)/) {
- $openclosed = qq|
-
- |
- . $locale->text('Open') . qq| |
- {closed}> |
- . $locale->text('Closed') . qq| |
-
-|;
- } else {
-
- $openclosed = qq|
-
+ my $delivered;
+ if (($form->{"type"} eq "sales_order") ||
+ ($form->{"type"} eq "purchase_order")) {
+ $delivered = qq|
+
+
+ |
+
+ |
+
|;
}
@@ -1383,12 +1392,12 @@ sub search {
# with JavaScript Calendar
$button1 = qq|
-
+ |
text('button') . qq|> |
|;
$button2 = qq|
-
+ |
text('button') . qq|> |
|;
@@ -1401,11 +1410,24 @@ sub search {
# without JavaScript Calendar
$button1 = qq|
- | |;
+ | |;
$button2 = qq|
- | |;
+ | |;
}
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 1 });
+
+ my %labels = ();
+ my @values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+ my $projectnumber =
+ NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
+ '-labels' => \%labels));
+
$form->header;
print qq|
@@ -1423,14 +1445,17 @@ sub search {
$vclabel |
- $vc |
+ $vc |
- $warehouse
$department
$ordlabel |
|
+
+ | . $locale->text("Project Number") . qq| |
+ $projectnumber |
+
| . $locale->text('From') . qq| |
$button1
@@ -1442,7 +1467,13 @@ sub search {
| . $locale->text('Include in Report') . qq| |
- $openclosed
+
+
+ |
+
+ |
+
+ $delivered
| . $locale->text('ID') . qq| |
@@ -1457,6 +1488,7 @@ sub search {
$employee |
|
. $locale->text('Ship via') . qq| |
+ $employee |
|
@@ -1465,6 +1497,8 @@ sub search {
. $locale->text('Tax') . qq| |
|
. $locale->text('Total') . qq| |
+ |
+ . $locale->text('Project Number') . qq| |
|
@@ -1483,7 +1517,6 @@ $jsscript
-{path}>
{login}>
{password}>
{vc}>
@@ -1514,30 +1547,31 @@ sub orders {
$number = $form->escape($form->{$ordnumber});
$name = $form->escape($form->{ $form->{vc} });
$department = $form->escape($form->{department});
- $warehouse = $form->escape($form->{warehouse});
# 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}?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";
# construct callback
$number = $form->escape($form->{$ordnumber}, 1);
$name = $form->escape($form->{ $form->{vc} }, 1);
$department = $form->escape($form->{department}, 1);
- $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}?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";
@columns =
$form->sort_columns("transdate", "reqdate", "id", "$ordnumber",
"name", "netamount", "tax", "amount",
- "curr", "employee", "shipvia", "open",
- "closed");
+ "curr", "employee", "shipvia", "globalprojectnumber",
+ "open", "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;
@@ -1559,9 +1593,7 @@ sub orders {
}
if ($form->{vc} eq 'vendor') {
- if ($form->{type} eq 'receive_order') {
- $form->{title} = $locale->text('Receive Merchandise');
- } elsif ($form->{type} eq 'purchase_order') {
+ if ($form->{type} eq 'purchase_order') {
$form->{title} = $locale->text('Purchase Orders');
} else {
$form->{title} = $locale->text('Request for Quotations');
@@ -1572,14 +1604,10 @@ sub orders {
if ($form->{vc} eq 'customer') {
if ($form->{type} eq 'sales_order') {
$form->{title} = $locale->text('Sales Orders');
- $employee = $locale->text('Salesperson');
- } elsif ($form->{type} eq 'ship_order') {
- $form->{title} = $locale->text('Ship Merchandise');
- $employee = $locale->text('Salesperson');
} else {
$form->{title} = $locale->text('Quotations');
- $employee = $locale->text('Employee');
}
+ $employee = $locale->text('Employee');
$name = $locale->text('Customer');
}
@@ -1601,7 +1629,9 @@ sub orders {
. qq||;
$column_header{quonumber} =
qq| | |
- . $locale->text('Quotation')
+ . ($form->{"type"} eq "request_quotation" ?
+ $locale->text('RFQ') :
+ $locale->text('Quotation'))
. qq| | |;
$column_header{name} =
qq|$name | |;
@@ -1617,10 +1647,14 @@ sub orders {
qq||
. $locale->text('Ship via')
. qq| | |;
+ $column_header{globalprojectnumber} =
+ qq|| . $locale->text('Project Number') . qq| | |;
$column_header{open} =
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 | |;
@@ -1631,12 +1665,6 @@ sub orders {
$option = $locale->text(ucfirst $form->{vc});
$option .= " : $form->{$form->{vc}}";
}
- if ($form->{warehouse}) {
- ($warehouse) = split /--/, $form->{warehouse};
- $option .= "\n " if ($option);
- $option .= $locale->text('Warehouse');
- $option .= " : $warehouse";
- }
if ($form->{department}) {
$option .= "\n " if ($option);
($department) = split /--/, $form->{department};
@@ -1694,9 +1722,6 @@ sub orders {
}
$action = "edit";
- $action = "ship_receive" if ($form->{type} =~ /(ship|receive)_order/);
-
- $warehouse = $form->escape($form->{warehouse});
foreach $oe (@{ $form->{OE} }) {
$form->{rowcount} = ++$j;
@@ -1729,17 +1754,18 @@ sub orders {
$subtotalamount += $oe->{amount};
$column_data{ids} =
- qq| | |;
+ qq| | |;
$column_data{id} = "$oe->{id} | ";
$column_data{transdate} = "$oe->{transdate} | ";
$column_data{reqdate} = "$oe->{reqdate} | ";
$column_data{$ordnumber} =
- "{path}&action=$action&type=$form->{type}&id=$oe->{id}&warehouse=$warehouse&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber} | ";
+ "{type}&id=$oe->{id}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber} | ";
$column_data{name} = "$oe->{name} | ";
$column_data{employee} = "$oe->{employee} | ";
$column_data{shipvia} = "$oe->{shipvia} | ";
+ $column_data{globalprojectnumber} = "" . H($oe->{globalprojectnumber}) . " | ";
if ($oe->{closed}) {
$column_data{closed} = "X | ";
@@ -1748,6 +1774,9 @@ sub orders {
$column_data{closed} = " | ";
$column_data{open} = "X | ";
}
+ $column_data{"delivered"} = "" .
+ ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) .
+ " | ";
$i++;
$i %= 2;
@@ -1799,12 +1828,10 @@ sub orders {
if ($form->{type} =~ /sales_order/) {
print qq|
-
-
@@ -1823,23 +1850,9 @@ sub orders {
{type}>
{vc}>
-{path}>
{login}>
{password}>
-|;
-
- if ($form->{type} !~ /(ship|receive)_order/) {
- print qq|
-|;
- }
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
- print qq|
|