X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=adb78ed49992699e6c68c2f871a13c43274898b7;hb=e6f429e42da71c71b6416727216302a87a254fde;hp=e7e8b13373ea3aa4d2a01a4e37c931aa688342db;hpb=e53cae0004bd4cfe8077745c8f05c94a2645ca5e;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index e7e8b1337..adb78ed49 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -134,7 +134,7 @@ sub display_row {
my $colspan = $#column_index + 1;
$form->{invsubtotal} = 0;
- map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts});
+ map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
########################################
# Eintrag fuer Version 2.2.0 geaendert #
@@ -242,6 +242,13 @@ sub display_row {
$delvar = 'reqdate';
}
+ my %projectnumber_labels = ();
+ my @projectnumber_values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@projectnumber_values, $item->{"id"});
+ $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+
for $i (1 .. $numrows) {
# undo formatting
@@ -486,11 +493,12 @@ sub display_row {
$serialnumber |;
}
- print qq|
- $projectnumber
-
-
-|;
+ print qq|$projectnumber | .
+ NTI($cgi->popup_menu('-name' => "project_id_$i",
+ '-values' => \@projectnumber_values,
+ '-labels' => \%projectnumber_labels,
+ '-default' => $form->{"project_id_$i"}));
+
if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
my $reqdate_term =
($form->{type} eq 'invoice')
@@ -511,7 +519,7 @@ sub display_row {
############## ENDE Neueintrag ##################
map { $form->{"${_}_base"} += $linetotal }
- (split / /, $form->{"taxaccounts_$i"});
+ (split(/ /, $form->{"taxaccounts_$i"}));
$form->{invsubtotal} += $linetotal;
}
@@ -667,7 +675,7 @@ sub select_item {
-
+
@@ -881,6 +889,9 @@ sub display_form {
relink_accounts();
+ my $new_rowcount = $form->{"rowcount"} * 1 + 1;
+ $form->{"project_id_${new_rowcount}"} = $form->{"globalproject_id"};
+
$form->language_payment(\%myconfig);
# if we have a display_form
@@ -889,6 +900,8 @@ sub display_form {
exit;
}
+ Common::webdav_folder($form) if ($webdav);
+
# if ( $form->{print_and_post}
# && $form->{second_run}
# && ($form->{action} eq "display_form")) {
@@ -981,10 +994,8 @@ sub check_form {
# remove any makes or model rows
if ($form->{item} eq 'part') {
- $lxdebug->message(0, "a1 $form->{sellprice}");
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(listprice sellprice lastcost weight rop);
- $lxdebug->message(0, "a2 $form->{sellprice}");
@flds = (make, model);
for my $i (1 .. ($form->{makemodel_rows})) {
@@ -997,9 +1008,7 @@ sub check_form {
}
}
- $lxdebug->message(0, "a3 $form->{sellprice}");
$form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows});
- $lxdebug->message(0, "a4 $form->{sellprice}");
$form->{makemodel_rows} = $count;
} elsif ($form->{item} eq 'assembly') {
@@ -1080,7 +1089,6 @@ sub check_form {
}
}
- $lxdebug->message(0, "a5 $form->{sellprice}");
#sk
# if pricegroups
if ( $form->{type} =~ (/sales_quotation/)
@@ -1095,10 +1103,8 @@ sub check_form {
set_pricegroup($form->{rowcount});
}
- $lxdebug->message(0, "a6 $form->{sellprice}");
&display_form;
- $lxdebug->message(0, "a7 $form->{sellprice}");
$lxdebug->leave_sub();
}
@@ -1122,12 +1128,12 @@ sub invoicetotal {
$amount = $sellprice * (1 - $discount / 100) * $qty;
map { $form->{"${_}_base"} += $amount }
- (split / /, $form->{"taxaccounts_$i"});
+ (split (/ /, $form->{"taxaccounts_$i"}));
$form->{oldinvtotal} += $amount;
}
map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
- split / /, $form->{taxaccounts}
+ split(/ /, $form->{taxaccounts})
if !$form->{taxincluded};
$form->{oldtotalpaid} = 0;
@@ -1336,7 +1342,7 @@ sub e_mail {
my $attachment_filename = $formname_translations{$form->{"formname"}};
my $prefix;
- if ($form->{"type"} =~ /invoice/) {
+ if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) {
$prefix = "inv";
} elsif ($form->{"type"} =~ /_quotation$/) {
$prefix = "quo";
@@ -1554,20 +1560,6 @@ sub print_options {
. $locale->text('Credit Note');
}
- if ($form->{type} eq 'ship_order') {
- $type = qq|