From: Jan Büren <jan@kivitendo-premium.de>
Date: Thu, 30 Apr 2015 14:02:49 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.3.0beta~110
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/c364a9c287a8b66061be8c8331dcdef7106064c8?hp=99562a8d29e5609a3a53d8737dbfeb6f8e5a36c1

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/SL/Auth.pm b/SL/Auth.pm
index 8439a2c4f..2647ea89c 100644
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -930,20 +930,6 @@ sub all_rights_full {
   my $locale = $main::locale;
 
   my @all_rights = (
-    ["--crm",                          $locale->text("CRM optional software")],
-    ["crm_search",                     $locale->text("CRM search")],
-    ["crm_new",                        $locale->text("CRM create customers, vendors and contacts")],
-    ["crm_service",                    $locale->text("CRM services")],
-    ["crm_admin",                      $locale->text("CRM admin")],
-    ["crm_adminuser",                  $locale->text("CRM user")],
-    ["crm_adminstatus",                $locale->text("CRM status")],
-    ["crm_email",                      $locale->text("CRM send email")],
-    ["crm_termin",                     $locale->text("CRM termin")],
-    ["crm_opportunity",                $locale->text("CRM opportunity")],
-    ["crm_knowhow",                    $locale->text("CRM know how")],
-    ["crm_follow",                     $locale->text("CRM follow up")],
-    ["crm_notices",                    $locale->text("CRM notices")],
-    ["crm_other",                      $locale->text("CRM other")],
     ["--master_data",                  $locale->text("Master Data")],
     ["customer_vendor_edit",           $locale->text("Create customers and vendors. Edit all vendors. Edit only customers where salesman equals employee (login)")],
     ["customer_vendor_all_edit",       $locale->text("Create customers and vendors. Edit all vendors. Edit all customers")],
diff --git a/locale/de/special_chars b/locale/de/special_chars
index d542caba0..0d34668d4 100644
--- a/locale/de/special_chars
+++ b/locale/de/special_chars
@@ -22,7 +22,7 @@ order=< > \n
 \n=<br>
 
 [Template/LaTeX]
-order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © \xad \xa0 ➔ → ← |
+order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © \xad \xa0 ➔ → ← | −
 \\=\\textbackslash\s
 <pagebreak>=
 "=''
@@ -55,6 +55,7 @@ _=\\_
 ←=$\\leftarrow$
 \xa0=~
 |=\\textbar
+−={\\textemdash}
 
 [Template/OpenDocument]
 order=& < > " ' \x80 \n \r