projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Checkbox "geliefert" auch anzeigen, wenn der Verkaufsbeleg noch nicht gespeichert...
[kivitendo-erp.git]
/
bin
/
mozilla
/
oe.pl
diff --git
a/bin/mozilla/oe.pl
b/bin/mozilla/oe.pl
index
f55d5a7
..
567a259
100644
(file)
--- a/
bin/mozilla/oe.pl
+++ b/
bin/mozilla/oe.pl
@@
-249,7
+249,8
@@
sub order_links {
if (@{ $form->{"all_$form->{vc}"} }) {
$form->{ $form->{vc} } =
qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
if (@{ $form->{"all_$form->{vc}"} }) {
$form->{ $form->{vc} } =
qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
- map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" }
+ map { $form->{"select$form->{vc}"} .=
+"<option>$_->{name}--$_->{id}</option>\n" }
(@{ $form->{"all_$form->{vc}"} });
}
(@{ $form->{"all_$form->{vc}"} });
}
@@
-259,7
+260,7
@@
sub order_links {
$form->{defaultcurrency} = $curr[0];
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
$form->{defaultcurrency} = $curr[0];
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
- map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
+ map { $form->{selectcurrency} .= "<option>$_
</option>
\n" } @curr;
$form->{taxincluded} = $taxincluded if ($form->{id});
$form->{taxincluded} = $taxincluded if ($form->{id});
@@
-270,7
+271,7
@@
sub order_links {
map {
$form->{selectdepartment} .=
map {
$form->{selectdepartment} .=
- "<option>$_->{description}--$_->{id}\n"
+ "<option>$_->{description}--$_->{id}
</option>
\n"
} (@{ $form->{all_departments} });
}
} (@{ $form->{all_departments} });
}
@@
-279,7
+280,7
@@
sub order_links {
# sales staff
if (@{ $form->{all_employees} }) {
$form->{selectemployee} = "";
# sales staff
if (@{ $form->{all_employees} }) {
$form->{selectemployee} = "";
- map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" }
+ map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}
</option>
\n" }
(@{ $form->{all_employees} });
}
(@{ $form->{all_employees} });
}
@@
-384,23
+385,25
@@
sub form_header {
<td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate}></td>|;
}
<td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate}></td>|;
}
- if ($form->{id}) {
- $openclosed = qq|
- <tr>
- <td colspan=2 align=center>
- <input name="closed" id="closed" type="checkbox" class="checkbox" value="1" $checkedclosed>
- <label for="closed">| . $locale->text('Closed') . qq|</label>
-|;
+ my @tmp;
-
if (($form->{"type"} eq "sales_order") ||
-
($form->{"type"} eq "purchase_order")) {
-
$openclosed .=
qq|
+ if (($form->{"type"} eq "sales_order") ||
+ ($form->{"type"} eq "purchase_order")) {
+
push(@tmp,
qq|
<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" $checkeddelivered>
<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" $checkeddelivered>
- <label for="delivered">| . $locale->text('Delivered') . qq|</label>
-|;
- }
+ <label for="delivered">| . $locale->text('Delivered') . qq|</label>|);
+ }
+
+ if ($form->{id}) {
+ push(@tmp, qq|
+ <input name="closed" id="closed" type="checkbox" class="checkbox" value="1" $checkedclosed>
+ <label for="closed">| . $locale->text('Closed') . qq|</label>|);
+ }
+ if (@tmp) {
$openclosed .= qq|
$openclosed .= qq|
+ <tr>
+ <td colspan=| . (2 * scalar(@tmp)) . qq| align=center>| . join("\n", @tmp) . qq|
</td>
</tr>
|;
</td>
</tr>
|;
@@
-416,6
+419,9
@@
sub form_header {
#quote select[customer|vendor] Bug 133
$form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"});
#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"}));
my @old_project_ids = ($form->{"globalproject_id"});
map({ push(@old_project_ids, $form->{"project_id_$_"})
if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
@@
-427,7
+433,8
@@
sub form_header {
"old_id" => \@old_project_ids },
"employees" => "ALL_SALESMEN");
"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"} .
foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
push(@values, $item->{"cp_id"});
$labels{$item->{"cp_id"}} = $item->{"cp_name"} .
@@
-670,7
+677,10
@@
sub form_header {
$vc =
($form->{"select$form->{vc}"})
$vc =
($form->{"select$form->{vc}"})
- ? qq|<select name=$form->{vc}>$form->{"select$form->{vc}"}</select>\n<input type=hidden name="select$form->{vc}" value="$form->{"select$form->{vc}"}">|
+ ? qq|<select name="$form->{vc}"
+onchange="document.getElementById('update_button').click();">| .
+ qq|$form->{"select$form->{vc}"}</select>\n<input type=hidden name="select$form->{vc}" value="| .
+ Q($form->{"select$form->{vc}"}) . qq|">|
: qq|<input name=$form->{vc} value="$form->{$form->{vc}}" size=35>|;
$department = qq|
: qq|<input name=$form->{vc} value="$form->{$form->{vc}}" size=35>|;
$department = qq|
@@
-1055,7
+1065,7
@@
sub form_footer {
<tr>
<td>
|;
<tr>
<td>
|;
-
&print_options
;
+
print_options()
;
print qq|
</td>
print qq|
</td>
@@
-1339,7
+1349,7
@@
sub search {
$form->all_vc(\%myconfig, $form->{vc},
($form->{vc} eq 'customer') ? "AR" : "AP");
$form->all_vc(\%myconfig, $form->{vc},
($form->{vc} eq 'customer') ? "AR" : "AP");
- map { $vc .= "<option>$_->{name}--$_->{id}\n" }
+ map { $vc .= "<option>$_->{name}--$_->{id}
</option>
\n" }
@{ $form->{"all_$form->{vc}"} };
$vclabel = ucfirst $form->{vc};
@{ $form->{"all_$form->{vc}"} };
$vclabel = ucfirst $form->{vc};
@@
-1350,7
+1360,7
@@
sub search {
$vc =
($vc)
$vc =
($vc)
- ? qq|<select name=$form->{vc}><option>\n$vc</select>|
+ ? qq|<select name=$form->{vc}><option>\n$vc</
option></
select>|
: qq|<input name=$form->{vc} size=35>|;
# departments
: qq|<input name=$form->{vc} size=35>|;
# departments
@@
-1359,7
+1369,7
@@
sub search {
map {
$form->{selectdepartment} .=
map {
$form->{selectdepartment} .=
- "<option>$_->{description}--$_->{id}\n"
+ "<option>$_->{description}--$_->{id}
</option>
\n"
} (@{ $form->{all_departments} });
}
} (@{ $form->{all_departments} });
}
@@
-1443,7
+1453,7
@@
sub search {
<table>
<tr>
<th align=right>$vclabel</th>
<table>
<tr>
<th align=right>$vclabel</th>
- <td colspan=
3
>$vc</td>
+ <td colspan=
"3"
>$vc</td>
</tr>
$department
<tr>
</tr>
$department
<tr>
@@
-2468,6
+2478,10
@@
sub purchase_order {
OE->close_order(\%myconfig, \%$form);
}
OE->close_order(\%myconfig, \%$form);
}
+ if ($form->{type} =~ /^sales_/) {
+ delete($form->{ordnumber});
+ }
+
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Purchase Order');
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Purchase Order');
@@
-2487,6
+2501,10
@@
sub sales_order {
OE->close_order(\%myconfig, $form);
}
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');
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Sales Order');
@@
-2540,9
+2558,20
@@
sub e_mail {
$form->{print_and_save} = 1;
$form->{print_and_save} = 1;
- &save;
+ if (!$form->{id}) {
+ $print_post = 1;
+
+ 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();
}
$lxdebug->leave_sub();
}