Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 281696eb

Von Kivitendo Admin vor mehr als 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/ap.pl
679 679
  if (AP->post_transaction(\%myconfig, \%$form)) {
680 680
    # saving the history
681 681
    if(!exists $form->{addition} && $form->{id} ne "") {
682
      $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
683
      $form->{addition} = "POSTED";
682
      $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
683
      $form->{addition}  = "POSTED";
684
      $form->{what_done} = "invoice";
684 685
      $form->save_history;
685 686
    }
686 687
    # /saving the history
......
705 706
  $form->{postasnew} = 1;
706 707
  # saving the history
707 708
  if(!exists $form->{addition} && $form->{id} ne "") {
708
    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
709
    $form->{addition} = "POSTED AS NEW";
709
    # does this work? post_as_new for ap doesn't immediately save the
710
    # invoice, because the invnumber has to be entered by hand.
711
    # And the value of $form->{postasnew} isn't checked when calling post
712
    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
713
    $form->{addition}  = "POSTED AS NEW";
714
    $form->{what_done} = "invoice";
710 715
    $form->save_history;
711 716
  }
712 717
  # /saving the history
......
783 788
  if (AP->delete_transaction(\%myconfig, \%$form)) {
784 789
    # saving the history
785 790
    if(!exists $form->{addition}) {
786
      $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
787
      $form->{addition} = "DELETED";
791
      $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
792
      $form->{addition}  = "DELETED";
793
      $form->{what_done} = "invoice";
788 794
      $form->save_history;
789 795
    }
790 796
    # /saving the history
......
1028 1034

  
1029 1035
  # saving the history
1030 1036
  if(!exists $form->{addition} && $form->{id} ne "") {
1031
    $form->{snumbers} = "invnumber_$form->{invnumber}";
1032
    $form->{addition} = "STORNO";
1037
    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
1038
    $form->{addition}  = "STORNO";
1039
    $form->{what_done} = "invoice";
1033 1040
    $form->save_history;
1034 1041
  }
1035 1042
  # /saving the history
bin/mozilla/ar.pl
713 713

  
714 714
  # saving the history
715 715
  if(!exists $form->{addition} && $form->{id} ne "") {
716
    $form->{snumbers} = "invnumber_$form->{invnumber}";
717
    $form->{addition} = "POSTED";
716
    $form->{snumbers}  = "invnumber_$form->{invnumber}";
717
    $form->{what_done} = "invoice";
718
    $form->{addition}  = "POSTED";
718 719
    $form->save_history;
719 720
  }
720 721
  # /saving the history
......
736 737
  $form->{postasnew} = 1;
737 738
  # saving the history
738 739
  if(!exists $form->{addition} && $form->{id} ne "") {
739
    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
740
    $form->{addition} = "POSTED AS NEW";
740
    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
741
    $form->{what_done} = "invoice";
742
    $form->{addition}  = "POSTED AS NEW";
741 743
    $form->save_history;
742 744
  }
743 745
  # /saving the history
......
814 816
  if (AR->delete_transaction(\%myconfig, \%$form)) {
815 817
    # saving the history
816 818
    if(!exists $form->{addition}) {
817
      $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
818
      $form->{addition} = "DELETED";
819
      $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
820
      $form->{what_done} = "invoice";
821
      $form->{addition}  = "DELETED";
819 822
      $form->save_history;
820 823
    }
821 824
    # /saving the history
......
1127 1130

  
1128 1131
  # saving the history
1129 1132
  if(!exists $form->{addition} && $form->{id} ne "") {
1130
    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
1131
    $form->{addition} = "STORNO";
1133
    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
1134
    $form->{addition}  = "STORNO";
1135
    $form->{what_done} = "invoice";
1132 1136
    $form->save_history;
1133 1137
  }
1134 1138
  # /saving the history
bin/mozilla/ir.pl
599 599

  
600 600
  # saving the history
601 601
  if(!exists $form->{addition} && $form->{id} ne "") {
602
    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
603
    $form->{addition} = "CANCELED";
602
    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
603
    $form->{what_done} = "invoice";
604
    $form->{addition}  = "CANCELED";
604 605
    $form->save_history;
605 606
  }
606 607
  # /saving the history
......
771 772
  if (IR->post_invoice(\%myconfig, \%$form)){
772 773
    # saving the history
773 774
    if(!exists $form->{addition} && $form->{id} ne "") {
774
      $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
775
      $form->{addition} = "POSTED";
776
      #$form->{what_done} = $locale->text("Rechnungsnummer") . qq| | . $form->{invnumber};
775
      $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
776
      $form->{addition}  = "POSTED";
777
      $form->{what_done} = 'invoice';
777 778
      $form->save_history;
778 779
    }
779 780
    # /saving the history
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