Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 12357ea5

Von Bernd Bleßmann vor mehr als 3 Jahren hinzugefügt

  • ID 12357ea514e98250dd460c45f660cc922b5eb760
  • Vorgänger 8d183681
  • Nachfolger dbf9afad

Dialogbuchung: verschiedene Buchungs-Aktionen je nach Mandantenkonfig

- DMS aus
nur "Buchen" bucht und führt zu einer leeren Buchungsmaske

- DMS an und "Dokumente für Dialogbuchung hinzufügen" eingestellt:
"Buchen" (Haupt-Aktion) bucht und führt im selben Beleg zum DMS-Tab.
Es gibt eine zweite Aktion "Buchen und neue Buchung". Diese bucht und
führt zu einer leeren Buchungsmaske

- DMS an und "Dokumente für Dialogbuchung hinzufügen" ausgestellt:
"Buchen" (Haupt-Aktion) bucht und führt zu einer leeren Buchungsmaske.
Es gibt eine zweite Aktion "Buchen und Dokument hochladen". Diese bucht und
führt im selben Beleg zum DMS-Tab

Unterschiede anzeigen:

bin/mozilla/gl.pl
975 975
    $is_linked_bank_transaction = 1;
976 976
  }
977 977

  
978
  my $create_post_action = sub {
979
    # $_[0]: description
980
    # $_[1]: after_action
981
    action => [
982
      $_[0],
983
      submit   => [ '#form', { action => 'post', after_action => $_[1] } ],
984
      disabled => $form->{locked}                           ? t8('The billing period has already been locked.')
985
                : $form->{storno}                           ? t8('A canceled general ledger transaction cannot be posted.')
986
                : ($form->{id} && $change_never)            ? t8('Changing general ledger transaction has been disabled in the configuration.')
987
                : ($form->{id} && $change_on_same_day_only) ? t8('General ledger transactions can only be changed on the day they are posted.')
988
                : $is_linked_bank_transaction               ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
989
                :                                             undef,
990
    ],
991
  };
992

  
993
  my %post_entry;
994
  if ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) {
995
    %post_entry = (combobox => [ $create_post_action->(t8('Post'), 'doc-tab'),
996
                                 $create_post_action->(t8('Post and new booking')) ]);
997
  } elsif ($::instance_conf->get_doc_storage) {
998
    %post_entry = (combobox => [ $create_post_action->(t8('Post')),
999
                                 $create_post_action->(t8('Post and upload document'), 'doc-tab') ]);
1000
  } else {
1001
    %post_entry = $create_post_action->(t8('Post'));
1002
  }
1003

  
978 1004
  for my $bar ($::request->layout->get('actionbar')) {
979 1005
    $bar->add(
980 1006
      action => [
......
983 1009
        id        => 'update_button',
984 1010
        accesskey => 'enter',
985 1011
      ],
986
      action => [
987
        t8('Post'),
988
        submit   => [ '#form', { action => 'post' } ],
989
        disabled => $form->{locked}                           ? t8('The billing period has already been locked.')
990
                  : $form->{storno}                           ? t8('A canceled general ledger transaction cannot be posted.')
991
                  : ($form->{id} && $change_never)            ? t8('Changing general ledger transaction has been disabled in the configuration.')
992
                  : ($form->{id} && $change_on_same_day_only) ? t8('General ledger transactions can only be changed on the day they are posted.')
993
                  : $is_linked_bank_transaction               ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
994
                  :                                             undef,
995
        ],
1012
      %post_entry,
996 1013
      combobox => [
997 1014
        action => [ t8('Storno'),
998 1015
          submit   => [ '#form', { action => 'storno' } ],
......
1427 1444
  if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
1428 1445
    $form->redirect($msg);
1429 1446

  
1430
  } elsif ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) {
1447
  } elsif ('doc-tab' eq $form->{after_action}) {
1431 1448
    # Redirect with callback containing a fragment does not work (by now)
1432 1449
    # because the callback info is stored in the session an parsing the
1433 1450
    # callback parameters does not support fragments (see SL::Form::redirect).
locale/de/all
2489 2489
  'Positions'                   => 'Positionen',
2490 2490
  'Post'                        => 'Buchen',
2491 2491
  'Post Payment'                => 'Zahlung buchen',
2492
  'Post and new booking'        => 'Buchen und neue Buchung',
2493
  'Post and upload document'    => 'Buchen und Dokument hochladen',
2492 2494
  'Post payments'               => 'Zahlungen buchen',
2493 2495
  'Post payments for selected invoices' => 'Zahlungen für ausgewählten Rechnungen buchen',
2494 2496
  'Postal Invoice'              => 'Rechnung per Post',
locale/en/all
2489 2489
  'Positions'                   => '',
2490 2490
  'Post'                        => '',
2491 2491
  'Post Payment'                => '',
2492
  'Post and new booking'        => '',
2493
  'Post and upload document'    => '',
2492 2494
  'Post payments'               => '',
2493 2495
  'Post payments for selected invoices' => '',
2494 2496
  'Postal Invoice'              => '',

Auch abrufbar als: Unified diff