Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision dc8a1d5e

Von Moritz Bunkus vor fast 8 Jahren hinzugefügt

  • ID dc8a1d5e01a2b4b0a04c11695ea4a5af70f462f5
  • Vorgänger 9a3c56c2
  • Nachfolger 1968dad5

Menüvereinheitlichung: »Verkauf« → »Rechnungen…«, »Finanzbuchhaltung« → »Debitorenbuchungen« umgestellt

Unterschiede anzeigen:

bin/mozilla/ar.pl
873 873
        submit    => [ '#form' ],
874 874
        accesskey => 'enter',
875 875
      ],
876

  
877
      'separator',
878

  
879
      combobox => [
880
        action => [ t8('Add') ],
881

  
882
        link => [
883
          t8('Add Sales Invoice'),
884
          link     => 'is.pl?action=add&type=invoice',
885
          disabled => $::auth->assert('invoice_edit', 1) ? undef : t8('You do not have the permissions to access this function.'),
886
        ],
887

  
888
        link => [
889
          t8('Add Credit Note'),
890
          link     => 'is.pl?action=add&type=credit_note',
891
          disabled => $::auth->assert('invoice_edit', 1) ? undef : t8('You do not have the permissions to access this function.'),
892
        ],
893

  
894
        link => [
895
          t8('Add AR Transaction'),
896
          link     => 'ar.pl?action=add',
897
          disabled => $::auth->assert('ar_transactions', 1) ? undef : t8('You do not have the permissions to access this function.'),
898
        ],
899
      ], # end of combobox "add"
876 900
    );
877 901
  }
878 902
}
......
888 912
        disabled => !$params{num_rows} ? $::locale->text('The report doesn\'t contain entries.') : undef,
889 913
      ],
890 914

  
915
      @{ $params{report_generator_actions} },
916

  
917
      'separator',
918

  
891 919
      combobox => [
892
        action => [ $::locale->text('Create new') ],
920
        action => [ t8('Add') ],
921

  
922
        link => [
923
          t8('Add Sales Invoice'),
924
          link     => 'is.pl?action=add&type=invoice',
925
          disabled => $::auth->assert('invoice_edit', 1) ? undef : t8('You do not have the permissions to access this function.'),
926
        ],
927

  
928
        link => [
929
          t8('Add Credit Note'),
930
          link     => 'is.pl?action=add&type=credit_note',
931
          disabled => $::auth->assert('invoice_edit', 1) ? undef : t8('You do not have the permissions to access this function.'),
932
        ],
933

  
934
        link => [
935
          t8('Add AR Transaction'),
936
          link     => 'ar.pl?action=add',
937
          disabled => $::auth->assert('ar_transactions', 1) ? undef : t8('You do not have the permissions to access this function.'),
938
        ],
939

  
893 940
        action => [
894
          $::locale->text('AR Transaction'),
895
          submit => [ '#create_new_form', { action => 'ar_transaction' } ],
941
          $::locale->text('Merge selected entries into new invoice'),
942
          checks   => [ [ 'kivi.check_if_entries_selected', '[type=checkbox][name^=id]' ] ],
943
          submit   => [ '#create_new_form', { action => 'sales_invoice' } ],
944
          disabled => $::auth->assert('invoice_edit', 1) ? undef : t8('You do not have the permissions to access this function.'),
896 945
        ],
946

  
897 947
        action => [
898
          $::locale->text('Sales Invoice'),
899
          submit => [ '#create_new_form', { action => 'sales_invoice' } ],
948
          $::locale->text('Merge selected entries into new AR transaction'),
949
          checks   => [ [ 'kivi.check_if_entries_selected', '[type=checkbox][name^=id]' ] ],
950
          submit   => [ '#create_new_form', { action => 'ar_transaction' } ],
951
          disabled => $::auth->assert('ar_transactions', 1) ? undef : t8('You do not have the permissions to access this function.'),
900 952
        ],
901
      ], # end of combobox "Create new"
953
      ], # end of combobox "add"
902 954
    );
903 955
  }
904 956
}
......
1199 1251
  $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
1200 1252

  
1201 1253
  $::request->layout->add_javascripts('kivi.MassInvoiceCreatePrint.js');
1202
  setup_ar_transactions_action_bar(num_rows => scalar(@{ $form->{AR} }));
1203 1254

  
1204
  $report->generate_with_headers();
1255
  $report->generate_with_headers(action_bar_setup_hook => sub { setup_ar_transactions_action_bar(num_rows => scalar(@{ $form->{AR} }), report_generator_actions => \@_) });
1205 1256

  
1206 1257
  $main::lxdebug->leave_sub();
1207 1258
}
locale/de/all
148 148
  'Add'                         => 'Erfassen',
149 149
  'Add (experimental)'          => 'Erfassen (experimentell)',
150 150
  'Add AP Transaction'          => 'Kreditorenbuchung',
151
  'Add AR Transaction'          => 'Debitorenbuchung',
151
  'Add AR Transaction'          => 'Debitorenbuchung erfassen',
152 152
  'Add Account'                 => 'Konto erfassen',
153 153
  'Add Accounts Payables Transaction' => 'Kreditorenbuchung erfassen',
154 154
  'Add Accounts Receivables Transaction' => 'Debitorenbuchung erfassen',
......
1765 1765
  'Memo'                        => 'Memo',
1766 1766
  'Merchandise'                 => 'Handelsware',
1767 1767
  'Merchandise (typeabbreviation)' => 'H',
1768
  'Merge selected entries into new AR transaction' => 'Ausgewählte Einträge zu neuer Debitorenbuchung zusammenfassen',
1768 1769
  'Merge selected entries into new invoice' => 'Ausgewählte Einträge zu neuer Rechnung zusammenfassen',
1769 1770
  'Merge selected entries into new order' => 'Ausgewählte Einträge zu neuem Auftrag zusammenfassen',
1770 1771
  'Message'                     => 'Nachricht',
menus/user/00-erp.yaml
149 149
    action: search
150 150
    type: sales_delivery_order
151 151
- parent: ar
152
  id: ar_add_sales_invoice
153
  name: Add Sales Invoice
154
  icon: sales_invoice_add
152
  id: ar_invoices_credit_notes_ar_transactions
153
  name: Invoices, Credit Notes & AR Transactions
154
  icon: invoices_report
155 155
  order: 500
156 156
  access: invoice_edit
157
  module: is.pl
158
  params:
159
    action: add
160
    type: invoice
161
- parent: ar
162
  id: ar_add_credit_note
163
  name: Add Credit Note
164
  icon: credit_note_add
165
  order: 600
166
  access: invoice_edit
167
  module: is.pl
157
  module: ar.pl
168 158
  params:
169
    action: add
170
    type: credit_note
159
    action: search
160
    nextsub: ar_transactions
171 161
- parent: ar
172 162
  id: ar_add_dunning
173 163
  name: Add Dunning
174 164
  icon: dunning_add
175
  order: 700
165
  order: 600
176 166
  access: dunning_edit
177 167
  module: dn.pl
178 168
  params:
......
203 193
  name: Reports
204 194
  icon: ar_report
205 195
  order: 900
206
- parent: ar_reports
207
  id: ar_reports_invoices_credit_notes_ar_transactions
208
  name: Invoices, Credit Notes & AR Transactions
209
  icon: invoices_report
210
  order: 500
211
  access: invoice_edit
212
  module: ar.pl
213
  params:
214
    action: search
215
    nextsub: ar_transactions
216 196
- parent: ar_reports
217 197
  id: ar_reports_sales_report
218 198
  name: Sales Report
......
436 416
  module: gl.pl
437 417
  params:
438 418
    action: add
439
- parent: general_ledger
440
  id: general_ledger_add_ar_transaction
441
  name: Add AR Transaction
442
  icon: ar_transaction_add
443
  order: 200
444
  access: ar_transactions
445
  module: ar.pl
446
  params:
447
    action: add
448 419
- parent: general_ledger
449 420
  id: general_ledger_add_ap_transaction
450 421
  name: Add AP Transaction

Auch abrufbar als: Unified diff