projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
07b40d4
..
e1076ef
100644
(file)
--- a/
bin/mozilla/is.pl
+++ b/
bin/mozilla/is.pl
@@
-132,8
+132,8
@@
sub invoice_links {
$form->{vc} = 'customer';
# create links
$form->{vc} = 'customer';
# create links
- $form->{webdav} = $::lx_office_conf{
system
}->{webdav};
- $form->{lizenzen} = $::lx_office_conf{
system
}->{lizenzen};
+ $form->{webdav} = $::lx_office_conf{
features
}->{webdav};
+ $form->{lizenzen} = $::lx_office_conf{
features
}->{lizenzen};
$form->create_links("AR", \%myconfig, "customer");
$form->create_links("AR", \%myconfig, "customer");
@@
-561,7
+561,7
@@
sub update {
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
- if ($::lx_office_conf{
system
}->{lizenzen}) {
+ if ($::lx_office_conf{
features
}->{lizenzen}) {
if ($form->{"inventory_accno_$i"} ne "") {
$form->{"lizenzen_$i"} = qq|<option></option>|;
foreach my $item (@{ $form->{LIZENZEN}{ $form->{"id_$i"} } }) {
if ($form->{"inventory_accno_$i"} ne "") {
$form->{"lizenzen_$i"} = qq|<option></option>|;
foreach my $item (@{ $form->{LIZENZEN}{ $form->{"id_$i"} } }) {
@@
-915,7
+915,8
@@
sub credit_note {
$form->{title} = $locale->text('Add Credit Note');
$form->{script} = 'is.pl';
$form->{title} = $locale->text('Add Credit Note');
$form->{script} = 'is.pl';
-
+ # Bei Gutschriften bezug zur Rechnungsnummer
+ $form->{invnumber_for_credit_note} = $form->{invnumber};
# bo creates the id, reset it
map { delete $form->{$_} }
qw(id invnumber subject message cc bcc printed emailed queued);
# bo creates the id, reset it
map { delete $form->{$_} }
qw(id invnumber subject message cc bcc printed emailed queued);