From: Sven Schöling Date: Wed, 17 Mar 2010 10:48:34 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.1~12^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/df1367050aebe74cbcabaa176a20edaca65208b4?hp=f59ed16fa072d31e5d9190d1b1b0b917b7ac39f3 Merge branch 'master' of ssh://lx-office/~/lx-office-erp --- diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index f170407d8..3d6704262 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -1268,7 +1268,6 @@ sub search { $form->all_vc(\%myconfig, "customer", "AR"); $form->{title} = $locale->text('AR Transactions'); - $form->{fokus} = "search.customer"; $form->{jsscript} = 1; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, diff --git a/doc/changelog b/doc/changelog index b1b277238..a32a01219 100644 --- a/doc/changelog +++ b/doc/changelog @@ -349,7 +349,7 @@ - Bugfix 1355: Mahnungserstellung: Es wird der komplette Rechnungsbetrag angemahnt, nicht nur der Offene - Bugfix 1356: Mahnungserstellung: In der Vorabübersicht die Rechnungsnummern zu Hyperlinks machen - Bugfix 1359: Templates in UTF - + - Bugfix 1374: Verkauf->Berichte->Rechnungen geht im Internet-Explorer nicht 2009-06-02 - Version 2.6.0 diff --git a/lxo-import/addressB.php b/lxo-import/addressB.php old mode 100755 new mode 100644 index e7f7be34e..a365e142d --- a/lxo-import/addressB.php +++ b/lxo-import/addressB.php @@ -1,7 +1,7 @@ - - + @@ -264,4 +264,4 @@ echo $j." $file importiert.\n";
Zieltabellecustomer vendor
- + diff --git a/lxo-import/blz.php b/lxo-import/blz.php index 85b73664c..c1f726061 100644 --- a/lxo-import/blz.php +++ b/lxo-import/blz.php @@ -152,7 +152,7 @@ Achtung!! Die bestehenden BLZ-Daten werden zunächst gelöscht.
- + diff --git a/lxo-import/contactB.php b/lxo-import/contactB.php index 49e2adcb8..4a157c4f9 100644 --- a/lxo-import/contactB.php +++ b/lxo-import/contactB.php @@ -1,7 +1,7 @@ -
Testja
Daten
- + diff --git a/lxo-import/db.php b/lxo-import/db.php index 3c884d0e8..a7b030d4e 100644 --- a/lxo-import/db.php +++ b/lxo-import/db.php @@ -1,4 +1,4 @@ - - @@ -134,7 +134,7 @@ if ($_POST["ok"]) {
- +
Trennzeichen @@ -166,9 +166,9 @@ if ($_POST["ok"]) { Dienstleistung gemischt (Spalte 'art' vorhanden)
Default Bugru
 nie
für alle Artikel verwenden @@ -188,4 +188,4 @@ if ($_POST["ok"]) {
- + diff --git a/lxo-import/shiptoB.php b/lxo-import/shiptoB.php index 5bb41d6a7..5e22a285f 100644 --- a/lxo-import/shiptoB.php +++ b/lxo-import/shiptoB.php @@ -1,7 +1,7 @@ - - + diff --git a/templates/webpages/ar/search_de.html b/templates/webpages/ar/search_de.html index a6bf91010..b90aa3bc4 100644 --- a/templates/webpages/ar/search_de.html +++ b/templates/webpages/ar/search_de.html @@ -1,4 +1,4 @@ -
@@ -73,12 +73,12 @@ Von - + bis - + @@ -188,16 +188,16 @@
- + diff --git a/templates/webpages/ar/search_en.html b/templates/webpages/ar/search_en.html index 7b7975fd1..036b7d544 100644 --- a/templates/webpages/ar/search_en.html +++ b/templates/webpages/ar/search_en.html @@ -1,4 +1,4 @@ -
@@ -73,12 +73,12 @@ From - + Bis - + @@ -188,16 +188,16 @@
- + diff --git a/templates/webpages/ar/search_master.html b/templates/webpages/ar/search_master.html index 250cfd9eb..7b1342580 100644 --- a/templates/webpages/ar/search_master.html +++ b/templates/webpages/ar/search_master.html @@ -1,4 +1,4 @@ -
@@ -73,12 +73,12 @@ From - + button> Bis - + button> @@ -188,16 +188,16 @@
- +