X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=b3ca071c0fd48bfeb18ac603a88e12bd0a7e0a55;hb=1a1bdd3dcfccee2b6b6b2b36f95aad0dd64132c1;hp=a52677f95a6c46bd410cd8d7b772c1c611b7d02e;hpb=01b4e844b8991b2f660e89adceed03ca0db9491a;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index a52677f95..b3ca071c0 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -24,7 +24,8 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# administration
@@ -41,10 +42,13 @@ use SL::Form;
use SL::User;
use SL::USTVA;
use SL::Iconv;
+use SL::Locale::String qw(t8);
use SL::TODO;
use SL::DB::Printer;
use SL::DB::Tax;
use SL::DB::Language;
+use SL::DB::Default;
+use SL::DBUtils qw(selectall_array_query conv_dateq);
use CGI;
require "bin/mozilla/common.pl";
@@ -87,10 +91,17 @@ sub edit_account {
my $form = $main::form;
my %myconfig = %main::myconfig;
+ my $defaults = SL::DB::Default->get;
$main::auth->assert('config');
$form->{title} = "Edit";
+ $form->{feature_balance} = $defaults->feature_balance;
+ $form->{feature_datev} = $defaults->feature_datev;
+ $form->{feature_erfolgsrechnung} = $defaults->feature_erfolgsrechnung;
+ $form->{feature_eurechnung} = $defaults->feature_eurechnung;
+ $form->{feature_ustva} = $defaults->feature_ustva;
+
AM->get_account(\%myconfig, \%$form);
foreach my $item (split(/:/, $form->{link})) {
@@ -98,7 +109,6 @@ sub edit_account {
}
&account_header;
- &form_footer;
$main::lxdebug->leave_sub();
}
@@ -256,6 +266,20 @@ sub account_header {
}
+ my $select_er = q|\n|;
+ my %er = (
+ 1 => "Ertrag",
+ 6 => "Aufwand");
+ foreach my $item (sort({ $a <=> $b } keys(%er))) {
+ my $text = H($::locale->{iconv_utf8}->convert($er{$item}));
+ if ($item == $form->{pos_er}) {
+ $select_er .= qq|\n|;
+ } else {
+ $select_er .= qq|\n|;
+ }
+
+ }
+
my $select_bwa = q|\n|;
my %bwapos = (
@@ -347,6 +371,8 @@ sub account_header {
my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
my $AccountIsPosted = ($form->{orphaned} ) ? "":"1";
+ setup_am_edit_account_action_bar();
+
$form->header();
my $parameters_ref = {
@@ -358,6 +384,7 @@ sub account_header {
select_bwa => $select_bwa,
select_bilanz => $select_bilanz,
select_eur => $select_eur,
+ select_er => $select_er,
};
# Ausgabe des Templates
@@ -575,7 +602,7 @@ sub delete_account {
$form->{title} = $locale->text('Delete Account');
foreach my $id (
- qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id)
+ qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id rndgain_accno_id rndloss_accno_id)
) {
if ($form->{id} == $form->{$id}) {
$form->error($locale->text('Cannot delete default account!'));
@@ -589,207 +616,6 @@ sub delete_account {
$main::lxdebug->leave_sub();
}
-sub add_lead {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
-
- $main::auth->assert('config');
-
- $form->{title} = "Add";
-
- $form->{callback} = "am.pl?action=add_lead" unless $form->{callback};
-
- &lead_header;
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub edit_lead {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- $main::auth->assert('config');
-
- $form->{title} = "Edit";
-
- AM->get_lead(\%myconfig, \%$form);
-
- &lead_header;
-
- $form->{orphaned} = 1;
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub list_lead {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- AM->lead(\%::myconfig, $::form);
-
- $::form->{callback} = "am.pl?action=list_lead";
- $::form->{title} = $::locale->text('Lead');
-
- $::form->header;
- print $::form->parse_html_template('am/lead_list');
-
- $::lxdebug->leave_sub;
-}
-
-sub lead_header {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- # $locale->text('Add Lead')
- # $locale->text('Edit Lead')
- $::form->{title} = $::locale->text("$::form->{title} Lead");
-
- $::form->header;
- print $::form->parse_html_template('am/lead_header');
-
- $::lxdebug->leave_sub;
-}
-
-sub save_lead {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->isblank("description", $locale->text('Description missing!'));
- AM->save_lead(\%myconfig, \%$form);
- $form->redirect($locale->text('lead saved!'));
-
- $main::lxdebug->leave_sub();
-}
-
-sub delete_lead {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- AM->delete_lead(\%myconfig, \%$form);
- $form->redirect($locale->text('lead deleted!'));
-
- $main::lxdebug->leave_sub();
-}
-
-sub add_language {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
-
- $main::auth->assert('config');
-
- $form->{title} = "Add";
-
- $form->{callback} = "am.pl?action=add_language" unless $form->{callback};
-
- &language_header;
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub edit_language {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- $main::auth->assert('config');
-
- $form->{title} = "Edit";
-
- AM->get_language(\%myconfig, \%$form);
-
- &language_header;
-
- $form->{orphaned} = 1;
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub list_language {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- AM->language(\%::myconfig, $::form);
-
- $::form->{callback} = "am.pl?action=list_language";
- $::form->{title} = $::locale->text('Languages');
-
- $::form->header;
-
- print $::form->parse_html_template('am/language_list');
-
- $::lxdebug->leave_sub;
-}
-
-sub language_header {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- # $locale->text('Add Language')
- # $locale->text('Edit Language')
- $::form->{title} = $::locale->text("$::form->{title} Language");
-
- $::form->header;
-
- print $::form->parse_html_template('am/language_header', {
- numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ],
- dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
- });
-
- $::lxdebug->leave_sub;
-}
-
-sub save_language {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->isblank("description", $locale->text('Language missing!'));
- $form->isblank("template_code", $locale->text('Template Code missing!'));
- $form->isblank("article_code", $locale->text('Article Code missing!'));
- AM->save_language(\%myconfig, \%$form);
- $form->redirect($locale->text('Language saved!'));
-
- $main::lxdebug->leave_sub();
-}
-
-sub delete_language {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- AM->delete_language(\%myconfig, \%$form);
- $form->redirect($locale->text('Language deleted!'));
-
- $main::lxdebug->leave_sub();
-}
-
sub _build_cfg_options {
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -816,7 +642,7 @@ sub config {
_build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
_build_cfg_options('timeformat', qw(hh:mm hh:mm:ss));
- _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
+ _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00"));
my @formats = ();
if ($::lx_office_conf{print_templates}->{opendocument}
@@ -885,9 +711,11 @@ sub config {
$myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
$form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
- $form->{todo_cfg} = { TODO->get_user_config('login' => $form->{login}) };
+ $form->{todo_cfg} = { TODO->get_user_config('login' => $::myconfig{login}) };
+
+ $form->{title} = $locale->text('Edit Preferences for #1', $::myconfig{login});
- $form->{title} = $locale->text('Edit Preferences for #1', $form->{login});
+ setup_am_config_action_bar();
$form->header();
@@ -907,7 +735,7 @@ sub save_preferences {
$form->{stylesheet} = $form->{usestylesheet};
- TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
+ TODO->save_user_config('login' => $::myconfig{login}, %{ $form->{todo_cfg} || { } });
if (AM->save_preferences($form)) {
if ($::auth->can_change_password()
@@ -920,7 +748,7 @@ sub save_preferences {
$form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result)));
}
- $::auth->change_password($form->{login}, $form->{new_password});
+ $::auth->change_password($::myconfig{login}, $form->{new_password});
}
$form->redirect($locale->text('Preferences saved!'));
@@ -980,7 +808,7 @@ sub edit_units {
AM->units_in_use(\%myconfig, $form, $units);
map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
- my @languages = AM->language(\%myconfig, $form, 1);
+ my @languages = @{ SL::DB::Manager::Language->get_all_sorted };
my @unit_list = sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } values(%{$units}));
@@ -990,11 +818,11 @@ sub edit_units {
$_->{"UNITLANGUAGES"} = [];
foreach my $lang (@languages) {
push(@{ $_->{"UNITLANGUAGES"} },
- { "idx" => $i,
- "unit" => $_->{"name"},
- "language_id" => $lang->{"id"},
- "localized" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized"},
- "localized_plural" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized_plural"},
+ { "idx" => $i,
+ "unit" => $_->{"name"},
+ "language_id" => $lang->id,
+ "localized" => $_->{"LANGUAGES"}->{$lang->template_code}->{"localized"},
+ "localized_plural" => $_->{"LANGUAGES"}->{$lang->template_code}->{"localized_plural"},
});
}
$i++;
@@ -1039,11 +867,11 @@ sub add_unit {
}
my @languages;
- foreach my $lang (AM->language(\%myconfig, $form, 1)) {
+ foreach my $lang (@{ SL::DB::Manager::Language->get_all_sorted }) {
next unless ($form->{"new_localized_$lang->{id}"} || $form->{"new_localized_plural_$lang->{id}"});
- push(@languages, { "id" => $lang->{"id"},
- "localized" => $form->{"new_localized_$lang->{id}"},
- "localized_plural" => $form->{"new_localized_plural_$lang->{id}"},
+ push(@languages, { "id" => $lang->id,
+ "localized" => $form->{"new_localized_" . $lang->id},
+ "localized_plural" => $form->{"new_localized_plural_" . $lang->id},
});
}
@@ -1069,9 +897,9 @@ sub set_unit_languages {
foreach my $lang (@{$languages}) {
push(@{ $unit->{"LANGUAGES"} },
- { "id" => $lang->{"id"},
- "localized" => $form->{"localized_${idx}_$lang->{id}"},
- "localized_plural" => $form->{"localized_plural_${idx}_$lang->{id}"},
+ { "id" => $lang->id,
+ "localized" => $form->{"localized_${idx}_" . $lang->id},
+ "localized_plural" => $form->{"localized_plural_${idx}_" . $lang->id},
});
}
@@ -1090,7 +918,7 @@ sub save_unit {
my $old_units = AM->retrieve_units(\%myconfig, $form, "resolved_");
AM->units_in_use(\%myconfig, $form, $old_units);
- my @languages = AM->language(\%myconfig, $form, 1);
+ my @languages = @{ SL::DB::Manager::Language->get_all_sorted };
my $new_units = {};
my @delete_units = ();
@@ -1226,14 +1054,22 @@ sub show_am_history {
$restriction .= qq| AND employee_id = (SELECT id FROM employee WHERE name ILIKE | . $dbh->quote('%' . $form->{mitarbeiter} . '%') . qq|)|;
}
- my $query = qq|SELECT trans_id AS id FROM history_erp | .
- ( $form->{'searchid'} ? qq| WHERE snumbers = '| . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'|
- : qq| WHERE snumbers ~ '^| . $searchNo{$form->{'what2search'}} . qq|'|);
+ my $snumbers_where = '';
+ my $snumbers_value;
+ if ($form->{'searchid'}) {
+ $snumbers_where = ' WHERE snumbers = ?';
+ $snumbers_value = $searchNo{$form->{'what2search'}} . '_' . $form->{'searchid'};
+ } else {
+ $snumbers_where = ' WHERE snumbers ~ ?';
+ $snumbers_value = '^' . $searchNo{$form->{'what2search'}};
+ }
+ my $query = qq|SELECT trans_id AS id FROM history_erp $snumbers_where|;
- my @ids = grep { $_ * 1 } selectall_array_query($form, $dbh, $query);
+ my @ids = grep { $_ * 1 } selectall_array_query($form, $dbh, $query, $snumbers_value);
my $daten .= shift @ids;
- $daten .= join '', map { " OR trans_id = $_" } @ids;
-
+ if (scalar(@ids) > 0 ) {
+ $daten .= ' OR trans_id IN (' . join(',', @ids) . ')';
+ }
my ($sort, $sortby) = split(/\-\-/, $form->{order});
$sort =~ s/.*\.(.*)$/$1/;
@@ -1274,10 +1110,10 @@ sub add_tax {
$form->{expense} = 1;
$form->{costs} = 1;
+ setup_am_edit_tax_action_bar();
$form->header();
my $parameters_ref = {
-# ChartTypeIsAccount => $ChartTypeIsAccount,
LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
};
@@ -1311,6 +1147,7 @@ sub edit_tax {
$form->{rate} = $form->format_amount(\%myconfig, $form->{rate}, 2);
+ setup_am_edit_tax_action_bar();
$form->header();
my $parameters_ref = {
@@ -1341,13 +1178,11 @@ sub list_tax {
$form->{title} = $locale->text('Tax-O-Matic');
+ setup_am_list_tax_action_bar();
$form->header();
- my $parameters_ref = {
- };
-
# Ausgabe des Templates
- print($form->parse_html_template('am/list_tax', $parameters_ref));
+ print($form->parse_html_template('am/list_tax'));
$main::lxdebug->leave_sub();
}
@@ -1418,111 +1253,6 @@ sub delete_tax {
$main::lxdebug->leave_sub();
}
-sub add_price_factor {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->{title} = $locale->text('Add Price Factor');
- $form->{callback} ||= build_std_url('action=add_price_factor');
-
- $form->header();
- print $form->parse_html_template('am/edit_price_factor');
-
- $main::lxdebug->leave_sub();
-}
-
-sub edit_price_factor {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->{title} = $locale->text('Edit Price Factor');
- $form->{callback} ||= build_std_url('action=add_price_factor');
-
- AM->get_price_factor(\%myconfig, $form);
-
- $form->{factor} = $form->format_amount(\%myconfig, $form->{factor} * 1);
-
- $form->header();
- print $form->parse_html_template('am/edit_price_factor');
-
- $main::lxdebug->leave_sub();
-}
-
-sub list_price_factors {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- AM->get_all_price_factors(\%myconfig, \%$form);
-
- foreach my $current (@{ $form->{PRICE_FACTORS} }) {
- $current->{factor} = $form->format_amount(\%myconfig, $current->{factor} * 1);
- }
-
- $form->{callback} = build_std_url('action=list_price_factors');
- $form->{title} = $locale->text('Price Factors');
- $form->{url_base} = build_std_url('callback');
-
- $form->header();
- print $form->parse_html_template('am/list_price_factors');
-
- $main::lxdebug->leave_sub();
-}
-
-sub save_price_factor {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->isblank("description", $locale->text('Description missing!'));
- $form->isblank("factor", $locale->text('Factor missing!'));
-
- $form->{factor} = $form->parse_amount(\%myconfig, $form->{factor});
-
- AM->save_price_factor(\%myconfig, $form);
-
- $form->{callback} .= '&MESSAGE=' . $form->escape($locale->text('Price factor saved!')) if ($form->{callback});
-
- $form->redirect($locale->text('Price factor saved!'));
-
- $main::lxdebug->leave_sub();
-}
-
-sub delete_price_factor {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- AM->delete_price_factor(\%myconfig, \%$form);
-
- $form->{callback} .= '&MESSAGE=' . $form->escape($locale->text('Price factor deleted!')) if ($form->{callback});
-
- $form->redirect($locale->text('Price factor deleted!'));
-
- $main::lxdebug->leave_sub();
-}
-
sub add_warehouse {
$main::lxdebug->enter_sub();
@@ -1619,7 +1349,7 @@ sub delete_warehouse {
$form->header();
print $form->parse_html_template('am/confirm_delete_warehouse');
- ::end_of_request();
+ $::dispatcher->end_request;
}
if (AM->delete_warehouse(\%myconfig, $form)) {
@@ -1650,3 +1380,86 @@ sub save_bin {
$main::lxdebug->leave_sub();
}
+
+sub setup_am_config_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "save_preferences" } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
+sub setup_am_edit_account_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ combobox => [
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "save_account" } ],
+ disabled => $::form->{id} && !$::form->{orphaned} ? t8('The object is in use and cannot be changed.')
+ : undef,
+ accesskey => 'enter',
+ ],
+
+ action => [
+ t8('Save as new'),
+ submit => [ '#form', { action => "save_as_new_account" } ],
+ disabled => !$::form->{id} ? t8('The object has not been saved yet.') : undef,
+ ],
+ ],
+
+ action => [
+ t8('Delete'),
+ submit => [ '#form', { action => "delete_account" } ],
+ disabled => !$::form->{id} ? t8('The object has not been saved yet.')
+ : $::form->{id} && !$::form->{orphaned} ? t8('The object is in use and cannot be deleted.')
+ : undef,
+ confirm => t8('Do you really want to delete this object?'),
+ ],
+ );
+ }
+}
+
+sub setup_am_list_tax_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ link => [
+ t8('Add'),
+ link => 'am.pl?action=add_tax',
+ ],
+ );
+ }
+}
+
+sub setup_am_edit_tax_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "save_tax" } ],
+ accesskey => 'enter',
+ ],
+
+ action => [
+ t8('Delete'),
+ submit => [ '#form', { action => "delete_tax" } ],
+ disabled => !$::form->{id} ? t8('The object has not been saved yet.')
+ : !$::form->{orphaned} || $::form->{tax_already_used} ? t8('The object is in use and cannot be deleted.')
+ : undef,
+ confirm => t8('Do you really want to delete this object?'),
+ ],
+ );
+ }
+}