Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 281696eb

Von Kivitendo Admin vor fast 9 Jahren hinzugefügt

  • ID 281696eb5e8c1a2ca203907cbff7d18052037b2f
  • Vorgänger c14e14b6
  • Nachfolger 5f0565fc

history - Vereinheitlichung von what_done für is/ir/ap/gl

Es wird nun immer "invoice" dort gespeichert.

Unterschiede anzeigen:

bin/mozilla/is.pl
691 691
  relink_accounts();
692 692
  if ( IS->post_payment(\%myconfig, \%$form) ) {
693 693
    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
694
    $form->{what_done} = $form->{type};
694
    $form->{what_done} = 'invoice';
695 695
    $form->{addition}  = "PAYMENT POSTED";
696 696
    $form->save_history;
697 697
    $form->redirect($locale->text('Payment posted!'))
......
829 829
  remove_draft() if $form->{remove_draft};
830 830

  
831 831
  if(!exists $form->{addition}) {
832
    $form->{snumbers} =  'invnumber' .'_'. $form->{invnumber}; # ($form->{type} eq 'credit_note' ? 'cnnumber' : 'invnumber') .'_'. $form->{invnumber};
833
    $form->{addition} = $form->{print_and_post} ? "PRINTED AND POSTED" :
834
                        $form->{storno}         ? "STORNO"             :
835
                                                  "POSTED";
832
    $form->{snumbers}  =  'invnumber' .'_'. $form->{invnumber}; # ($form->{type} eq 'credit_note' ? 'cnnumber' : 'invnumber') .'_'. $form->{invnumber};
833
    $form->{what_done} = 'invoice';
834
    $form->{addition}  = $form->{print_and_post} ? "PRINTED AND POSTED" :
835
                         $form->{storno}         ? "STORNO"             :
836
                                                   "POSTED";
836 837
    $form->save_history;
837 838
  }
838 839

  
......
911 912
  }
912 913

  
913 914
  # save the history of invoice being stornoed
914
  $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
915
  $form->{addition} = "STORNO";
915
  $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
916
  $form->{what_done} = 'invoice';
917
  $form->{addition}  = "STORNO";
916 918
  $form->save_history;
917 919

  
918 920
  map({ my $key = $_; delete($form->{$key}) unless (grep({ $key eq $_ } qw(id login password type))); } keys(%{ $form }));
......
1076 1078
  if (IS->delete_invoice(\%myconfig, \%$form)) {
1077 1079
    # saving the history
1078 1080
    if(!exists $form->{addition}) {
1079
      $form->{snumbers} = 'invnumber' .'_'. $form->{invnumber}; # ($form->{type} eq 'credit_note' ? 'cnnumber' : 'invnumber') .'_'. $form->{invnumber};
1080
      $form->{addition} = "DELETED";
1081
      $form->{snumbers}  = 'invnumber' .'_'. $form->{invnumber}; # ($form->{type} eq 'credit_note' ? 'cnnumber' : 'invnumber') .'_'. $form->{invnumber};
1082
      $form->{what_done} = 'invoice';
1083
      $form->{addition}  = "DELETED";
1081 1084
      $form->save_history;
1082 1085
    }
1083 1086
    # /saving the history

Auch abrufbar als: Unified diff