X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=7e610f3e5bf2ef9bfbe7b1c3edce8f2d7dda7572;hb=29d636435456494e8dc702ccc1015452a71275d9;hp=a8b9258836e65f750d08412a7126ce91afe0d48e;hpb=ce47a2340ef118b494854deae1b0ddc74b1d1c5a;p=kivitendo-erp.git
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index a8b925883..7e610f3e5 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -46,6 +46,7 @@ require "bin/mozilla/drafts.pl";
sub add {
$lxdebug->enter_sub();
+ $form->{"Watchdog::invdate,duedate,vendor,vendor_id"} = 1;
return $lxdebug->leave_sub() if (load_draft_maybe());
@@ -227,6 +228,9 @@ sub form_header {
$form->{salesman_id} = $form->{old_salesman_id};
}
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
+
$form->{radier} =
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
@@ -684,11 +688,11 @@ sub form_footer {
Dateiname |
Webdavlink |
|;
- foreach $file (keys %{ $form->{WEBDAV} }) {
+ foreach $file (@{ $form->{WEBDAV} }) {
$webdav_list .= qq|
- $file |
- $form->{WEBDAV}{$file} |
+ $file->{name} |
+ $file->{type} |
|;
}
@@ -867,7 +871,7 @@ sub form_footer {
# /button for saving history
# mark_as_paid button
if($form->{id} ne "") {
- print qq||;
}
# /mark_as_paid button
@@ -882,7 +886,7 @@ print qq|
sub mark_as_paid {
$lxdebug->enter_sub();
- $form->mark_as_paid(\%myconfig,"ap");
+ &mark_as_paid_common(\%myconfig,"ap");
$lxdebug->leave_sub();
}
@@ -1057,6 +1061,8 @@ sub use_as_template {
sub post_payment {
$lxdebug->enter_sub();
+
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
for $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
@@ -1098,6 +1104,8 @@ sub post_payment {
sub post {
$lxdebug->enter_sub();
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
$form->isblank("vendor", $locale->text('Vendor missing!'));
@@ -1141,6 +1149,7 @@ sub post {
($form->{AP}) = split /--/, $form->{AP};
($form->{AP_paid}) = split /--/, $form->{AP_paid};
+ $form->{storno} = 0;
$form->{id} = 0 if $form->{postasnew};