X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fam.pl;h=d0415618717701f7910e3d82d7067b12620eeaa7;hb=a90b3fb8ebabdefdce605df9999fa8f284856e55;hp=77b8e4d607742e4f9fecddfdd8fc6df9312e5c6f;hpb=fb6468fcbb2662efb5f7490867417b735feb4d8a;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 77b8e4d60..d04156187 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
@@ -33,16 +34,25 @@
use utf8;
+use List::MoreUtils qw(any);
+
use SL::Auth;
use SL::Auth::PasswordPolicy;
use SL::AM;
use SL::CA;
use SL::Form;
+use SL::Helper::Flash;
+use SL::Helper::UserPreferences;
use SL::User;
use SL::USTVA;
use SL::Iconv;
+use SL::Locale::String qw(t8);
use SL::TODO;
-use SL::Printer;
+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";
@@ -75,7 +85,6 @@ sub add_account {
$form->{callback} = "am.pl?action=list_account" unless $form->{callback};
&account_header;
- &form_footer;
$main::lxdebug->leave_sub();
}
@@ -85,10 +94,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})) {
@@ -96,7 +112,6 @@ sub edit_account {
}
&account_header;
- &form_footer;
$main::lxdebug->leave_sub();
}
@@ -144,7 +159,7 @@ sub account_header {
rate => '',
taxkey_id => '',
pos_ustva => '',
- startdate => '',
+ startdate => $form->{account_exists} ? '' : DateTime->new(year => 1970, month => 1, day => 1)->to_lxoffice,
};
push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;
@@ -212,38 +227,7 @@ sub account_header {
}
my $select_eur = q|\n|;
- my %eur = (
- 1 => "Umsatzerlöse",
- 2 => "sonstige Erlöse",
- 3 => "Privatanteile",
- 4 => "Zinserträge",
- 5 => "Ausserordentliche Erträge",
- 6 => "Vereinnahmte Umsatzst.",
- 7 => "Umsatzsteuererstattungen",
- 8 => "Wareneingänge",
- 9 => "Löhne und Gehälter",
- 10 => "Gesetzl. sozialer Aufw.",
- 11 => "Mieten",
- 12 => "Gas, Strom, Wasser",
- 13 => "Instandhaltung",
- 14 => "Steuern, Versich., Beiträge",
- 15 => "Kfz-Steuern",
- 16 => "Kfz-Versicherungen",
- 17 => "Sonst. Fahrzeugkosten",
- 18 => "Werbe- und Reisekosten",
- 19 => "Instandhaltung u. Werkzeuge",
- 20 => "Fachzeitschriften, Bücher",
- 21 => "Miete für Einrichtungen",
- 22 => "Rechts- und Beratungskosten",
- 23 => "Bürobedarf, Porto, Telefon",
- 24 => "Sonstige Aufwendungen",
- 25 => "Abschreibungen auf Anlagever.",
- 26 => "Abschreibungen auf GWG",
- 27 => "Vorsteuer",
- 28 => "Umsatzsteuerzahlungen",
- 29 => "Zinsaufwand",
- 30 => "Ausserordentlicher Aufwand",
- 31 => "Betriebliche Steuern");
+ my %eur = %{ AM->get_eur_categories(\%myconfig, $form) };
foreach my $item (sort({ $a <=> $b } keys(%eur))) {
my $text = H($::locale->{iconv_utf8}->convert($eur{$item}));
if ($item == $form->{pos_eur}) {
@@ -254,31 +238,23 @@ 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 = (
- 1 => 'Umsatzerlöse',
- 2 => 'Best.Verdg.FE/UE',
- 3 => 'Aktiv.Eigenleistung',
- 4 => 'Mat./Wareneinkauf',
- 5 => 'So.betr.Erlöse',
- 10 => 'Personalkosten',
- 11 => 'Raumkosten',
- 12 => 'Betriebl.Steuern',
- 13 => 'Vers./Beiträge',
- 14 => 'Kfz.Kosten o.St.',
- 15 => 'Werbe-Reisek.',
- 16 => 'Kosten Warenabgabe',
- 17 => 'Abschreibungen',
- 18 => 'Rep./instandhlt.',
- 19 => 'Ãbrige Steuern',
- 20 => 'Sonst.Kosten',
- 30 => 'Zinsauwand',
- 31 => 'Sonst.neutr.Aufw.',
- 32 => 'Zinserträge',
- 33 => 'Sonst.neutr.Ertrag',
- 34 => 'Verr.kalk.Kosten',
- 35 => 'Steuern Eink.u.Ertr.');
+ my %bwapos = %{ AM->get_bwa_categories(\%myconfig, $form) };
foreach my $item (sort({ $a <=> $b } keys %bwapos)) {
my $text = H($::locale->{iconv_utf8}->convert($bwapos{$item}));
if ($item == $form->{pos_bwa}) {
@@ -336,7 +312,7 @@ sub account_header {
# account where AR_tax or AP_tax is set are not orphaned if they are used as
# tax-o-matic account
- if ( $form->{id} && !$form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
+ if ( $form->{id} && $form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
if (SL::DB::Manager::Tax->find_by(chart_id => $form->{id})) {
$form->{orphaned} = 0;
}
@@ -345,6 +321,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 = {
@@ -356,6 +334,7 @@ sub account_header {
select_bwa => $select_bwa,
select_bilanz => $select_bilanz,
select_eur => $select_eur,
+ select_er => $select_er,
};
# Ausgabe des Templates
@@ -365,21 +344,6 @@ sub account_header {
$main::lxdebug->leave_sub();
}
-sub form_footer {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- print $::form->parse_html_template('am/form_footer', {
- show_save => !$::form->{id}
- || ($::form->{id} && $::form->{orphaned})
- || ($::form->{type} eq "account" && !$::form->{new_chart_valid}),
- show_delete => $::form->{id} && $::form->{orphaned},
- show_save_as_new => $::form->{id} && $::form->{type} eq "account",
- });
-
- $::lxdebug->leave_sub;
-}
-
sub save_account {
$main::lxdebug->enter_sub();
@@ -394,6 +358,17 @@ sub save_account {
if ($form->{charttype} eq 'A'){
$form->isblank("category", $locale->text('Account Type missing!'));
+
+ my $found_valid_taxkey = 0;
+ foreach my $i (0 .. 10) { # 10 is maximum count of taxkeys in form
+ if ($form->{"taxkey_startdate_$i"} and !$form->{"taxkey_del_$i"}) {
+ $found_valid_taxkey = 1;
+ last;
+ }
+ }
+ if ($found_valid_taxkey == 0) {
+ $form->error($locale->text('A valid taxkey is missing!'));
+ }
}
$form->redirect($locale->text('Account saved!'))
@@ -426,10 +401,6 @@ sub save_as_new_account {
}
$form->{id} = 0;
- if ($form->{"original_accno"} &&
- ($form->{"accno"} eq $form->{"original_accno"})) {
- $form->error($locale->text('Account Number already used!'));
- }
$form->redirect($locale->text('Account saved!'))
if (AM->save_account(\%myconfig, \%$form));
$form->error($locale->text('Cannot save account!'));
@@ -466,7 +437,7 @@ sub list_account {
$ca->{link_edit_account} = $link_edit_account . '&id=' . E($ca->{id});
}
- $form->use_stylesheet("list_accounts.css");
+ $::request->{layout}->use_stylesheet("list_accounts.css");
$form->{title} = $locale->text('Chart of Accounts');
$form->header;
@@ -530,759 +501,52 @@ sub list_account_details {
: ( $link eq 'IC_cogs' ) ? $locale->text('Account Link IC_cogs')
: ( $link eq 'IC_taxpart' ) ? $locale->text('Account Link IC_taxpart')
: ( $link eq 'IC_income' ) ? $locale->text('Account Link IC_income')
- : ( $link eq 'IC_expense' ) ? $locale->text('Account Link IC_expense')
- : ( $link eq 'IC_taxservice' ) ? $locale->text('Account Link IC_taxservice')
- : $locale->text('Unknown Link') . ': ' . $link;
- $ca->{link} .= ($link ne '') ? "[$link] ":'';
- }
-
- $ca->{category} = ($ca->{category} eq 'A') ? $locale->text('Account Category A')
- : ($ca->{category} eq 'E') ? $locale->text('Account Category E')
- : ($ca->{category} eq 'L') ? $locale->text('Account Category L')
- : ($ca->{category} eq 'I') ? $locale->text('Account Category I')
- : ($ca->{category} eq 'Q') ? $locale->text('Account Category Q')
- : ($ca->{category} eq 'C') ? $locale->text('Account Category C')
- : ($ca->{category} eq 'G') ? $locale->text('Account Category G')
- : $locale->text('Unknown Category') . ': ' . $ca->{category};
- }
-
- $form->{title} = $locale->text('Chart of Accounts');
-
- print $form->ajax_response_header, $form->parse_html_template('am/list_account_details');
-
- $main::lxdebug->leave_sub();
-
-}
-
-sub delete_account {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $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)
- ) {
- if ($form->{id} == $form->{$id}) {
- $form->error($locale->text('Cannot delete default account!'));
- }
- }
-
- $form->redirect($locale->text('Account deleted!'))
- if (AM->delete_account(\%myconfig, \%$form));
- $form->error($locale->text('Cannot 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 {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->{title} = $locale->text("$form->{title} Lead");
-
- # $locale->text('Add Lead')
- # $locale->text('Edit Lead')
-
- $form->{description} =~ s/\"/"/g;
-
- my $description =
- qq||;
-
- $form->header;
-
- print qq|
-
-
-
-
-
-
-|;
-
- $main::lxdebug->leave_sub();
-}
-
-sub buchungsgruppe_header {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->{title} = $locale->text("$form->{title} Buchungsgruppe");
-
- # $locale->text('Add Accounting Group')
- # $locale->text('Edit Accounting Group')
-
- my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
- my %acc_type_map = (
- "IC" => $acc_inventory,
- "IC_income" => $acc_income,
- "IC_sale" => $acc_income,
- "IC_expense" => $acc_expense,
- "IC_cogs" => $acc_expense,
- );
-
- foreach my $key (keys(%acc_type_map)) {
- foreach my $ref (@{ $form->{IC_links}{$key} }) {
- $acc_type_map{$key}->{$ref->{"id"}} = $ref;
- }
- }
-
- foreach my $type (qw(IC IC_income IC_expense)) {
- $form->{"select$type"} =
- join("",
- map({ "" }
- sort({ $a->{"accno"} cmp $b->{"accno"} }
- values(%{$acc_type_map{$type}}))));
- }
-
- if ($form->{id}) {
- $form->{selectIC} =~ s/selected//g;
- $form->{selectIC} =~ s/ value=\Q$form->{inventory_accno_id}\E/ value=$form->{inventory_accno_id} selected/;
- $form->{selectIC_income} =~ s/selected//g;
- $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_0}\E/ value=$form->{income_accno_id_0} selected/;
- $form->{selectIC_expense} =~ s/selected//g;
- $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_0}\E/ value=$form->{expense_accno_id_0} selected/;
- }
-
- my $linkaccounts;
- if ( $::instance_conf->get_inventory_system eq 'perpetual' ) { # was !$::lx_office_conf{system}->{eur}) { }
- $linkaccounts = qq|
-
- | . $locale->text('Inventory') . qq| |
- |
-
-
|;
- } elsif ( $::instance_conf->get_inventory_system eq 'periodic' ) {
- # don't allow choice of inventory accno and don't show that line
- $linkaccounts = qq|
- {inventory_accno_id}>|;
- };
-
-
- $linkaccounts .= qq|
-
- | . $locale->text('National Revenues') . qq| |
- |
-
-
- | . $locale->text('National Expenses') . qq| |
- |
-
|;
- if ($form->{id}) {
- $form->{selectIC_income} =~ s/selected//g;
- $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/ value=$form->{income_accno_id_1} selected/;
- $form->{selectIC_expense} =~ s/selected//g;
- $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/ value=$form->{expense_accno_id_1} selected/;
- }
- $linkaccounts .= qq|
- | . $locale->text('Revenues EU with UStId') . qq| |
- |
-
-
- | . $locale->text('Expenses EU with UStId') . qq| |
- |
-
|;
-
- if ($form->{id}) {
- $form->{selectIC_income} =~ s/selected//g;
- $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_2}\E/ value=$form->{income_accno_id_2} selected/;
- $form->{selectIC_expense} =~ s/selected//g;
- $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/ value=$form->{expense_accno_id_2} selected/;
- }
-
- $linkaccounts .= qq|
- | . $locale->text('Revenues EU without UStId') . qq| |
- |
-
-
- | . $locale->text('Expenses EU without UStId') . qq| |
- |
-
|;
-
- if ($form->{id}) {
- $form->{selectIC_income} =~ s/selected//g;
- $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_3}\E/ value=$form->{income_accno_id_3} selected/;
- $form->{selectIC_expense} =~ s/selected//g;
- $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/ value=$form->{expense_accno_id_3} selected/;
- }
-
- $linkaccounts .= qq|
- | . $locale->text('Foreign Revenues') . qq| |
- |
-
-
- | . $locale->text('Foreign Expenses') . qq| |
- |
-
-|;
-
-
- $form->header;
-
- print qq|
-
-
-
+ setup_am_audit_control_action_bar();
-
-
-|;
+ $::form->header;
+ print $::form->parse_html_template('am/audit_control');
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub doclose {
@@ -1502,6 +758,29 @@ sub doclose {
$main::lxdebug->leave_sub();
}
+sub add_unit {
+ $::auth->assert('config');
+
+ # my $units = AM->retrieve_units(\%::myconfig, $::form, "resolved_");
+ # # AM->units_in_use(\%::myconfig, $::form, $units);
+
+ # $units->{$_}->{BASE_UNIT_DDBOX} = AM->unit_select_data($units, $units->{$_}->{base_unit}, 1) for keys %{$units};
+
+ my @languages = @{ SL::DB::Manager::Language->get_all_sorted };
+
+ my $units = AM->retrieve_units(\%::myconfig, $::form);
+ my $ddbox = AM->unit_select_data($units, undef, 1);
+
+ setup_am_add_unit_action_bar();
+
+ $::form->{title} = $::locale->text("Add unit");
+ $::form->header();
+ print($::form->parse_html_template("am/add_unit", {
+ NEW_BASE_UNIT_DDBOX => $ddbox,
+ LANGUAGES => \@languages,
+ }));
+}
+
sub edit_units {
$main::lxdebug->enter_sub();
@@ -1515,7 +794,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}));
@@ -1525,11 +804,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++;
@@ -1538,7 +817,9 @@ sub edit_units {
$units = AM->retrieve_units(\%myconfig, $form);
my $ddbox = AM->unit_select_data($units, undef, 1);
- $form->{"title"} = $locale->text("Add and edit units");
+ setup_am_edit_units_action_bar();
+
+ $form->{"title"} = $locale->text("Edit units");
$form->header();
print($form->parse_html_template("am/edit_units",
{ "UNITS" => \@unit_list,
@@ -1549,7 +830,7 @@ sub edit_units {
$main::lxdebug->leave_sub();
}
-sub add_unit {
+sub create_unit {
$main::lxdebug->enter_sub();
my $form = $main::form;
@@ -1574,19 +855,19 @@ 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},
});
}
AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, \@languages);
- $form->{"saved_message"} = $locale->text("The unit has been saved.");
+ flash_later('info', $locale->text("The unit has been added."));
- edit_units();
+ print $form->redirect_header('am.pl?action=edit_units');
$main::lxdebug->leave_sub();
}
@@ -1604,9 +885,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},
});
}
@@ -1625,7 +906,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 = ();
@@ -1690,9 +971,9 @@ sub save_unit {
AM->save_units(\%myconfig, $form, $new_units, \@delete_units);
- $form->{"saved_message"} = $locale->text("The units have been saved.");
+ flash_later('info', $locale->text("The units have been saved."));
- edit_units();
+ print $form->redirect_header('am.pl?action=edit_units');
$main::lxdebug->leave_sub();
}
@@ -1705,6 +986,8 @@ sub show_history_search {
$main::auth->assert('config');
+ setup_am_show_history_search_action_bar();
+
$form->{title} = $locale->text("History Search");
$form->header();
@@ -1725,23 +1008,28 @@ sub show_am_history {
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",
- "Projektnummer" => "project",
- "Buchungsnummer" => "oe",
- "Eingangsrechnungnummer" => "ap",
- "Ausgangsrechnungnummer" => "ar",
- "Mahnungsnummer" => "dunning"
- );
+ # my %search = ( "Artikelnummer" => "parts",
+ # "Kundennummer" => "customer",
+ # "Lieferantennummer" => "vendor",
+ # "Projektnummer" => "project",
+ # "Auftragsnummer" => "oe",
+ # "Angebotsnummer" => "oe",
+ # "Eingangsrechnungnummer" => "ap",
+ # "Ausgangsrechnungnummer" => "ar",
+ # "Mahnungsnummer" => "dunning",
+ # "Buchungsnummer" => "gl",
+ # );
+
my %searchNo = ( "Artikelnummer" => "partnumber",
"Kundennummer" => "customernumber",
"Lieferantennummer" => "vendornumber",
"Projektnummer" => "projectnumber",
- "Buchungsnummer" => "ordnumber",
+ "Auftragsnummer" => "ordnumber",
+ "Angebotsnummer" => "quonumber",
"Eingangsrechnungnummer" => "invnumber",
"Ausgangsrechnungnummer" => "invnumber",
- "Mahnungsnummer" => "dunning_id"
+ "Mahnungsnummer" => "dunning_id",
+ "Buchungsnummer" => "gltransaction"
);
my $dbh = $form->dbconnect(\%myconfig);
@@ -1756,17 +1044,27 @@ 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/;
+ setup_am_show_am_history_action_bar();
+
$form->{title} = $locale->text("History Search");
$form->header();
@@ -1797,10 +1095,18 @@ sub add_tax {
_get_taxaccount_selection();
+ $form->{asset} = 1;
+ $form->{liability} = 1;
+ $form->{equity} = 1;
+ $form->{revenue} = 1;
+ $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,
};
# Ausgabe des Templates
@@ -1821,13 +1127,24 @@ sub edit_tax {
$form->{title} = $locale->text('Edit');
AM->get_tax(\%myconfig, \%$form);
+
_get_taxaccount_selection();
+ $form->{asset} = $form->{chart_categories} =~ 'A' ? 1 : 0;
+ $form->{liability} = $form->{chart_categories} =~ 'L' ? 1 : 0;
+ $form->{equity} = $form->{chart_categories} =~ 'Q' ? 1 : 0;
+ $form->{revenue} = $form->{chart_categories} =~ 'I' ? 1 : 0;
+ $form->{expense} = $form->{chart_categories} =~ 'E' ? 1 : 0;
+ $form->{costs} = $form->{chart_categories} =~ 'C' ? 1 : 0;
+
$form->{rate} = $form->format_amount(\%myconfig, $form->{rate}, 2);
+ setup_am_edit_tax_action_bar();
$form->header();
my $parameters_ref = {
+ LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
+ TAX => SL::DB::Manager::Tax->find_by(id => $form->{id}),
};
# Ausgabe des Templates
@@ -1853,13 +1170,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();
}
@@ -1888,12 +1203,16 @@ sub save_tax {
$main::auth->assert('config');
- $form->isblank("rate", $locale->text('Taxrate missing!'));
- $form->isblank("taxdescription", $locale->text('Taxdescription missing!'));
- $form->isblank("taxkey", $locale->text('Taxkey missing!'));
+ $form->error($locale->text('Taxkey missing!')) unless length($form->{taxkey}) != 0;
+ $form->error($locale->text('Taxdescription missing!')) unless length($form->{taxdescription}) != 0;
+ $form->error($locale->text('Taxrate missing!')) unless length($form->{rate}) != 0;
$form->{rate} = $form->parse_amount(\%myconfig, $form->{rate});
+ if ($form->{taxkey} == 0 and $form->{rate} > 0) {
+ $form->error($locale->text('Taxkey 0 is reserved for rate 0'));
+ }
+
if ( $form->{rate} < 0 || $form->{rate} >= 100 ) {
$form->error($locale->text('Tax Percent is a number between 0 and 100'));
}
@@ -1902,8 +1221,13 @@ sub save_tax {
$form->error($locale->text('Tax Percent is a number between 0 and 100'));
}
+ my @translation_keys = grep { $_ =~ '^translation_\d+' } keys %$form;
+ $form->{translations} = { map { $_ =~ '^translation_(\d+)'; $1 => $form->{$_} } @translation_keys };
+
AM->save_tax(\%myconfig, \%$form);
- $form->redirect($locale->text('Tax saved!'));
+ flash_later('info', $locale->text("Tax saved!"));
+
+ print $form->redirect_header('am.pl?action=list_tax');
$main::lxdebug->leave_sub();
}
@@ -1923,7 +1247,7 @@ sub delete_tax {
$main::lxdebug->leave_sub();
}
-sub add_price_factor {
+sub add_warehouse {
$main::lxdebug->enter_sub();
my $form = $main::form;
@@ -1931,17 +1255,18 @@ sub add_price_factor {
$main::auth->assert('config');
- $form->{title} = $locale->text('Add Price Factor');
- $form->{callback} ||= build_std_url('action=add_price_factor');
- $form->{fokus} = 'description';
+ $form->{title} = $locale->text('Add Warehouse');
+ $form->{callback} ||= build_std_url('action=add_warehouse');
+
+ setup_am_edit_warehouse_action_bar();
$form->header();
- print $form->parse_html_template('am/edit_price_factor');
+ print $form->parse_html_template('am/edit_warehouse');
$main::lxdebug->leave_sub();
}
-sub edit_price_factor {
+sub edit_warehouse {
$main::lxdebug->enter_sub();
my $form = $main::form;
@@ -1950,46 +1275,36 @@ sub edit_price_factor {
$main::auth->assert('config');
- $form->{title} = $locale->text('Edit Price Factor');
- $form->{callback} ||= build_std_url('action=add_price_factor');
- $form->{fokus} = 'description';
+ AM->get_warehouse(\%myconfig, $form);
+
+ $form->get_lists('employees' => 'EMPLOYEES');
- AM->get_price_factor(\%myconfig, $form);
+ $form->{title} = $locale->text('Edit Warehouse');
+ $form->{callback} ||= build_std_url('action=list_warehouses');
- $form->{factor} = $form->format_amount(\%myconfig, $form->{factor} * 1);
+ setup_am_edit_warehouse_action_bar(id => $::form->{id}, in_use => any { $_->{in_use} } @{ $::form->{BINS} });
$form->header();
- print $form->parse_html_template('am/edit_price_factor');
+ print $form->parse_html_template('am/edit_warehouse');
$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);
+sub edit_bins {
+ $::auth->assert('config');
- foreach my $current (@{ $form->{PRICE_FACTORS} }) {
- $current->{factor} = $form->format_amount(\%myconfig, $current->{factor} * 1);
- }
+ AM->get_warehouse(\%::myconfig, $::form);
- $form->{callback} = build_std_url('action=list_price_factors');
- $form->{title} = $locale->text('Price Factors');
- $form->{url_base} = build_std_url('callback');
+ $::form->{title} = $::locale->text('Edit Bins for Warehouse \'#1\'', $::form->{description});
+ $::form->{callback} ||= build_std_url('action=list_warehouses');
- $form->header();
- print $form->parse_html_template('am/list_price_factors');
+ setup_am_edit_bins_action_bar(id => $::form->{id});
- $main::lxdebug->leave_sub();
+ $::form->header;
+ print $::form->parse_html_template('am/edit_bins');
}
-sub save_price_factor {
+sub list_warehouses {
$main::lxdebug->enter_sub();
my $form = $main::form;
@@ -1998,21 +1313,21 @@ sub save_price_factor {
$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->get_all_warehouses(\%myconfig, $form);
- AM->save_price_factor(\%myconfig, $form);
+ $form->{callback} = build_std_url('action=list_warehouses');
+ $form->{title} = $locale->text('Warehouses');
+ $form->{url_base} = build_std_url('callback');
- $form->{callback} .= '&MESSAGE=' . $form->escape($locale->text('Price factor saved!')) if ($form->{callback});
+ setup_am_list_warehouses_action_bar();
- $form->redirect($locale->text('Price factor saved!'));
+ $form->header();
+ print $form->parse_html_template('am/list_warehouses');
$main::lxdebug->leave_sub();
}
-sub delete_price_factor {
+sub save_warehouse {
$main::lxdebug->enter_sub();
my $form = $main::form;
@@ -2021,34 +1336,40 @@ sub delete_price_factor {
$main::auth->assert('config');
- AM->delete_price_factor(\%myconfig, \%$form);
+ $form->isblank("description", $locale->text('Description missing!'));
+
+ $form->{number_of_new_bins} = $form->parse_amount(\%myconfig, $form->{number_of_new_bins});
+
+ AM->save_warehouse(\%myconfig, $form);
- $form->{callback} .= '&MESSAGE=' . $form->escape($locale->text('Price factor deleted!')) if ($form->{callback});
+ $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse saved.')) if ($form->{callback});
- $form->redirect($locale->text('Price factor deleted!'));
+ $form->redirect($locale->text('Warehouse saved.'));
$main::lxdebug->leave_sub();
}
-sub add_warehouse {
+sub delete_warehouse {
$main::lxdebug->enter_sub();
my $form = $main::form;
+ my %myconfig = %main::myconfig;
my $locale = $main::locale;
$main::auth->assert('config');
- $form->{title} = $locale->text('Add Warehouse');
- $form->{callback} ||= build_std_url('action=add_warehouse');
- $form->{fokus} = 'description';
+ if (AM->delete_warehouse(\%myconfig, $form)) {
+ $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse deleted.')) if ($form->{callback});
+ $form->redirect($locale->text('Warehouse deleted.'));
- $form->header();
- print $form->parse_html_template('am/edit_warehouse');
+ } else {
+ $form->error($locale->text('The warehouse could not be deleted because it has already been used.'));
+ }
$main::lxdebug->leave_sub();
}
-sub edit_warehouse {
+sub save_bin {
$main::lxdebug->enter_sub();
my $form = $main::form;
@@ -2057,105 +1378,246 @@ sub edit_warehouse {
$main::auth->assert('config');
- AM->get_warehouse(\%myconfig, $form);
-
- $form->get_lists('employees' => 'EMPLOYEES');
+ AM->save_bins(\%myconfig, $form);
- $form->{title} = $locale->text('Edit Warehouse');
- $form->{callback} ||= build_std_url('action=list_warehouses');
- $form->{fokus} = 'description';
+ $form->{callback} .= '&saved_message=' . E($locale->text('Bins saved.')) if ($form->{callback});
- $form->header();
- print $form->parse_html_template('am/edit_warehouse');
+ $form->redirect($locale->text('Bins saved.'));
$main::lxdebug->leave_sub();
}
-sub list_warehouses {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
+sub setup_am_config_action_bar {
+ my %params = @_;
- AM->get_all_warehouses(\%myconfig, $form);
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "save_preferences" } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
- $form->{callback} = build_std_url('action=list_warehouses');
- $form->{title} = $locale->text('Warehouses');
- $form->{url_base} = build_std_url('callback');
+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" } ],
+ 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?'),
+ ],
+ );
+ }
+}
- $form->header();
- print $form->parse_html_template('am/list_warehouses');
+sub setup_am_list_tax_action_bar {
+ my %params = @_;
- $main::lxdebug->leave_sub();
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ link => [
+ t8('Add'),
+ link => 'am.pl?action=add_tax',
+ ],
+ );
+ }
}
-sub save_warehouse {
- $main::lxdebug->enter_sub();
+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?'),
+ ],
+ );
+ }
+}
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
+sub setup_am_add_unit_action_bar {
+ my %params = @_;
- $main::auth->assert('config');
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "create_unit" } ],
+ accesskey => 'enter',
+ ],
- $form->isblank("description", $locale->text('Description missing!'));
+ 'separator',
- $form->{number_of_new_bins} = $form->parse_amount(\%myconfig, $form->{number_of_new_bins});
+ link => [
+ t8('Back'),
+ link => 'am.pl?action=edit_units',
+ ],
+ );
+ }
+}
- AM->save_warehouse(\%myconfig, $form);
+sub setup_am_edit_units_action_bar {
+ my %params = @_;
- $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse saved.')) if ($form->{callback});
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "save_unit" } ],
+ accesskey => 'enter',
+ ],
- $form->redirect($locale->text('Warehouse saved.'));
+ 'separator',
- $main::lxdebug->leave_sub();
+ link => [
+ t8('Add'),
+ link => 'am.pl?action=add_unit',
+ ],
+ );
+ }
}
-sub delete_warehouse {
- $main::lxdebug->enter_sub();
+sub setup_am_list_warehouses_action_bar {
+ my %params = @_;
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ link => [
+ t8('Add'),
+ link => 'am.pl?action=add&type=warehouse&callback=' . E($::form->{callback}),
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
- $main::auth->assert('config');
+sub setup_am_edit_warehouse_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => 'save_warehouse' } ],
+ accesskey => 'enter',
+ ],
+
+ action => [
+ t8('Delete'),
+ submit => [ '#form', { action => 'delete_warehouse' } ],
+ disabled => !$params{id} ? t8('The object has not been saved yet.')
+ : $params{in_use} ? t8('The object is in use and cannot be deleted.')
+ : undef,
+ confirm => t8('Do you really want to delete this object?'),
+ ],
+
+ 'separator',
+
+ link => [
+ t8('Bins'),
+ link => 'am.pl?action=edit_bins&id=' . E($params{id}),
+ only_if => $params{id},
+ ],
+
+ link => [
+ t8('Abort'),
+ link => $::form->{callback} || 'am.pl?action=list_warehouses',
+ ],
+ );
+ }
+}
- if (!$form->{confirmed}) {
- $form->{title} = $locale->text('Confirmation');
+sub setup_am_edit_bins_action_bar {
+ my %params = @_;
- $form->header();
- print $form->parse_html_template('am/confirm_delete_warehouse');
- ::end_of_request();
- }
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => 'save_bin' } ],
+ accesskey => 'enter',
+ ],
- if (AM->delete_warehouse(\%myconfig, $form)) {
- $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse deleted.')) if ($form->{callback});
- $form->redirect($locale->text('Warehouse deleted.'));
+ 'separator',
- } else {
- $form->error($locale->text('The warehouse could not be deleted because it has already been used.'));
+ link => [
+ t8('Abort'),
+ link => 'am.pl?action=edit_warehouse&id=' . E($params{id}),
+ ],
+ );
}
-
- $main::lxdebug->leave_sub();
}
-sub save_bin {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
+sub setup_am_audit_control_action_bar {
+ my %params = @_;
- $main::auth->assert('config');
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => 'doclose' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
- AM->save_bins(\%myconfig, $form);
+sub setup_am_show_history_search_action_bar {
+ my %params = @_;
- $form->{callback} .= '&saved_message=' . E($locale->text('Bins saved.')) if ($form->{callback});
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Show'),
+ submit => [ '#form' ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
- $form->redirect($locale->text('Bins saved.'));
+sub setup_am_show_am_history_action_bar {
+ my %params = @_;
- $main::lxdebug->leave_sub();
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Back'),
+ call => [ 'kivi.history_back' ],
+ ],
+ );
+ }
}