Revision 06bbc8e7
Von Moritz Bunkus vor fast 18 Jahren hinzugefügt
| SL/OE.pm | ||
|---|---|---|
| 484 | 484 |
my $rc = $dbh->commit; |
| 485 | 485 |
$dbh->disconnect; |
| 486 | 486 |
|
| 487 |
$form->{saved_xyznumber} = $form->{$form->{type} =~ /_quotation$/ ?
|
|
| 488 |
"quonumber" : "ordnumber"}; |
|
| 489 |
|
|
| 487 | 490 |
Common::webdav_folder($form) if ($main::webdav); |
| 488 | 491 |
|
| 489 | 492 |
$main::lxdebug->leave_sub(); |
| ... | ... | |
| 698 | 701 |
$ref = $sth->fetchrow_hashref(NAME_lc); |
| 699 | 702 |
map { $form->{$_} = $ref->{$_} } keys %$ref;
|
| 700 | 703 |
|
| 701 |
|
|
| 704 |
$form->{saved_xyznumber} = $form->{$form->{type} =~ /_quotation$/ ?
|
|
| 705 |
"quonumber" : "ordnumber"}; |
|
| 702 | 706 |
|
| 703 | 707 |
# set all entries for multiple ids blank that yield different information |
| 704 | 708 |
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
|
| bin/mozilla/oe.pl | ||
|---|---|---|
| 1115 | 1115 |
|; |
| 1116 | 1116 |
} |
| 1117 | 1117 |
|
| 1118 |
$form->hide_form("saved_xyznumber");
|
|
| 1119 |
|
|
| 1118 | 1120 |
print qq| |
| 1119 | 1121 |
|
| 1120 | 1122 |
<input type=hidden name=rowcount value=$form->{rowcount}>
|
| ... | ... | |
| 2419 | 2421 |
|
| 2420 | 2422 |
$form->{saveasnew} = 1;
|
| 2421 | 2423 |
$form->{closed} = 0;
|
| 2422 |
map { delete $form->{$_} } qw(printed emailed queued ordnumber quonumber);
|
|
| 2424 |
map { delete $form->{$_} } qw(printed emailed queued);
|
|
| 2425 |
|
|
| 2426 |
# Let Lx-Office assign a new order number if the user hasn't changed the |
|
| 2427 |
# previous one. If it has been changed manually then use it as-is. |
|
| 2428 |
my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
|
|
| 2429 |
if ($form->{saved_xyznumber} &&
|
|
| 2430 |
($form->{saved_xyznumber} eq $form->{$idx})) {
|
|
| 2431 |
delete($form->{$idx});
|
|
| 2432 |
} |
|
| 2423 | 2433 |
|
| 2424 | 2434 |
&save; |
| 2425 | 2435 |
|
Auch abrufbar als: Unified diff
Bei "Als Neu Speichern" nur dann eine neue Anfrage-/Auftragsnummer vergeben, wenn der Benutzer die bisherige nicht manuell verändert hat; ansonsten die veränderte übernehmen. Fix für Bug 598.