Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d946f59b

Von Sven Schöling vor fast 18 Jahren hinzugefügt

  • ID d946f59b7c4c8069ecb83834ed34251056155e53
  • Vorgänger 5c3ccca4
  • Nachfolger 6715bd15

is.pl->post entwirrt.
emails speichern/buchen nun rechnungen/auftraege vor dem aufrufen der maske

Unterschiede anzeigen:

bin/mozilla/is.pl
1452 1452
  }
1453 1453

  
1454 1454
  relink_accounts();
1455
  if ($print_post) {
1456
    if (!(IS->post_invoice(\%myconfig, \%$form))) {
1457
      $form->error($locale->text('Cannot post invoice!'));
1458
    }
1459
    remove_draft() if $form->{remove_draft};
1460
    # saving the history
1461
  	if(!exists $form->{addition}) {
1462
  	  $form->{addition} = "PRINTED AND POSTED";
1463
  	  $form->save_history($form->dbconnect(\%myconfig));
1464
    }
1465
    # /saving the history
1466
    
1467
  } else {
1468
    if (IS->post_invoice(\%myconfig, \%$form)){
1469
      remove_draft() if $form->{remove_draft};
1470
    	# saving the history
1471
        if(!exists $form->{addition}) {
1472
  	  		if($form->{storno}) {
1473
  	  			$form->{addition} = "STORNO";
1474
  	  		}
1475
  	  		else {
1476
  	  			$form->{addition} = "POSTED";
1477
  	  		}
1478
  	  		$form->save_history($form->dbconnect(\%myconfig));
1479
    	}
1480
    	# /saving the history
1481
    
1482
    	$form->redirect(
1483
            $form->{label} . " $form->{invnumber} " . $locale->text('posted!'));
1484
  	}
1485
    $form->error($locale->text('Cannot post invoice!'));
1455
  $form->error($locale->text('Cannot post invoice!'))
1456
    unless IS->post_invoice(\%myconfig, \%$form);
1457
  remove_draft() if $form->{remove_draft};
1458

  
1459
  if(!exists $form->{addition}) {
1460
    $form->{addition} = $print_post     ? "PRINTED AND POSTED" :
1461
                        $form->{storno} ? "STORNO"             :
1462
                                          "POSTED";
1463
    $form->save_history($form->dbconnect(\%myconfig));
1486 1464
  }
1465
  
1466
  $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
1467
    unless $print_post;
1487 1468

  
1488 1469
  $lxdebug->leave_sub();
1489 1470
}
......
1662 1643

  
1663 1644
  $lxdebug->leave_sub();
1664 1645
}
1646

  
1647
sub e_mail {
1648
  $lxdebug->enter_sub();
1649

  
1650
  $form->{postasnew} = 1;
1651
  $print_post        = 1;
1652

  
1653
  map { delete $form->{$_} } qw(printed emailed queued);
1654

  
1655
  &post;
1656

  
1657
  &edit_e_mail;
1658

  
1659
  $lxdebug->leave_sub();
1660
}

Auch abrufbar als: Unified diff