X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fam.pl;h=af30987e8c8b7a049f61fa7ab938fc36272806cc;hb=af9a1f44788ded346d8510511d26a760d996ba14;hp=56c48f3a9fc117baf61804b65bffe3d063943030;hpb=1b15807093421ca00493a447048b960f2f512152;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 56c48f3a9..af30987e8 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
@@ -45,6 +46,8 @@ 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 +90,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})) {
@@ -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 = (
@@ -358,6 +382,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 +600,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!'));
@@ -750,7 +775,7 @@ sub language_header {
$::form->header;
print $::form->parse_html_template('am/language_header', {
- numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ],
+ numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00" ],
dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
});
@@ -816,7 +841,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}
@@ -1232,8 +1257,9 @@ sub show_am_history {
my @ids = grep { $_ * 1 } selectall_array_query($form, $dbh, $query);
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/;
@@ -1619,7 +1645,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)) {