X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=264100e743b151ccd980ae0ee008b301bca22668;hb=82ee22347be2f2ee96d09a9fd0b45710f9552582;hp=fac3ba47b9db93314fcbb7b90dda2b200cf3a8f4;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index fac3ba47b..264100e74 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -176,8 +176,12 @@ sub prepare_invoice { $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); + + (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/); + $dec_qty = length $dec_qty; + $form->{"qty_$i"} = - $form->format_amount(\%myconfig, ($form->{"qty_$i"} * -1)); + $form->format_amount(\%myconfig, ($form->{"qty_$i"} * -1), $dec_qty); $form->{rowcount} = $i; } @@ -223,15 +227,13 @@ sub form_header { if ($form->{forex}) { $exchangerate .= qq| | - . $locale->text('Exchangerate') - . qq| + . $locale->text('Exchangerate') . qq| $form->{exchangerate}{exchangerate}> |; } else { $exchangerate .= qq| | - . $locale->text('Exchangerate') - . qq| + . $locale->text('Exchangerate') . qq| {exchangerate}> |; } @@ -270,14 +272,12 @@ sub form_header { $button1 = qq| {invdate}> text('button') - . qq|> + . $locale->text('button') . qq|> |; $button2 = qq| {duedate}> text('button') - . qq|> + . $locale->text('button') . qq|> |; #write Trigger @@ -304,6 +304,7 @@ sub form_header { {type}> +{level}> {creditlimit}> {creditremaining}> @@ -328,12 +329,11 @@ sub form_header { | . $locale->text('Vendor') . qq| $vendor - + | - . $locale->text('Contact Person') - . qq| + . $locale->text('Contact Person') . qq| $contact - + {vendor_id}> @@ -391,7 +391,7 @@ sub form_header { $jsscript - + {defaultcurrency}> {fxgain_accno}> @@ -551,7 +551,7 @@ sub form_footer {
- + Dokumente im Webdav-Repository @@ -560,7 +560,7 @@ sub form_footer { |; foreach $file (keys %{ $form->{WEBDAV} }) { $webdav_list .= qq| - + @@ -822,7 +822,7 @@ sub update { $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); $form->{"qty_$i"} = - $form->format_amount(\%myconfig, $form->{"qty_$i"}); + $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty); } &display_form; @@ -949,4 +949,3 @@ sub yes { $lxdebug->leave_sub(); } -
$file $form->{WEBDAV}{$file}