X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=77f911d1694070298505aea6f906317d6a89aa77;hb=796b3881fae7c5f5feacfc5914a2d47cb85e18e6;hp=386fb463ed260e4fc4cd2ffde4aec738eb39818d;hpb=79b00e8532108412d84fbcbafbfae3b6138649d2;p=kivitendo-erp.git

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 386fb463e..77f911d16 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;
 
@@ -865,7 +869,12 @@ sub form_footer {
   	  . qq|">|;
   }
   # /button for saving history
-
+  # mark_as_paid button 
+  if($form->{id} ne "") {  
+    print qq|<input type="submit" class="submit" name="action" value="| 
+          . $locale->text('mark as paid') . qq|">|;
+  }
+  # /mark_as_paid button
 print qq|</form>
 
 </body>
@@ -875,6 +884,12 @@ print qq|</form>
   $lxdebug->leave_sub();
 }
 
+sub mark_as_paid {
+  $lxdebug->enter_sub();
+  &mark_as_paid_common(\%myconfig,"ap");  
+  $lxdebug->leave_sub();
+}
+
 sub update {
   $lxdebug->enter_sub();
 
@@ -1046,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);
@@ -1087,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!'));
 
@@ -1130,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};