projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Standardlagerplatz nur für neu angelegte Waren vorauswählen
[kivitendo-erp.git]
/
bin
/
mozilla
/
vk.pl
diff --git
a/bin/mozilla/vk.pl
b/bin/mozilla/vk.pl
index
4870a99
..
a60d430
100644
(file)
--- a/
bin/mozilla/vk.pl
+++ b/
bin/mozilla/vk.pl
@@
-124,12
+124,12
@@
sub invoice_transactions {
&check_name('customer', no_select => 1);
&check_name('customer', no_select => 1);
- # $form->{customer_id} w
urde schon von check_name gesetzt
+ # $form->{customer_id} w
as already set by check_name
$form->{customername} = $form->{customer};
};
$form->{customername} = $form->{customer};
};
- # i
st $form->{customer} leer passiert hier nichts weiter
+ # i
f $form->{customer} is empty nothing further happens here
- #
decimalplaces überprüfen oder auf Default 2 setzen
+ #
test for decimalplaces or set to default of 2
$form->{decimalplaces} = 2 unless $form->{decimalplaces} > 0 && $form->{decimalplaces} < 6;
my $cvar_configs_ct = CVar->get_configs('module' => 'CT');
$form->{decimalplaces} = 2 unless $form->{decimalplaces} > 0 && $form->{decimalplaces} < 6;
my $cvar_configs_ct = CVar->get_configs('module' => 'CT');
@@
-286,9
+286,9
@@
sub invoice_transactions {
$callback = $form->escape($href);
my @subtotal_columns = qw(qty weight sellprice sellprice_total lastcost lastcost_total marge_total marge_percent discount);
$callback = $form->escape($href);
my @subtotal_columns = qw(qty weight sellprice sellprice_total lastcost lastcost_total marge_total marge_percent discount);
- #
Gesamtsumme
:
- #
Summe von sellprice_total, lastcost_total u
nd marge_total
- #
Durchschnitt von
marge_percent
+ #
Total sum
:
+ #
sum of sellprice_total, lastcost_total a
nd marge_total
+ #
average of
marge_percent
my @total_columns = qw(sellprice_total lastcost_total marge_total marge_percent );
my %totals = map { $_ => 0 } @total_columns;
my @total_columns = qw(sellprice_total lastcost_total marge_total marge_percent );
my %totals = map { $_ => 0 } @total_columns;
@@
-407,6
+407,9
@@
sub invoice_transactions {
$row{invnumber}->{link} = build_std_url("script=is.pl", 'action=edit') . "&id=" . E($ar->{id}) . "&callback=${callback}";
$row{invnumber}->{link} = build_std_url("script=is.pl", 'action=edit') . "&id=" . E($ar->{id}) . "&callback=${callback}";
+ # use partdescription according to invoice in article mode
+ $row{description}->{data} = $ar->{invoice_description};
+
$report->add_data(\%row);
}
$report->add_data(\%row);
}