Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --combined menu.ini
index 6a77fa8,edb30dc..1ed60a7
--- 1/menu.ini
--- 2/menu.ini
+++ b/menu.ini
@@@ -1,122 -1,3 +1,122 @@@
 +[CRM]
 +
 +[CRM--Schnellsuche]
 +ACCESS=crm_search
 +module=crm/getData.php
 +
 +[CRM--Kunden]
 +ACCESS=crm_search
 +module=crm/firmen1.php
 +Q=C
 +
 +[CRM--Lieferant]
 +ACCESS=crm_search
 +module=crm/firmen1.php
 +Q=V
 +
 +[CRM--Personen]
 +ACCESS=crm_search
 +module=crm/personen1.php
 +
 +[CRM--erfassen]
 +submenu=1
 +
 +[CRM--erfassen--Kunden]
 +ACCESS=crm_new
 +module=crm/firmen3.php
 +Q=C
 +
 +[CRM--erfassen--Lieferant]
 +ACCESS=crm_new
 +module=crm/firmen3.php
 +Q=V
 +
 +[CRM--erfassen--Personen]
 +ACCESS=crm_new
 +module=crm/personen3.php
 +
 +[CRM--Termine]
 +ACCESS=crm_termin
 +module=crm/termin.php
 +
 +[CRM--Auftragschance]
 +ACCESS=crm_opportunity
 +module=crm/opportunity.php
 +
 +[CRM--Wiedervorlage]
 +ACCESS=crm_follow
 +module=crm/wvl1.php
 +
 +[CRM--eMail]
 +ACCESS=crm_email
 +module=crm/mail.php
 +
 +[CRM--Wissens-DB]
 +ACCESS=crm_knowhow
 +module=crm/wissen.php
 +
 +[CRM--Notizen]
 +ACCESS=crm_notices
 +module=crm/postit.php
 +
 +[CRM--Dokumente]
 +ACCESS=crm_other
 +module=crm/dokument.php
 +
 +[CRM--Service]
 +submenu=1
 +
 +[CRM--Service--Wartungsvertrag]
 +ACCESS=crm_service
 +module=crm/vertrag1.php
 +
 +[CRM--Service--Wartungsvertrag erfassen]
 +ACCESS=crm_service
 +module=crm/vertrag3.php
 +
 +[CRM--Service--Maschinen]
 +ACCESS=crm_service
 +module=crm/maschine1.php
 +
 +[CRM--Service--Maschinen erfassen]
 +ACCESS=crm_service
 +module=crm/maschine3.php
 +
 +[CRM--Admin]
 +submenu=1
 +
 +[CRM--Admin--Dokumentvorlage]
 +ACCESS=crm_admin
 +module=crm/dokument1.php
 +
 +[CRM--Admin--Etiketten]
 +ACCESS=crm_admin
 +module=crm/aufkleber_def.php
 +
 +[CRM--Admin--TerminKat]
 +ACCESS=crm_admin
 +module=crm/tcatedit.php
 +
 +[CRM--Admin--Sonderflag]
 +ACCESS=crm_admin
 +module=crm/sflagedit.php
 +
 +[CRM--Admin--Mitteilungen]
 +ACCESS=crm_admin
 +module=crm/user3.php
 +
 +[CRM--Admin--Gruppen]
 +ACCESS=crm_admin
 +module=crm/user2.php
 +
 +[CRM--Admin--Benutzer]
 +ACCESS=crm_adminuser
 +module=crm/user1.php
 +
 +[CRM--Admin--Status]
 +ACCESS=crm_adminstatus
 +module=crm/status.php
 +
  [Master Data]
  
  [Master Data--Add Customer]
@@@ -283,27 -164,6 +283,27 @@@ ACCESS=dunning_edi
  module=dn.pl
  action=search
  
 +
 +[Shop]
 +
 +[Shop--Warenexport]
 +module=pepper/shopimport_db.php
 +
 +[Shop--Bestellungen]
 +module=pepper/pepperexport.php
 +
 +[Shop--Konfiguration]
 +module=pepper/confedit.php
 +
 +[Shop--Warenexport15]
 +module=pepper15/shopimport_db.php
 +
 +[Shop--Bestellungen15]
 +module=pepper15/pepperexport.php
 +
 +[Shop--Konfiguration15]
 +module=pepper15/confedit.php
 +
  [AP]
  
  [AP--Add RFQ]
@@@ -931,10 -791,6 +931,6 @@@ action=audit_contro
  module=am.pl
  action=show_history_search
  
- [System--Administration area]
- module=admin.pl
- action=login
- 
  
  [Program]