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

Conflicts:
	bin/mozilla/do.pl
	bin/mozilla/ir.pl
	bin/mozilla/oe.pl

diff --combined bin/mozilla/ct.pl
index 1ce1c2f,0e91cc9..4291871
--- 1/bin/mozilla/ct.pl
--- 2/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@@ -101,9 -101,7 +101,7 @@@ sub search 
                                                                             'include_prefix' => 'l_',
                                                                             'include_value'  => 'Y');
  
-   $form->{jsscript} = 1;
    $form->{title}    = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors');
-   $::request->{layout}->focus('#name');
  
    $form->header();
    print $form->parse_html_template('ct/search');
@@@ -465,7 -463,7 +463,7 @@@ sub form_header 
                     currencies => "ALL_CURRENCIES");
    $form->get_pricegroup(\%myconfig, { all => 1 });
  
 -  $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{features}->{vertreter};
 +  $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::instance_conf->get_vertreter;
    $form->{ALL_EMPLOYEES}          = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{FU_created_for_user},  deleted => 0 ] ]);
    $form->{ALL_SALESMEN}           = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
    $form->{USER}                   = SL::DB::Manager::Employee->current;
@@@ -475,9 -473,7 +473,7 @@@
    $form->{shipto_label}   = \&_shipto_label;
    $form->{contacts_label} = \&_contacts_label;
    $form->{taxzone_id}     = 0                                                               if !$form->{id};
-   $form->{jsscript}       = 1;
    $form->{SHIPTO_ALL}     = [ +{ shipto_id => '0', shiptoname => $::locale->text('All') }, @{ $form->{SHIPTO} } ];
-   $::request->{layout}->focus("#greeting");
  
    $form->{title} = $form->{title_save}
                  || $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : '');
@@@ -536,7 -532,7 +532,7 @@@ sub _do_save 
  
    $::form->isblank("name", $::locale->text("Name missing!"));
  
 -  if ($::form->{new_salesman_id} && $::lx_office_conf{features}->{vertreter}) {
 +  if ($::form->{new_salesman_id} && $::instance_conf->get_vertreter) {
      $::form->{salesman_id} = $::form->{new_salesman_id};
      delete $::form->{new_salesman_id};
    }

diff --combined bin/mozilla/do.pl
index 3e0c7e0,d5ad88b..d6a51bc
--- 1/bin/mozilla/do.pl
--- 2/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@@ -165,8 -165,7 +165,7 @@@ sub order_links 
    $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
  
    # retrieve order/quotation
 -  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
 +  $form->{webdav}   = $::instance_conf->get_webdav;
-   $form->{jsscript} = 1;
  
    my $editing = $form->{id};
  
@@@ -255,9 -254,6 +254,6 @@@ sub form_header 
    $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
    $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
  
-   # use JavaScript Calendar or not
-   $form->{jsscript} = 1;
- 
    my @old_project_ids = ($form->{"globalproject_id"});
    map({ push(@old_project_ids, $form->{"project_id_$_"})
            if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
@@@ -460,7 -456,6 +456,6 @@@ sub search 
    $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
  
    $form->{SHOW_VC_DROP_DOWN} =  $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
-   $form->{jsscript}          = 1;
    $form->{title}             = $locale->text('Delivery Orders');
  
    $form->header();
@@@ -1125,8 -1120,6 +1120,6 @@@ sub display_stock_in_form 
    my %myconfig = %main::myconfig;
    my $locale   = $main::locale;
  
-   $form->{jsscript} = 1;
- 
    $form->{title} = $locale->text('Stock');
  
    my $part_info  = IC->get_basic_part_info('id' => $form->{parts_id});

diff --combined bin/mozilla/ir.pl
index 3d49885,b75dafc..3653891
--- 1/bin/mozilla/ir.pl
--- 2/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@@ -101,8 -101,7 +101,7 @@@ sub invoice_links 
    $form->{vc} = 'vendor';
  
    # create links
 -  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
 +  $form->{webdav}   = $::instance_conf->get_webdav;
-   $form->{jsscript} = 1;
  
    $form->create_links("AP", \%myconfig, "vendor");
  
@@@ -329,8 -328,6 +328,6 @@@ sub form_header 
    $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
    $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
  
-   $::request->{layout}->focus('#vendor');
- 
    my $follow_up_vc         =  $form->{vendor};
    $follow_up_vc            =~ s/--\d*\s*$//;
    $TMPL_VAR{vendor_name} = $follow_up_vc;
@@@ -357,7 -354,6 +354,6 @@@
    ), @custom_hiddens,
    map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
  
-   $form->{jsscript} = 1;
    $form->header();
  
    print $form->parse_html_template("ir/form_header", \%TMPL_VAR);

diff --combined bin/mozilla/is.pl
index fe387d1,b35e176..f6cd5e7
--- 1/bin/mozilla/is.pl
--- 2/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@@ -76,8 -76,6 +76,6 @@@ sub add 
  
    $form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback};
  
-   $form->{jsscript} = "date";
- 
    &invoice_links;
    &prepare_invoice;
    &display_form;
@@@ -138,7 -136,7 +136,7 @@@ sub invoice_links 
    $form->{vc} = 'customer';
  
    # create links
 -  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
 +  $form->{webdav}   = $::instance_conf->get_webdav;
  
    $form->create_links("AR", \%myconfig, "customer");
  
@@@ -353,8 -351,6 +351,6 @@@ sub form_header 
    $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
    $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
  
-   $::request->{layout}->focus('#customer');
- 
    my $follow_up_vc         =  $form->{customer};
    $follow_up_vc            =~ s/--\d*\s*$//;
    $TMPL_VAR{customer_name} = $follow_up_vc;
@@@ -381,7 -377,6 +377,6 @@@
    ), @custom_hiddens,
    map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
  
-   $form->{jsscript} = 1;
    $form->header();
  
    print $form->parse_html_template("is/form_header", \%TMPL_VAR);

diff --combined bin/mozilla/oe.pl
index 8b2b79a,f2db8f8..e4139ff
--- 1/bin/mozilla/oe.pl
--- 2/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@@ -229,8 -229,7 +229,7 @@@ sub order_links 
    $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
  
    # retrieve order/quotation
 -  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
 +  $form->{webdav}   = $::instance_conf->get_webdav;
-   $form->{jsscript} = 1;
  
    my $editing = $form->{id};
  
@@@ -318,9 -317,6 +317,6 @@@ sub form_header 
    $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
    $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
  
-   # use JavaScript Calendar or not
-   $form->{jsscript} = 1;
- 
    # openclosed checkboxes
    my @tmp;
    push @tmp, sprintf qq|<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" %s><label for="delivered">%s</label>|,
@@@ -528,7 -524,7 +524,7 @@@ sub form_footer 
  
    print $form->parse_html_template("oe/form_footer", {
       %TMPL_VAR,
 -     webdav          => $::lx_office_conf{features}->{webdav},
 +     webdav          => $::instance_conf->get_webdav,
       print_options   => print_options(inline => 1),
       label_edit      => $locale->text("Edit the $form->{type}"),
       label_workflow  => $locale->text("Workflow $form->{type}"),
@@@ -725,7 -721,6 +721,6 @@@ sub search 
    $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
  
    # constants and subs for template
-   $form->{jsscript}        = 1;
    $form->{vc_keys}         = sub { "$_[0]->{name}--$_[0]->{id}" };
  
    $form->header();

diff --combined locale/de/all
index 29fe6de,ca097db..5c36e7b
--- 1/locale/de/all
--- 2/locale/de/all
+++ b/locale/de/all
@@@ -352,7 -352,6 +352,7 @@@ $self->{texts} = 
    'CRM status'                  => 'Admin Status',
    'CRM termin'                  => 'Termine',
    'CRM user'                    => 'Admin Benutzer',
 +  'CSS style for pictures'      => 'CSS Style für Bilder',
    'CSV export -- options'       => 'CSV-Export -- Optionen',
    'CSV import: contacts'        => 'CSV-Import: Ansprechpersonen',
    'CSV import: customers and vendors' => 'CSV-Import: Kunden und Lieferanten',
@@@ -364,7 -363,6 +364,7 @@@
    'Cancel'                      => 'Abbrechen',
    'Cancel Accounts Payables Transaction' => 'Kreditorenbuchung stornieren',
    'Cancel Accounts Receivables Transaction' => 'Debitorenbuchung stornieren',
 +  'Cannot check correct webdav folder' => 'Kann nicht den richtigen webdav Pfad überprüfen',
    'Cannot delete account!'      => 'Konto kann nicht gelöscht werden!',
    'Cannot delete customer!'     => 'Kunde kann nicht gelöscht werden!',
    'Cannot delete default account!' => 'Das Standard-Konto kann nicht gelöscht werden!',
@@@ -476,7 -474,6 +476,7 @@@
    'Contra'                      => 'gegen',
    'Conversion of "birthday" contact person attribute' => 'Umstellung des Kontaktpersonenfeldes "Geburtstag"',
    'Copies'                      => 'Kopien',
 +  'Copy file from #1 to #2 failed' => 'Datei von #1 nach #2 kopieren fehlgeschlagen',
    'Correct taxkey'              => 'Richtiger Steuerschlüssel',
    'Costs'                       => 'Kosten',
    'Could not load class #1 (#2): "#3"' => 'Konnte Klasse #1 (#2) nicht laden: "#3"',
@@@ -907,7 -904,6 +907,7 @@@
    'Factor missing!'             => 'Der Faktor fehlt.',
    'Falsches Datumsformat!'      => 'Falsches Datumsformat!',
    'Fax'                         => 'Fax',
 +  'Features'                    => 'Features',
    'Feb'                         => 'Feb',
    'February'                    => 'Februar',
    'Fee'                         => 'Gebühr',
@@@ -1250,7 -1246,6 +1250,7 @@@
    'Missing amount'              => 'Fehlbetrag',
    'Missing parameter #1 in call to sub #2.' => 'Fehlender Parameter \'#1\' in Funktionsaufruf \'#2\'.',
    'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
 +  'Missing parameter for webdav file copy' => 'Fehlender Parameter für webdav Datei kopieren',
    'Missing taxkeys in invoices with taxes.' => 'Fehlende Steuerschlüssel in Rechnungen mit Steuern',
    'Mitarbeiter'                 => 'Mitarbeiter',
    'Mixed (requires column "type")' => 'Gemischt (erfordert Spalte "type")',
@@@ -1473,8 -1468,6 +1473,8 @@@
    'Phone1'                      => 'Telefon 1 ',
    'Phone2'                      => 'Telefon 2',
    'Pick List'                   => 'Sammelliste',
 +  'Pictures for parts'          => 'Bilder für Waren',
 +  'Pictures for search parts'   => 'Bilder für Warensuche',
    'Please Check the bank information for each customer:' => 'Bitte überprüfen Sie die Bankinformationen der Kunden:',
    'Please Check the bank information for each vendor:' => 'Bitte überprüfen Sie die Kontoinformationen der Lieferanten:',
    'Please ask your administrator to create warehouses and bins.' => 'Bitten Sie Ihren Administrator, dass er Lager und Lagerplätze anlegt.',
@@@ -1653,7 -1646,6 +1653,7 @@@
    'Report for'                  => 'Bericht für',
    'Reports'                     => 'Berichte',
    'Representative'              => 'Vertreter',
 +  'Representative for Customer' => 'Vertreter für Kunden',
    'Reqdate'                     => 'Liefertermin',
    'Request Quotations'          => 'Preisanfragen',
    'Request for Quotation'       => 'Anfrage',
@@@ -1728,7 -1720,6 +1728,7 @@@
    'Save and close'              => 'Speichern und schließen',
    'Save and execute'            => 'Speichern und ausführen',
    'Save as new'                 => 'als neu speichern',
 +  'Save document in webdav repository' => 'Dokument in webdav-Ablage speichern',
    'Save draft'                  => 'Entwurf speichern',
    'Save profile'                => 'Profil speichern',
    'Save settings as'            => 'Einstellungen speichern unter',
@@@ -1829,8 -1820,6 +1829,8 @@@
    'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',
    'Show parts'                  => 'Artikel anzeigen',
    'Show settings'               => 'Einstellungen anzeigen',
 +  'Show the picture in the part form' => 'Bild in Warenmaske anzeigen',
 +  'Show the pictures in the result for search parts' => 'Bilder in Suchergebnis für Stammdaten -> Berichte -> Waren anzeigen',
    'Show the weights of articles and the total weight in orders, invoices and delivery notes?' => 'Sollen Warengewichte und Gesamtgewicht in Aufträgen, Rechnungen und Lieferscheinen angezeigt werden?',
    'Show weights'                => 'Gewichte anzeigen',
    'Show your TODO list after loggin in' => 'Aufgabenliste nach dem Anmelden anzeigen',
@@@ -1881,7 -1870,6 +1881,7 @@@
    'Storno (one letter abbreviation)' => 'S',
    'Storno Invoice'              => 'Stornorechnung',
    'Street'                      => 'Straße',
 +  'Style the picture with the following CSS code' => 'Bildeigenschaft mit folgendem CSS-Style versehen',
    'Stylesheet'                  => 'Stilvorlage',
    'Subject'                     => 'Betreff',
    'Subject:'                    => 'Betreff:',
@@@ -2109,6 -2097,7 +2109,7 @@@
    'The selected exports have been closed.' => 'Die ausgewählten Exporte wurden abgeschlossen.',
    'The selected warehouse does not exist.' => 'Das ausgewählte Lager existiert nicht.',
    'The selected warehouse is empty, or no stocked items where found that match the filter settings.' => 'Das ausgewählte Lager ist leer, oder in ihm wurden keine zu den Sucheinstellungen passenden eingelagerten Artikel gefunden.',
+   'The session has expired. Please log in again.' => 'Die Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.',
    'The session is invalid or has expired.' => 'Sie sind von kivitendo abgemeldet.',
    'The settings were saved, but the password was not changed.' => 'Die Einstellungen wurden gespeichert, aber das Passwort wurde nicht geändert.',
    'The source warehouse does not contain any bins.' => 'Das Quelllager enthält keine Lagerplätze.',
@@@ -2300,7 -2289,6 +2301,7 @@@
    'Updating the client fields in the database "#1" on host "#2:#3" failed.' => 'Die Aktualisierung der Mandantenfelder in der Datenbank "#1" auf Host "#2:#3" schlug fehl.',
    'Uploaded on #1, size #2 kB'  => 'Am #1 hochgeladen, Größe #2 kB',
    'Use As New'                  => 'Als neu verwenden',
 +  'Use Webdav Repository'       => 'Webdav-Ablage verwenden',
    'Use existing templates'      => 'Vorhandene Druckvorlagen verwenden',
    'Use master default bin for Default Transfer, if no default bin for the part is configured' => 'Standardlagerplatz für Ein- / Auslagern über Standard-Lagerplatz, falls für die Ware kein expliziter Lagerplatz konfiguriert ist',
    'User'                        => 'Benutzer',
@@@ -2341,7 -2329,6 +2342,7 @@@
    'Vendors'                     => 'Lieferanten',
    'Verrechnungseinheit'         => 'Verrechnungseinheit',
    'Version'                     => 'Version',
 +  'Vertreter'                   => 'Vertreter',
    'View SEPA export'            => 'SEPA-Export-Details ansehen',
    'View background job execution result' => 'Verlauf der Hintergrund-Job-Ausführungen anzeigen',
    'View background job history' => 'Hintergrund-Job-Verlauf anzeigen',
@@@ -2362,8 -2349,6 +2363,8 @@@
    'Warning'                     => 'Warnung',
    'WebDAV'                      => 'WebDAV',
    'WebDAV link'                 => 'WebDAV-Link',
 +  'Webdav'                      => 'Webdav',
 +  'Webdav save documents'       => 'Belege in Webdav-Ablage speichern',
    'Webserver interface'         => 'Webserverschnittstelle',
    'Weight'                      => 'Gewicht',
    'Weight unit'                 => 'Gewichtseinheit',