X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=d8580bbdaf1df21d8e50a5e397cc058b8b42560e;hb=cb0eb91f7b04f728b1057d130f111ad465e8b16a;hp=10ab28005516b843d6012ece3da6dde65ad3d6e5;hpb=99e420aa730ca1d640804e8ce4074d8abb62e927;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 10ab28005..d8580bbda 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,24 @@
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::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";
@@ -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
@@ -394,6 +373,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 +416,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 +452,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;
@@ -534,724 +520,48 @@ sub list_account_details {
: ( $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 {
- $::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 mm/dd/yy dd-mm-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 add_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- # $locale->text("Add Buchungsgruppe")
- # $locale->text("Edit Buchungsgruppe")
- $form->{title} = "Add";
-
- $form->{callback} = "am.pl?action=add_buchungsgruppe" unless $form->{callback};
-
- AM->get_buchungsgruppe(\%myconfig, \%$form);
- $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
- for (my $i = 0; 4 > $i; $i++) {
- map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; }
- qw(income expense));
- }
-
- &buchungsgruppe_header;
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub edit_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- $main::auth->assert('config');
-
- $form->{title} = "Edit";
-
- AM->get_buchungsgruppe(\%myconfig, \%$form);
-
- &buchungsgruppe_header;
-
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub list_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- AM->buchungsgruppe(\%myconfig, \%$form);
-
- $form->{callback} = "am.pl?action=list_buchungsgruppe";
-
- my $callback = $form->escape($form->{callback});
-
- $form->{title} = $locale->text('Buchungsgruppen');
-
- my @column_index = qw(up down description inventory_accno
- income_accno_0 expense_accno_0
- income_accno_1 expense_accno_1
- income_accno_2 expense_accno_2
- income_accno_3 expense_accno_3 );
- my %column_header;
- $column_header{up} =
- qq|
|
- . qq| |
- . qq| | |;
- $column_header{down} =
- qq||
- . qq| |
- . qq| | |;
- $column_header{description} =
- qq||
- . $locale->text('Description')
- . qq| | |;
- $column_header{inventory_accno} =
- qq||
- . $locale->text('Bestandskonto')
- . qq| | |;
- $column_header{income_accno_0} =
- qq||
- . $locale->text('National Revenues')
- . qq| | |;
- $column_header{expense_accno_0} =
- qq||
- . $locale->text('National Expenses')
- . qq| | |;
- $column_header{income_accno_1} =
- qq||
- . $locale->text('Revenues EU with UStId')
- . qq| | |;
- $column_header{expense_accno_1} =
- qq||
- . $locale->text('Expenses EU with UStId')
- . qq| | |;
- $column_header{income_accno_2} =
- qq||
- . $locale->text('Revenues EU without UStId')
- . qq| | |;
- $column_header{expense_accno_2} =
- qq||
- . $locale->text('Expenses EU without UStId')
- . qq| | |;
- $column_header{income_accno_3} =
- qq||
- . $locale->text('Foreign Revenues')
- . qq| | |;
- $column_header{expense_accno_3} =
- qq||
- . $locale->text('Foreign Expenses')
- . qq| | |;
- $form->header;
-
- print qq|
-
-
-
-
- $form->{title} |
-
-
-
-
-
-
-|;
-
- map { print "$column_header{$_}\n" } @column_index;
-
- print qq|
-
-|;
-
- my $swap_link = qq|am.pl?action=swap_buchungsgruppen&|;
-
- my $row = 0;
- my ($i, %column_data);
- foreach my $ref (@{ $form->{ALL} }) {
-
- $i++;
- $i %= 2;
-
- print qq|
-
-|;
-
- if ($row) {
- my $pref = $form->{ALL}->[$row - 1];
- $column_data{up} =
- qq|| .
- qq|| .
- qq| | .
- qq| | |;
- } else {
- $column_data{up} = qq| | |;
- }
-
- if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
- $column_data{down} = qq| | |;
- } else {
- my $nref = $form->{ALL}->[$row + 1];
- $column_data{down} =
- qq|| .
- qq|| .
- qq| | .
- qq| | |;
- }
-
- $column_data{description} = qq|$ref->{description} | |;
- $column_data{inventory_accno} = qq|$ref->{inventory_accno} | |;
- $column_data{income_accno_0} =
- qq|$ref->{income_accno_0} | |;
- $column_data{expense_accno_0} = qq|$ref->{expense_accno_0} | |;
- $column_data{income_accno_1} =
- qq|$ref->{income_accno_1} | |;
- $column_data{expense_accno_1} = qq|$ref->{expense_accno_1} | |;
- $column_data{income_accno_2} =
- qq|$ref->{income_accno_2} | |;
- $column_data{expense_accno_2} = qq|$ref->{expense_accno_2} | |;
- $column_data{income_accno_3} =
- qq|$ref->{income_accno_3} | |;
- $column_data{expense_accno_3} = qq|$ref->{expense_accno_3} | |;
-
- map { print "$column_data{$_}\n" } @column_index;
-
- print qq|
-
-|;
-
- $row++;
- }
-
- print qq|
-
- |
-
-
-
|
-
-
-
-
-
-
-
-