X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/cd32c5e983a98a515c0049422db858f2c13c4d7a..8f3dc0b4dfd14847df54366f0c146d058522d022:/bin/mozilla/oe.pl diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 0760f4afa..e05d0130a 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -217,7 +217,7 @@ sub order_links { sub prepare_order { $lxdebug->enter_sub(); - $form->{format} = "html"; + $form->{format} = "pdf"; $form->{media} = "screen"; $form->{formname} = $form->{type}; @@ -238,6 +238,9 @@ sub prepare_order { $dec = length $dec; $decimalplaces = ($dec > 2) ? $dec : 2; + # copy reqdate from deliverydate for invoice -> order conversion + $form->{"reqdate_$i"} = $form->{"deliverydate_$i"} unless $form->{"reqdate_$i"}; + $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); @@ -1913,6 +1916,9 @@ sub invoice { $dec = length $dec; $decimalplaces = ($dec > 2) ? $dec : 2; + # copy delivery date from reqdate for order -> invoice conversion + $form->{"deliverydate_$i"} = $form->{"reqdate_$i"} unless $form->{"deliverydate_$i"}; + $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);