Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9a3c56c2

Von Moritz Bunkus vor fast 8 Jahren hinzugefügt

  • ID 9a3c56c2f621507ad87f38b9b20739c030664ba7
  • Vorgänger 5ceae70b
  • Nachfolger dc8a1d5e

Menüvereinheitlichung: »Ein-/Verkauf« → »Lieferscheine« umgestellt

Unterschiede anzeigen:

bin/mozilla/do.pl
365 365
        submit    => [ '#form' ],
366 366
        accesskey => 'enter',
367 367
      ],
368

  
369
      'separator',
370

  
371
      link => [
372
        t8('Add'),
373
        link   => 'do.pl?action=add&type=' . E($::form->{type}),
374
        not_if => ($::form->{type} eq 'purchase_delivery_order') && !$::instance_conf->get_allow_new_purchase_delivery_order,
375
      ],
368 376
    );
369 377
  }
370 378
}
......
374 382

  
375 383
  for my $bar ($::request->layout->get('actionbar')) {
376 384
    $bar->add(
377
      action => [
378
        t8('New invoice'),
379
        submit    => [ '#form', { action => 'invoice_multi' } ],
380
        checks    => [ [ 'kivi.check_if_entries_selected', '#form tbody input[type=checkbox]' ] ],
381
        accesskey => 'enter',
382
      ],
383 385
      action => [
384 386
        t8('Print'),
385 387
        call   => [ 'kivi.SalesPurchase.show_print_dialog', 'js:kivi.MassDeliveryOrderPrint.submitMultiOrders' ],
386 388
        checks => [ [ 'kivi.check_if_entries_selected', '#form tbody input[type=checkbox]' ] ],
387 389
      ],
390

  
391
      'separator',
392

  
393
      @{ $params{report_generator_actions} },
394

  
395
      combobox => [
396
        link => [
397
          t8('Add'),
398
          link   => 'do.pl?action=add&type=' . E($::form->{type}),
399
          not_if => ($::form->{type} eq 'purchase_delivery_order') && !$::instance_conf->get_allow_new_purchase_delivery_order,
400
        ],
401

  
402
        action => [
403
          t8('Merge selected entries into new invoice'),
404
          submit => [ '#form', { action => 'invoice_multi' } ],
405
          checks => [ [ 'kivi.check_if_entries_selected', '#form tbody input[type=checkbox]' ] ],
406
        ],
407
      ],
388 408
    );
389 409
  }
390 410
}
......
856 876
    $idx++;
857 877
  }
858 878

  
859
  setup_do_orders_action_bar();
860

  
861
  $report->generate_with_headers();
879
  $report->generate_with_headers(action_bar_setup_hook => sub { setup_do_orders_action_bar(report_generator_actions => \@_) });
862 880

  
863 881
  $main::lxdebug->leave_sub();
864 882
}
locale/de/all
158 158
  'Add Credit Note'             => 'Gutschrift erfassen',
159 159
  'Add Customer'                => 'Kunde erfassen',
160 160
  'Add Customer/Vendor Number as a reference add-on for SEPA export.' => 'Kunden- Lieferantennummer im Verwendungszweck bei SEPA-Überweisungen anhängen',
161
  'Add Delivery Note'           => 'Lieferschein erfassen',
162
  'Add Delivery Order'          => 'Lieferschein erfassen',
163 161
  'Add Document from \'#1\''    => 'Dokument von \'#1\' hinzufügen',
164 162
  'Add Dunning'                 => 'Mahnung erzeugen',
165 163
  'Add Follow-Up'               => 'Wiedervorlage erstellen',
......
1767 1765
  'Memo'                        => 'Memo',
1768 1766
  'Merchandise'                 => 'Handelsware',
1769 1767
  'Merchandise (typeabbreviation)' => 'H',
1768
  'Merge selected entries into new invoice' => 'Ausgewählte Einträge zu neuer Rechnung zusammenfassen',
1770 1769
  'Merge selected entries into new order' => 'Ausgewählte Einträge zu neuem Auftrag zusammenfassen',
1771 1770
  'Message'                     => 'Nachricht',
1772 1771
  'Method'                      => 'Verfahren',
......
1826 1825
  'New client #1: The name must be unique and not empty.' => 'Neuer Mandant #1: Der Name darf nicht leer und muss eindeutig sein.',
1827 1826
  'New contact'                 => 'Neue Ansprechperson',
1828 1827
  'New filter for tax accounts' => 'Neue Filter für Steuerkonten',
1829
  'New invoice'                 => 'Neue Rechnung',
1830 1828
  'New name'                    => 'Neuer Name',
1831 1829
  'New row, description'        => 'Neue Zeile, Artikelbeschreibung',
1832 1830
  'New row, partnumber'         => 'Neue Zeile, Nummer',
menus/user/00-erp.yaml
139 139
    action: search
140 140
    type: sales_order
141 141
- parent: ar
142
  id: ar_add_delivery_order
143
  name: Add Delivery Order
144
  icon: delivery_order_add
142
  id: ar_delivery_orders
143
  name: Delivery Orders
144
  icon: delivery_order_report
145 145
  order: 400
146 146
  access: sales_delivery_order_edit
147 147
  module: do.pl
148 148
  params:
149
    action: add
149
    action: search
150 150
    type: sales_delivery_order
151 151
- parent: ar
152 152
  id: ar_add_sales_invoice
......
203 203
  name: Reports
204 204
  icon: ar_report
205 205
  order: 900
206
- parent: ar_reports
207
  id: ar_reports_delivery_orders
208
  name: Delivery Orders
209
  icon: delivery_order_report
210
  order: 400
211
  access: sales_delivery_order_edit
212
  module: do.pl
213
  params:
214
    action: search
215
    type: sales_delivery_order
216 206
- parent: ar_reports
217 207
  id: ar_reports_invoices_credit_notes_ar_transactions
218 208
  name: Invoices, Credit Notes & AR Transactions
......
304 294
    action: search
305 295
    type: purchase_order
306 296
- parent: ap
307
  id: ap_add_delivery_note
308
  name: Add Delivery Note
297
  id: aports_delivery_orders
298
  name: Delivery Orders
309 299
  order: 300
310
  access: client/allow_new_purchase_delivery_order & purchase_delivery_order_edit
300
  access: purchase_delivery_order_edit
311 301
  module: do.pl
312 302
  params:
313
    action: add
303
    action: search
314 304
    type: purchase_delivery_order
315 305
- parent: ap
316 306
  id: ap_add_vendor_invoice
......
334 324
  name: Reports
335 325
  icon: ap_report
336 326
  order: 500
337
- parent: ap_reports
338
  id: ap_reports_delivery_orders
339
  name: Delivery Orders
340
  order: 300
341
  access: purchase_delivery_order_edit
342
  module: do.pl
343
  params:
344
    action: search
345
    type: purchase_delivery_order
346 327
- parent: ap_reports
347 328
  id: ap_reports_vendor_invoices_ap_transactions
348 329
  name: Vendor Invoices & AP Transactions

Auch abrufbar als: Unified diff