projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keine Shebang außer für die Entry Dateien.
[kivitendo-erp.git]
/
bin
/
mozilla
/
am.pl
diff --git
a/bin/mozilla/am.pl
b/bin/mozilla/am.pl
index
b382360
..
8f380aa
100644
(file)
--- a/
bin/mozilla/am.pl
+++ b/
bin/mozilla/am.pl
@@
-2397,6
+2397,7
@@
sub edit_defaults {
# get defaults for account numbers and last numbers
AM->defaultaccounts(\%myconfig, \%$form);
# get defaults for account numbers and last numbers
AM->defaultaccounts(\%myconfig, \%$form);
+ $form->{ALL_UNITS} = AM->convertible_units(AM->retrieve_all_units(), 'g');
map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
@@
-2507,7
+2508,6
@@
sub config {
%countrycodes = User->country_codes;
%countrycodes = User->country_codes;
- $countrycodes{""} = "American English";
$form->{COUNTRYCODES} = [];
foreach $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) {
push @{ $form->{COUNTRYCODES} }, {
$form->{COUNTRYCODES} = [];
foreach $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) {
push @{ $form->{COUNTRYCODES} }, {
@@
-2530,7
+2530,7
@@
sub config {
$form->{CAN_CHANGE_PASSWORD} = $auth->can_change_password();
$form->{todo_cfg} = { TODO->get_user_config('login' => $form->{login}) };
$form->{CAN_CHANGE_PASSWORD} = $auth->can_change_password();
$form->{todo_cfg} = { TODO->get_user_config('login' => $form->{login}) };
- $form->{title}
= $locale->text('Edit Preferences for #1', $form->{login});
+ $form->{title} = $locale->text('Edit Preferences for #1', $form->{login});
$form->header();
print $form->parse_html_template('am/config');
$form->header();
print $form->parse_html_template('am/config');
@@
-2545,7
+2545,7
@@
sub save_preferences {
TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
- $form->redirect($locale->text('Preferences saved!')) if (AM->save_preferences(\%myconfig, \%$form,
$webdav
));
+ $form->redirect($locale->text('Preferences saved!')) if (AM->save_preferences(\%myconfig, \%$form,
0
));
$form->error($locale->text('Cannot save preferences!'));
$lxdebug->leave_sub();
$form->error($locale->text('Cannot save preferences!'));
$lxdebug->leave_sub();
@@
-2818,6
+2818,9
@@
sub show_am_history {
$auth->assert('config');
$auth->assert('config');
+ my $callback = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
+ $form->{order} ||= 'h.itime--1';
+
my %search = ( "Artikelnummer" => "parts",
"Kundennummer" => "customer",
"Lieferantennummer" => "vendor",
my %search = ( "Artikelnummer" => "parts",
"Kundennummer" => "customer",
"Lieferantennummer" => "vendor",
@@
-2852,7
+2855,7
@@
sub show_am_history {
( $form->{'searchid'} ? qq| WHERE snumbers = '| . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'|
: qq| WHERE snumbers ~ '^| . $searchNo{$form->{'what2search'}} . qq|'|);
( $form->{'searchid'} ? qq| WHERE snumbers = '| . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'|
: qq| WHERE snumbers ~ '^| . $searchNo{$form->{'what2search'}} . qq|'|);
- my @ids = selectall_array_query($form, $dbh, $query);
+ my @ids =
grep { $_ * 1 }
selectall_array_query($form, $dbh, $query);
my $daten .= shift @ids;
$daten .= join '', map { " OR trans_id = $_" } @ids;
my $daten .= shift @ids;
$daten .= join '', map { " OR trans_id = $_" } @ids;
@@
-2867,7
+2870,8
@@
sub show_am_history {
"SUCCESS" => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
"NONEWWINDOW" => 1,
uc($sort) => 1,
"SUCCESS" => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
"NONEWWINDOW" => 1,
uc($sort) => 1,
- uc($sort) . "BY" => $sortby
+ uc($sort) . "BY" => $sortby,
+ 'callback' => $callback,
});
$dbh->disconnect();
});
$dbh->disconnect();