X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=6fc89608e494c49e2e2ebb5d1618a20a8ace596b;hb=644c68bae03521cec693800af0a19b9ab4e0ed9c;hp=25be6fe9ae17fa4d997c5d79ca53c10774b54b13;hpb=78650e309d0101ce7ec8ba60315ed5cc5fa42339;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 25be6fe9a..6fc89608e 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 # @@ -152,10 +152,17 @@ sub display_row { qq|
|; + qq| | |; } else { $column_data{description} = - qq| | |; + qq| | |; } (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/); @@ -339,11 +355,10 @@ sub display_row { } $column_data{"unit"} = " | " . - ($qty_readonly ? " " : AM->unit_select_html($is_part ? $dimension_units : $is_assigned ? $service_units : $all_units, "unit_$i", $this_unit, - $is_assigned ? $form->{"unit_$i"} : undef)) + $is_assigned ? $form->{"unit_$i"} : undef) . " | "; # build in drop down list for pricesgroups @@ -422,7 +437,7 @@ sub display_row { {"pricegroup_old_$i"}> {"price_old_$i"}> - + format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|> @@ -430,7 +445,7 @@ sub display_row { {"inventory_accno_$i"}> - + {"income_accno_$i"}> {"expense_accno_$i"}> @@ -439,7 +454,7 @@ sub display_row { - + |; @@ -477,11 +492,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') @@ -502,7 +518,7 @@ sub display_row { ############## ENDE Neueintrag ################## map { $form->{"${_}_base"} += $linetotal } - (split / /, $form->{"taxaccounts_$i"}); + (split(/ /, $form->{"taxaccounts_$i"})); $form->{invsubtotal} += $linetotal; } @@ -658,9 +674,10 @@ sub select_item { - + + {id}> @@ -723,7 +740,9 @@ sub item_selected { $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } - qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable); + qw(id partnumber description sellprice listprice inventory_accno + income_accno expense_accno bin unit weight assembly taxaccounts + partsgroup formel longdescription not_discountable partnotes); if ($form->{"part_payment_id_$i"} ne "") { $form->{payment_id} = $form->{"part_payment_id_$i"}; } @@ -869,6 +888,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 @@ -877,6 +899,8 @@ sub display_form { exit; } + Common::webdav_folder($form) if ($webdav); + # if ( $form->{print_and_post} # && $form->{second_run} # && ($form->{action} eq "display_form")) { @@ -1103,12 +1127,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; @@ -1168,6 +1192,10 @@ sub order { $form->{cp_id} *= 1; require "$form->{path}/$form->{script}"; + my $script = $form->{"script"}; + $script =~ s|.*/||; + $script =~ s|.pl$||; + $locale = new Locale($language, $script); map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1263,7 +1291,7 @@ sub request_for_quotation { quotation(); } -sub e_mail { +sub edit_e_mail { $lxdebug->enter_sub(); if ($form->{second_run}) { $form->{print_and_post} = 0; @@ -1271,8 +1299,10 @@ sub e_mail { } if ($myconfig{role} eq 'admin') { $bcc = qq| -| . $locale->text('Bcc') . qq| | -+ |
---|---|---|---|---|---|---|
| . $locale->text('Bcc') . qq| | ++ |