Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f3a02fb6

Von Jan Büren vor fast 8 Jahren hinzugefügt

  • ID f3a02fb642b3320d29955474c733cc953e557293
  • Vorgänger 5ef1fa84
  • Nachfolger 583f1f0f

Revert "Ticket 29 Verknüpfte Belege -> keine Verknüpfung von Rechnung nach Auftrag"

This reverts commit 77350196300e930abc7de0df7dbf42e8cd6193b8.

Conflicts:
SL/OE.pm

Unterschiede anzeigen:

bin/mozilla/io.pl
888 888
  $form->{old_employee_id} = $form->{employee_id};
889 889
  $form->{old_salesman_id} = $form->{salesman_id};
890 890

  
891
  # link doc invoice -> quotation (single id no multi mode)
892
  $form->{convert_from_ar_ids} = delete $form->{id};
893

  
894
  delete $form->{$_} foreach (qw(printed emailed queued));
891
  map { delete $form->{$_} } qw(id printed emailed queued);
895 892
  my $buysell;
896 893
  if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
897 894
    $form->{title} = $locale->text('Add Purchase Order');
......
954 951
  if ($form->{type} =~  /(sales|purchase)_order/) {
955 952
    $form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
956 953
  }
957
  # link doc order -> quotation (single id no multi mode)
958
  $form->{convert_from_oe_ids} = delete $form->{id};
959

  
960 954
  if ($form->{second_run}) {
961 955
    $form->{print_and_post} = 0;
962 956
  }
963
  delete $form->{$_} foreach (qw(printed emailed queued));
957
  map { delete $form->{$_} } qw(id printed emailed queued);
964 958

  
965 959
  my $buysell;
966 960
  if ($form->{script} eq 'ir.pl' || $form->{type} eq 'purchase_order') {

Auch abrufbar als: Unified diff