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;
<td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
<td nowrap>| . $locale->text('Ship via') . qq|</td>
</tr>
+ <tr>
+ <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td><td> |
+ . $locale->text('Ertrag') . qq|</td>
+ <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td><td> |
+ . $locale->text('Ertrag prozentual') . qq|</td>
+ </tr>
<tr>
<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
<td nowrap>| . $locale->text('Subtotal') . qq|</td>
@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);
'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
}
$report->set_options('top_info_text' => join("\n", @options),
- 'raw_bottom_info_text' => $form->parse_html_template('ar/ar_transactions_bottom'),
+ 'raw_bottom_info_text' => $form->parse_html_template2('ar/ar_transactions_bottom'),
'output_format' => 'HTML',
'title' => $form->{title},
'attachment_basename' => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
# 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 marge_percent);
my %totals = map { $_ => 0 } @subtotal_columns;
my %subtotals = map { $_ => 0 } @subtotal_columns;
map { $subtotals{$_} += $ar->{$_};
$totals{$_} += $ar->{$_} } @subtotal_columns;
- map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due);
+ $subtotals{marge_percent} = $subtotals{netamount} ? ($subtotals{marge_total} * 100 / $subtotals{netamount}) : 0;
+ $totals{marge_percent} = $totals{netamount} ? ($totals{marge_total} * 100 / $totals{netamount} ) : 0;
+
+ 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;
+ my $is_storno = $ar->{storno} && !$ar->{storno_id};
+ my $has_storno = $ar->{storno} && $ar->{storno_id};
$ar->{type} =
$has_storno ? $locale->text("Invoice with Storno (abbreviation)") :