Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ab4fd70d

Von Moritz Bunkus vor fast 8 Jahren hinzugefügt

  • ID ab4fd70d62762d7d0e1e136be66ff2a0b8b3568b
  • Vorgänger 2884b5ce
  • Nachfolger 329a06d7

Menüvereinheitlichung: »Zahlungsverkehr« → »Kontobewegungen/Auszugsimport/Verbuchen/Abgleich« umgestellt

Unterschiede anzeigen:

SL/Controller/BankImport.pm
19 19
  my ($self, %params) = @_;
20 20

  
21 21
  $self->setup_upload_mt940_action_bar;
22
  $self->render('bankimport/form', title => $::locale->text('MT940 import'), profile => $self->profile ? 1 : 0);
22
  $self->render('bankimport/form', title => $::locale->text('Import statement (MT940 format)'), profile => $self->profile ? 1 : 0);
23 23
}
24 24

  
25 25
sub action_import_mt940 {
......
63 63
        submit    => [ '#form', { action => 'BankImport/import_mt940' } ],
64 64
        accesskey => 'enter',
65 65
      ],
66

  
67
      'separator',
68

  
69
      combobox => [
70
        action => [ t8('Account') ],
71

  
72
        link => [
73
          t8('Post Bank Statement'),
74
          link => $self->url_for(controller => 'BankTransaction', action => 'search'),
75
        ],
76

  
77
        link => [
78
          t8('Reconciliation with bank'),
79
          link => $self->url_for(controller => 'Reconciliation', action => 'search'),
80
        ],
81

  
82
        link => [
83
          t8('Manual Reconciliation'),
84
          link => $self->url_for(controller => 'rc.pl', action => 'reconciliation'),
85
        ],
86
      ],
66 87
    );
67 88
  }
68 89
}
SL/Controller/BankTransaction.pm
50 50

  
51 51
  $self->setup_search_action_bar;
52 52
  $self->render('bank_transactions/search',
53
                title          => t8('Post Bank Statement'),
53 54
                 BANK_ACCOUNTS => $bank_accounts);
54 55
}
55 56

  
......
59 60
  $self->make_filter_summary;
60 61
  $self->prepare_report;
61 62

  
62
  $self->setup_list_all_action_bar;
63
  $self->report_generator_list_objects(report => $self->{report}, objects => $self->models->get);
63
  $self->report_generator_list_objects(
64
    report  => $self->{report},
65
    objects => $self->models->get,
66
    options => {
67
      action_bar_setup_hook => sub { $self->setup_list_all_action_bar(report_generator_actions => \@_) },
68
    },
69
  );
64 70
}
65 71

  
66 72
sub action_list {
......
264 270
  $bank_transactions = [ sort { $b->{agreement} <=> $a->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 0;
265 271

  
266 272
  $::request->layout->add_javascripts("kivi.BankTransaction.js");
273
  $self->setup_list_action_bar;
267 274
  $self->render('bank_transactions/list',
268 275
                title             => t8('Bank transactions MT940'),
269 276
                BANK_TRANSACTIONS => $bank_transactions,
......
813 820
    std_column_visibility => 1,
814 821
    controller_class      => 'BankTransaction',
815 822
    output_format         => 'HTML',
816
    top_info_text         => $::locale->text('Bank transactions'),
817
    title                 => $::locale->text('Bank transactions'),
823
    top_info_text         => $::locale->text('Show account movements'),
824
    title                 => $::locale->text('Show account movements'),
818 825
    allow_pdf_export      => 1,
819 826
    allow_csv_export      => 1,
820 827
  );
......
905 912
        submit    => [ '#search_form', { action => 'BankTransaction/list' } ],
906 913
        accesskey => 'enter',
907 914
      ],
915

  
916
      'separator',
917

  
918
      combobox => [
919
        action => [ t8('Account') ],
920

  
921
        link => [
922
          t8('Import Bank Statement'),
923
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
924
        ],
925

  
926
        link => [
927
          t8('Reconciliation with bank'),
928
          link => $self->url_for(controller => 'Reconciliation', action => 'search'),
929
        ],
930

  
931
        link => [
932
          t8('Manual Reconciliation'),
933
          link => $self->url_for(controller => 'rc.pl', action => 'reconciliation'),
934
        ],
935
      ],
936
    );
937
  }
938
}
939

  
940
sub setup_list_action_bar {
941
  my ($self, %params) = @_;
942

  
943
  for my $bar ($::request->layout->get('actionbar')) {
944
    $bar->add(
945
      combobox => [
946
        action => [ t8('Save') ],
947

  
948
        action => [
949
          t8('Save assigned invoices'),
950
          submit => [ '#list_all_form', { action => 'BankTransaction/save_invoices' } ],
951
        ],
952

  
953
        action => [
954
          t8('Save selected proposals'),
955
          submit => [ '#list_automatic_form', { action => 'BankTransaction/save_proposals' } ],
956
        ],
957
      ], # end of combobox "Save"
958

  
959
      'separator',
960

  
961
      combobox => [
962
        action => [ t8('Account') ],
963

  
964
        link => [
965
          t8('Import Bank Statement'),
966
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
967
        ],
968

  
969
        link => [
970
          t8('Reconciliation with bank'),
971
          link => $self->url_for(controller => 'Reconciliation', action => 'search'),
972
        ],
973

  
974
        link => [
975
          t8('Manual Reconciliation'),
976
          link => $self->url_for(controller => 'rc.pl', action => 'reconciliation'),
977
        ],
978
      ], # end of combobox "Account"
908 979
    );
909 980
  }
910 981
}
......
919 990
        submit    => [ '#filter_form', { action => 'BankTransaction/list_all' } ],
920 991
        accesskey => 'enter',
921 992
      ],
993

  
994
      'separator',
995

  
996
      @{ $params{report_generator_actions} },
997

  
998
      combobox => [
999
        action => [ t8('Account') ],
1000

  
1001
        link => [
1002
          t8('Import Bank Statement'),
1003
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
1004
        ],
1005

  
1006
        link => [
1007
          t8('Post Bank Statement'),
1008
          link => $self->url_for(controller => 'BankTransaction', action => 'search'),
1009
        ],
1010

  
1011
        link => [
1012
          t8('Reconciliation with bank'),
1013
          link => $self->url_for(controller => 'Reconciliation', action => 'search'),
1014
        ],
1015

  
1016
        link => [
1017
          t8('Manual Reconciliation'),
1018
          link => $self->url_for(controller => 'rc.pl', action => 'reconciliation'),
1019
        ],
1020
      ],
922 1021
    );
923 1022
  }
924 1023
}
SL/Controller/CsvImport.pm
766 766
        id        => 'action_import',
767 767
      ],
768 768
    );
769

  
770
    if ($self->profile && ($self->profile->{type} eq 'bank_transactions')) {
771
      $bar->add(
772
        'separator',
773

  
774
        combobox => [
775
          action => [ t8('Account') ],
776

  
777
          link => [
778
            t8('Post Bank Statement'),
779
            link => $self->url_for(controller => 'BankTransaction', action => 'search'),
780
          ],
781

  
782
          link => [
783
            t8('Reconciliation with bank'),
784
            link => $self->url_for(controller => 'Reconciliation', action => 'search'),
785
          ],
786

  
787
          link => [
788
            t8('Manual Reconciliation'),
789
            link => $self->url_for(controller => 'rc.pl', action => 'reconciliation'),
790
          ],
791
        ],
792
      );
793
    }
769 794
  }
770 795
}
771 796

  
SL/Controller/Reconciliation.pm
45 45
  $self->setup_reconciliation_action_bar;
46 46
  $self->render('reconciliation/form',
47 47
                ui_tab => scalar(@{$self->{PROPOSALS}}) > 0?1:0,
48
                title => t8('Reconciliation'));
48
                title  => t8('Reconciliation with bank'));
49 49
}
50 50

  
51 51
sub action_load_overview {
......
632 632
        submit    => [ '#search_form', { action => 'Reconciliation/reconciliation' } ],
633 633
        accesskey => 'enter',
634 634
      ],
635

  
636
      'separator',
637

  
638
      combobox => [
639
        action => [ t8('Account') ],
640

  
641
        link => [
642
          t8('Import Bank Statement'),
643
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
644
        ],
645

  
646
        link => [
647
          t8('Post Bank Statement'),
648
          link => $self->url_for(controller => 'BankTransaction', action => 'search'),
649
        ],
650

  
651
        link => [
652
          t8('Manual Reconciliation'),
653
          link => $self->url_for(controller => 'rc.pl', action => 'reconciliation'),
654
        ],
655
      ],
635 656
    );
636 657
  }
637 658
}
......
646 667
        call      => [ 'filter_table' ],
647 668
        accesskey => 'enter',
648 669
      ],
670

  
671
      'separator',
672

  
673
      combobox => [
674
        action => [ t8('Account') ],
675

  
676
        link => [
677
          t8('Import Bank Statement'),
678
          link => $self->url_for(controller => 'BankImport', action => 'upload_mt940'),
679
        ],
680

  
681
        link => [
682
          t8('Post Bank Statement'),
683
          link => $self->url_for(controller => 'BankTransaction', action => 'search'),
684
        ],
685

  
686
        link => [
687
          t8('Manual Reconciliation'),
688
          link => $self->url_for(controller => 'rc.pl', action => 'reconciliation'),
689
        ],
690
      ],
649 691
    );
650 692
  }
651 693
}
SL/Presenter/Record.pm
458 458

  
459 459
  return $self->record_list(
460 460
    $list,
461
    title   => $::locale->text('Bank transactions'),
461
    title   => $::locale->text('Account movements'),
462 462
    type    => 'bank_transactions',
463 463
    columns => [
464 464
      [ $::locale->text('Transdate'),            'transdate'                      ],
bin/mozilla/rc.pl
173 173
        submit    => [ '#form', { action => "get_payments" } ],
174 174
        accesskey => 'enter',
175 175
      ],
176

  
177
      'separator',
178

  
179
      combobox => [
180
        action => [ t8('Account') ],
181

  
182
        link => [
183
          t8('Import Bank Statement'),
184
          link => 'controller.pl?action=BankImport/upload_mt940',
185
        ],
186

  
187
        link => [
188
          t8('Post Bank Statement'),
189
          link => 'controller.pl?action=BankTransaction/search',
190
        ],
191

  
192
        link => [
193
          t8('Reconciliation with bank'),
194
          link => 'controller.pl?action=Reconciliation/search',
195
        ],
196
      ],
176 197
    );
177 198
  }
178 199
}
locale/de/all
132 132
  'Account deleted!'            => 'Konto gelöscht!',
133 133
  'Account for fees'            => 'Konto f&uuml;r Geb&uuml;hren',
134 134
  'Account for interest'        => 'Konto f&uuml;r Zinsen',
135
  'Account movements'           => 'Kontobewegungen',
135 136
  'Account number'              => 'Kontonummer',
136 137
  'Account number not unique!'  => 'Kontonummer bereits vorhanden!',
137 138
  'Account number of the goal/source' => 'Ziel- oder Quellkonto',
......
373 374
  'Bank Code Number'            => 'Bankleitzahl',
374 375
  'Bank Connection Tax Office'  => 'Bankverbindung des Finanzamts',
375 376
  'Bank Connections'            => 'Bankverbindungen',
376
  'Bank Import'                 => 'Kontoauszug importieren',
377 377
  'Bank Transaction'            => 'Bankkonto',
378 378
  'Bank account'                => 'Bankkonto',
379 379
  'Bank accounts'               => 'Bankkonten',
......
1497 1497
  'Import'                      => 'Import',
1498 1498
  'Import AP from Scanner or Email' => 'Einkaufsbelege importieren vom Scanner oder von Email',
1499 1499
  'Import AR from Scanner or Email' => 'Verkaufsbelege importieren vom Scanner oder von Email',
1500
  'Import Bank Statement'       => 'Kontoauszug importieren',
1500 1501
  'Import CSV'                  => 'CSV-Import',
1501 1502
  'Import Status'               => 'Import Status',
1502 1503
  'Import a MT940 file:'        => 'Laden Sie eine MT940 Datei hoch:',
......
1510 1511
  'Import profiles'             => 'Import-Profil',
1511 1512
  'Import result'               => 'Import-Ergebnis',
1512 1513
  'Import scanned documents'    => 'Importiere gescannte Dateien',
1514
  'Import statement (MT940 format)' => 'Kontoauszug importieren (MT940-Format)',
1513 1515
  'In order to do that hit the button "Delete transaction".' => 'Drücken Sie dafür auf den Button "Buchung löschen".',
1514 1516
  'In order to migrate the old folder structure into the new structure you have to chose which client the old structure will be assigned to.' => 'Um die alte Ordnerstruktur in die neue Struktur zu migrieren, müssen Sie festlegen, welchem Mandanten die bisherige Struktur zugewiesen wird.',
1515 1517
  'In order to use kivitendo you have to create at least a client, a user and a group.' => 'Um kivitendo zu nutzen, müssen Sie mindestens einen Mandanten, einen Benutzer und eine Gruppe anlegen.',
......
1719 1721
  'MAILED'                      => 'Gesendet',
1720 1722
  'MD'                          => 'PT',
1721 1723
  'MIME type'                   => 'MIME-Typ',
1722
  'MT940 import'                => 'MT940 Import',
1723 1724
  'Main Preferences'            => 'Grundeinstellungen',
1724 1725
  'Main sorting'                => 'Hauptsortierung',
1725 1726
  'Make'                        => 'Lieferant',
......
1732 1733
  'Mandate Date of Signature'   => 'Mandat-Unterschriftsdatum',
1733 1734
  'Mandator ID'                 => 'Mandanten-ID',
1734 1735
  'Mandatory Departments'       => 'Benutzer muss Abteilungen vergeben',
1736
  'Manual Reconciliation'       => 'Manueller Kontenabgleich',
1735 1737
  'Manually sent E-Mails will have their BCC field appended with this address. Will not trigger for employees without the right to send bcc, and will not apply to mails sent by automated jobs.' => 'Diese Mailadresse wird automatisch in das BCC Feld bei Mailversand kopiert. Hat keine Auswirkungen für Mitarbeiter ohne das Recht BCC zu versenden, und ignoriert wenn Mails automatisch versendet werden.',
1736 1738
  'Map'                         => 'Karte',
1737 1739
  'Mappings (csv_import)'       => 'Spaltenzuordnungen',
......
2159 2161
  'Portrait'                    => 'Hochformat',
2160 2162
  'Position type in quotation/order' => 'Positionstyp in Angebot/Auftrag',
2161 2163
  'Post'                        => 'Buchen',
2164
  'Post Bank Statement'         => 'Kontoauszug verbuchen',
2162 2165
  'Post Outgoing Payment'       => 'Zahlungsausgang verbuchen',
2163 2166
  'Post Payment'                => 'Zahlung buchen',
2164 2167
  'Post Receipt'                => 'Zahlungseingang verbuchen',
......
2530 2533
  'Save and keep open'          => 'Speichern und geöffnet lassen',
2531 2534
  'Save as a new draft.'        => 'Als neuen Entwurf speichern',
2532 2535
  'Save as new'                 => 'Als neu speichern',
2536
  'Save assigned invoices'      => 'Zugewiesene Rechnungen speichern',
2533 2537
  'Save document in WebDAV repository' => 'Dokument in WebDAV-Ablage speichern',
2534 2538
  'Save draft'                  => 'Entwurf speichern',
2535
  'Save invoices'               => 'Rechnungen speichern',
2536 2539
  'Save profile'                => 'Profil speichern',
2537
  'Save proposals'              => 'Vorschläge speichern',
2540
  'Save selected proposals'     => 'Ausgewählte Vorschläge speichern',
2538 2541
  'Save settings as'            => 'Einstellungen speichern unter',
2539 2542
  'Saving failed. Error message from the database: #1' => 'Speichern schlug fehl. Fehlermeldung der Datenbank: #1',
2540 2543
  'Saving the file \'%s\' failed. OS error message: %s' => 'Das Speichern der Datei \'%s\' schlug fehl. Fehlermeldung des Betriebssystems: %s',
......
2544 2547
  'Search'                      => 'Suchen',
2545 2548
  'Search AP Aging'             => 'Offene Verbindlichkeiten',
2546 2549
  'Search AR Aging'             => 'Offene Forderungen',
2547
  'Search bank transactions'    => 'Filter für Bankbuchungen',
2548 2550
  'Search contacts'             => 'Personensuche',
2549 2551
  'Search projects'             => 'Projektsuche',
2550 2552
  'Search term'                 => 'Suchbegriff',
......
2648 2650
  'Show Stornos'                => 'Stornos anzeigen',
2649 2651
  'Show TODO list'              => 'Aufgabenliste anzeigen',
2650 2652
  'Show Transfer via default'   => 'Ein- / Auslagern über Standardlagerplatz anzeigen (zusätzlicher Knopf in Beleg Lieferschein)',
2653
  'Show account movements'      => 'Kontobewegungen anzeigen',
2651 2654
  'Show administration link'    => 'Link zur Administration anzeigen',
2652 2655
  'Show all details'            => 'Alle Details anzeigen',
2653 2656
  'Show all parts'              => 'Alle Artikel anzeigen',
menus/user/00-erp.yaml
465 465
    action: bank_transfer_search
466 466
    vc: vendor
467 467
- parent: cash
468
  id: cash_bank_import
469
  name: Bank Import
470
  order: 500
471
  access: bank_transaction
472
  params:
473
    action: BankImport/upload_mt940
474
- parent: cash
475
  id: cash_bank_transactions_mt940
476
  name: Bank transactions MT940
477
  order: 600
478
  access: bank_transaction
479
  params:
480
    action: BankTransaction/search
481
- parent: cash
482
  id: cash_reconciliation_with_bank
483
  name: Reconciliation with bank
484
  order: 700
485
  access: bank_transaction
486
  params:
487
    action: Reconciliation/search
488
- parent: cash
489
  id: cash_reconciliation
490
  name: Reconciliation
491
  icon: reconcilliation
492
  order: 800
493
  access: cash
494
  module: rc.pl
495
  params:
496
    action: reconciliation
497
- parent: cash
498
  id: cash_reports
499
  name: Reports
500
  icon: cash_report
501
  order: 900
502
- parent: cash_reports
503
  id: cash_reports_bank_transactions
504
  name: Bank transactions
468
  id: cash_bank_transactions
469
  name: Account movements
505 470
  order: 500
506 471
  access: bank_transaction
507 472
  params:
templates/webpages/bank_transactions/search.html
5 5

  
6 6
[%- INCLUDE 'common/flash.html' %]
7 7

  
8
 <form method="post" action="controller.pl" id="search_form">
8
 <h1>[% title %]</h1>
9 9

  
10
  <div class="listtop">[% 'Search bank transactions' | $T8 %]</div>
10
 <form method="post" action="controller.pl" id="search_form">
11 11

  
12 12
  <p>
13 13
   <table>
templates/webpages/bank_transactions/tabs/all.html
13 13
[% L.hidden_tag('filter.bank_account', FORM.filter.bank_account) %]
14 14
[% L.hidden_tag('filter.fromdate', FORM.filter.fromdate) %]
15 15
[% L.hidden_tag('filter.todate',   FORM.filter.todate) %]
16
[% L.hidden_tag('action', 'BankTransaction/dispatch') %]
17 16
[% L.hidden_tag('ui_tab', ui_tab) %]
18 17

  
19 18
 <table id="bt_list">
......
151 150
 </table>
152 151

  
153 152
 <p>
154
  [% L.submit_tag('action_save_invoices', LxERP.t8('Save invoices')) %]
155 153
  [% L.button_tag('kivi.BankTransaction.show_set_all_sources_memos_dialog("#list_all_form [name^=\\"sources_\\"]:visible", "#list_all_form [name^=\\"memos_\\"]:visible")', LxERP.t8('Set all source and memo fields')) %]
156 154
 </p>
157 155

  
templates/webpages/bank_transactions/tabs/automatic.html
4 4
[% L.hidden_tag('filter.bank_account', FORM.filter.bank_account) %]
5 5
[% L.hidden_tag('filter.fromdate', FORM.filter.fromdate) %]
6 6
[% L.hidden_tag('filter.todate',   FORM.filter.todate) %]
7
[% L.hidden_tag('action', 'BankTransaction/dispatch') %]
8 7
[% L.hidden_tag('ui_tab', ui_tab) %]
9 8

  
10 9
<table id="bank_transactions_proposals">
......
84 83
</table>
85 84

  
86 85
<p>
87
 [% L.submit_tag('action_save_proposals', LxERP.t8('Save proposals')) %]
88 86
 [% L.button_tag('kivi.BankTransaction.show_set_all_sources_memos_dialog("#list_automatic_form [name^=\\"sources.\\"]", "#list_automatic_form [name^=\\"memos.\\"]")', LxERP.t8('Set all source and memo fields')) %]
89 87
</p>
90 88

  
templates/webpages/rc/step1.html
2 2
[%- USE HTML %]
3 3
[%- USE L %]
4 4
[%- USE LxERP %]
5
<h1>[% 'Reconciliation' | $T8 %]</h1>
5
<h1>[% 'Manual Reconciliation' | $T8 %]</h1>
6 6

  
7 7
<form method="post" action="rc.pl" id="form">
8 8

  
templates/webpages/rc/step2.html
3 3
[%- USE T8 %]
4 4
[%- USE LxERP  %]
5 5

  
6
<h1>[% accno | html %]--[% account | html %]</h1>
6
<h1>[% LxERP.t8('Manual Reconciliation') %] — [% accno | html %] — [% account | html %]</h1>
7 7

  
8 8
<p>[% FOREACH row IN option %][% row %][% ', ' UNLESS loop.last %][% END %]</p>
9 9

  

Auch abrufbar als: Unified diff