From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 4 Sep 2015 11:19:33 +0000 (+0200)
Subject: Merge branch 'mass_convert_delivery_orders_to_invoice'
X-Git-Tag: release-3.4.1~752
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/cc6d0e60e203d7b7fab1e95908cbe4afca5e18a0?ds=sidebyside;hp=-c

Merge branch 'mass_convert_delivery_orders_to_invoice'
---

cc6d0e60e203d7b7fab1e95908cbe4afca5e18a0
diff --combined menus/user/00-erp.yaml
index 5fba49c65,035d562c2..64d3d7175
--- a/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@@ -265,6 -265,19 +265,19 @@@
    module: letter.pl
    params:
      action: add
+ - parent: ar
+   id: ar_invoices
+   name: Invoices
+   icon: sales_invoice_add
+   order: 850
+ - parent: ar_invoices
+   id: ar_invoices_mass_add_sales_invoice
+   name: Mass Create Print Sales Invoice from Delivery Order
+   order: 100
+   access: invoice_edit
+   params:
+     noshow: 1
+     action: MassInvoiceCreatePrint/list_sales_delivery_orders
  - parent: ar
    id: ar_reports
    name: Reports
@@@ -1341,22 -1354,6 +1354,22 @@@
    params:
      action: company_logo
      no_todo_list: 1
 +- parent: program
 +  id: program_kivitendo_modul
 +  name: kivitendo modules
 +  order: 350
 +- parent: program_kivitendo_modul
 +  id: program_kivitendo_modul_overview
 +  name: Overview kivitendo modules
 +  order: 100
 +  href: http://www.kivitendo-premium.de/module.shtml
 +  target: _blank
 +- parent: program_kivitendo_modul
 +  id: program_kivitendo_modul_activate
 +  name: Activate kivitendo module
 +  order: 200
 +  href: http://www.kivitendo-premium.de/modul-aktivieren.shtml
 +  target: _blank
  - parent: program
    id: program_administration_area
    name: Administration area