X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Far.pl;h=f755bbc15fd70527894072e4686b166a44e3e9bf;hb=569b0cafffb5d24bf2d266bd669341a12d0db745;hp=e9e595a13353ab6d4d9d18549563de20586deda7;hpb=1ae70a98a8bcff7609e7fff67fb24015d462da23;p=kivitendo-erp.git
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index e9e595a13..f755bbc15 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -38,8 +38,8 @@ use SL::IS;
use SL::PE;
use SL::ReportGenerator;
-use strict;
-use warnings;
+# use strict;
+#use warnings;
# imports
our ($cgi, $form, $lxdebug, $locale, %myconfig);
@@ -47,7 +47,7 @@ our ($cgi, $form, $lxdebug, $locale, %myconfig);
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
require "bin/mozilla/drafts.pl";
-require "bin/mozilla/report_generator.pl";
+require "bin/mozilla/reportgenerator.pl";
1;
@@ -820,8 +820,8 @@ sub form_footer {
print qq|\n|;
# ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
- print qq||
- if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar') && !$form->{paid_1});
+ print qq| |
+ if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar'));
if ($form->{id}) {
if ($form->{radier}) {
@@ -838,7 +838,7 @@ sub form_footer {
} else {
if ($transdate > $closedto) {
- print qq| | .
+ print qq| | .
NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
}
}
@@ -849,7 +849,7 @@ sub form_footer {
}
# button for saving history
if($form->{id} ne "") {
- print qq|{id}); name=history id=history value=| . $locale->text('history') . qq|>|;
+ print qq| {id}); name=history id=history value=| . $locale->text('history') . qq|> |;
}
# /button for saving history
# mark_as_paid button
@@ -1340,6 +1340,12 @@ sub search {
|
| . $locale->text('Ship via') . qq| |
+
+ | |
+ . $locale->text('Ertrag') . qq| |
+ | |
+ . $locale->text('Ertrag prozentual') . qq| |
+
|
| . $locale->text('Subtotal') . qq| |
@@ -1417,7 +1423,7 @@ sub ar_transactions {
@columns =
qw(transdate id type invnumber ordnumber name netamount tax amount paid
datepaid due duedate transaction_description notes employee shippingpoint shipvia
- globalprojectnumber);
+ marge_total marge_percent globalprojectnumber);
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
@@ -1444,6 +1450,8 @@ sub ar_transactions {
'shippingpoint' => { 'text' => $locale->text('Shipping Point'), },
'shipvia' => { 'text' => $locale->text('Ship via'), },
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
+ 'marge_total' => { 'text' => $locale->text('Ertrag'), },
+ 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), },
);
foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid
@@ -1510,7 +1518,7 @@ sub ar_transactions {
# escape callback for href
$callback = $form->escape($href);
- my @subtotal_columns = qw(netamount amount paid due);
+ my @subtotal_columns = qw(netamount amount paid due marge_total);
my %totals = map { $_ => 0 } @subtotal_columns;
my %subtotals = map { $_ => 0 } @subtotal_columns;
@@ -1524,7 +1532,7 @@ sub ar_transactions {
map { $subtotals{$_} += $ar->{$_};
$totals{$_} += $ar->{$_} } @subtotal_columns;
- map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due);
+ map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent);
my $is_storno = $ar->{storno} && IS->is_storno(\%myconfig, $form, 'ar');
my $has_storno = $ar->{storno} && !$is_storno;