X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=774da855a9c37c3449e74d35dbe2cfa4719e968e;hb=08e48f66590f580cbe2c8e3df76883d88b4c0fef;hp=4cababbe641bb6ee8729418c96405268fc037914;hpb=e14cb525c640cb15bb6b2dfb62ccebbe78cb45cd;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 4cababbe6..774da855a 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.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. #====================================================================== # # module for Chart of Accounts, Income Statement and Balance Sheet @@ -35,6 +36,7 @@ use POSIX qw(strftime); use SL::CA; +use SL::DB::Default; use SL::ReportGenerator; require "bin/mozilla/reportgenerator.pl"; @@ -152,12 +154,11 @@ sub list { $::lxdebug->enter_sub; $::auth->assert('report'); - $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}"; + $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}" . " - " . $::form->{description}; $::form->header; print $::form->parse_html_template('ca/list', { year => DateTime->today->year, - cash => $::instance_conf->get_accounting_method eq 'cash', }); $::lxdebug->leave_sub; @@ -187,6 +188,7 @@ sub list_transactions { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; + my $defaults = SL::DB::Default->get; $main::auth->assert('report'); @@ -332,7 +334,7 @@ sub list_transactions { $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0); push (@options, $form->{print_date}); - $form->{company} = $locale->text('Company') . " " . $myconfig{company}; + $form->{company} = $locale->text('Company') . " " . $defaults->company; push (@options, $form->{company}); my @columns = qw(transdate reference description gegenkonto debit credit ustkonto ustrate balance);