X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=9820c3c42125cf507650b6d76bce206ed80fcfd7;hb=87c7db6a14d2276b72c85a8423e3995f20255b6a;hp=abf4bf60e4ad6f1f4e3a71ca5f6415d0b5b3bd50;hpb=d946f59b7c4c8069ecb83834ed34251056155e53;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index abf4bf60e..9820c3c42 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -120,19 +120,19 @@ sub 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}) {
@@ -167,6 +167,8 @@ sub order_links {
# set jscalendar
$form->{jscalendar} = $jscalendar;
+ my $editing = $form->{id};
+
OE->retrieve(\%myconfig, \%$form);
if ($form->{payment_id}) {
@@ -179,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
@@ -245,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}"} });
}
@@ -255,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});
@@ -266,7 +271,7 @@ sub order_links {
map {
$form->{selectdepartment} .=
- "\n"
} (@{ $form->{all_departments} });
}
@@ -275,13 +280,15 @@ 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();
}
@@ -410,6 +417,9 @@ sub form_header {
#quote select[customer|vendor] Bug 133
$form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"});
+ #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"}));
@@ -418,9 +428,11 @@ sub form_header {
"shipto" => "ALL_SHIPTO",
"projects" => { "key" => "ALL_PROJECTS",
"all" => 0,
- "old_id" => \@old_project_ids });
+ "old_id" => \@old_project_ids },
+ "employees" => "ALL_SALESMEN");
- my (%labels, @values);
+ my %labels;
+ my @values = (undef);
foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
push(@values, $item->{"cp_id"});
$labels{$item->{"cp_id"}} = $item->{"cp_name"} .
@@ -456,6 +468,25 @@ sub form_header {
'-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};
+ }
+
+ $salesman =
+ qq|
+ | . $locale->text('Salesman') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
+ '-values' => \@values, '-labels' => \%labels))
+ . qq| |
+
|;
+ }
+
$form->{exchangerate} =
$form->format_amount(\%myconfig, $form->{exchangerate});
@@ -644,7 +675,10 @@ sub form_header {
$vc =
($form->{"select$form->{vc}"})
- ? qq|\n{vc}"}">|
+ ? qq|\n{vc}"}) . qq|">|
: qq|{vc} value="$form->{$form->{vc}}" size=35>|;
$department = qq|
@@ -665,7 +699,7 @@ sub form_header {
$employee = qq|
{customer_klass}>
- | . $locale->text('Salesperson') . qq| |
+ | . $locale->text('Employee') . qq| |
|
|
@@ -803,6 +837,7 @@ print qq|
$openclosed
$employee
+ $salesman
$ordnumber
| . $locale->text('Project Number') . qq| |
@@ -967,7 +1002,7 @@ sub form_footer {
$intnotes |
| . $locale->text('Payment Terms') . qq| |
- |
@@ -1028,7 +1063,7 @@ sub form_footer {
|;
- &print_options;
+ print_options();
print qq|
|
@@ -1297,7 +1332,7 @@ sub search {
$form->{vc} = 'customer';
$ordlabel = $locale->text('Order Number');
$ordnumber = 'ordnumber';
- $employee = $locale->text('Salesperson');
+ $employee = $locale->text('Employee');
}
if ($form->{type} eq 'sales_quotation') {
@@ -1312,7 +1347,7 @@ sub search {
$form->all_vc(\%myconfig, $form->{vc},
($form->{vc} eq 'customer') ? "AR" : "AP");
- map { $vc .= "\n" }
@{ $form->{"all_$form->{vc}"} };
$vclabel = ucfirst $form->{vc};
@@ -1323,7 +1358,7 @@ sub search {
$vc =
($vc)
- ? qq|{vc}>|
+ ? qq|{vc}>|
: qq|{vc} size=35>|;
# departments
@@ -1332,7 +1367,7 @@ sub search {
map {
$form->{selectdepartment} .=
- "\n"
} (@{ $form->{all_departments} });
}
@@ -1416,7 +1451,7 @@ sub search {
$vclabel |
- $vc |
+ $vc |
$department
@@ -1576,11 +1611,10 @@ sub orders {
if ($form->{vc} eq 'customer') {
if ($form->{type} eq 'sales_order') {
$form->{title} = $locale->text('Sales Orders');
- $employee = $locale->text('Salesperson');
} else {
$form->{title} = $locale->text('Quotations');
- $employee = $locale->text('Employee');
}
+ $employee = $locale->text('Employee');
$name = $locale->text('Customer');
}
@@ -1727,7 +1761,7 @@ 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} | ";
@@ -2442,6 +2476,10 @@ sub purchase_order {
OE->close_order(\%myconfig, \%$form);
}
+ if ($form->{type} =~ /^sales_/) {
+ delete($form->{ordnumber});
+ }
+
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Purchase Order');
@@ -2461,6 +2499,10 @@ sub sales_order {
OE->close_order(\%myconfig, $form);
}
+ if ($form->{type} eq "purchase_order") {
+ delete($form->{ordnumber});
+ }
+
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Sales Order');
@@ -2512,22 +2554,22 @@ sub poso {
sub e_mail {
$lxdebug->enter_sub();
- $form->{saveasnew} = 1;
- $form->{closed} = 0;
$form->{print_and_save} = 1;
- map { delete $form->{$_} } qw(printed emailed queued);
- # Let Lx-Office assign a new order number if the user hasn't changed the
- # previous one. If it has been changed manually then use it as-is.
- my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
- if ($form->{saved_xyznumber} &&
- ($form->{saved_xyznumber} eq $form->{$idx})) {
- delete($form->{$idx});
- }
+ if (!$form->{id}) {
+ $print_post = 1;
- &save;
+ my $saved_form = save_form();
+
+ save();
+
+ my %saved_vars;
+ map({ $saved_vars{$_} = $form->{$_}; } qw(id ordnumber quonumber));
+ restore_form($saved_form);
+ map({ $form->{$_} = $saved_vars{$_}; } qw(id ordnumber quonumber));
+ }
- &edit_e_mail;
+ edit_e_mail();
$lxdebug->leave_sub();
}