]> wagnertech.de Git - kivitendo-erp.git/commitdiff
projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: f59ed16)
Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 17 Mar 2010 10:48:34 +0000 (11:48 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 17 Mar 2010 10:48:34 +0000 (11:48 +0100)
bin/mozilla/ar.pl patch | blob | history
doc/changelog patch | blob | history
lxo-import/addressB.php [changed mode: 0755->0644] patch | blob | history
lxo-import/blz.php patch | blob | history
lxo-import/contactB.php patch | blob | history
lxo-import/db.php patch | blob | history
lxo-import/partsB.php patch | blob | history
lxo-import/shiptoB.php patch | blob | history
templates/webpages/ar/search_de.html patch | blob | history
templates/webpages/ar/search_en.html patch | blob | history
templates/webpages/ar/search_master.html patch | blob | history

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index f170407d894382bf0fbca5ea3ae2d5f422f638a6..3d6704262eb34b87c566f0142be75c873f7342cf 100644 (file)
--- 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 b1b277238b8c3e6af21375db5d8ea2f8c2ad02bb..a32a01219476cfd6e5db2d8d9793c4a147756a50 100644 (file)
--- 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 (executable)
new mode 100644 (file)
index e7f7be3..a365e14
--- a/lxo-import/addressB.php
+++ b/lxo-import/addressB.php
@@ -1,7 +1,7 @@
 <html>
 <LINK REL="stylesheet" HREF="../css/lx-office-erp.css" TYPE="text/css" TITLE="Lx-Office stylesheet">
 <body>
-<?
+<?php
 /*
 Kunden- bzw. Lieferantenimport mit Browser nach Lx-Office ERP
 
@@ -237,7 +237,7 @@ echo $j." $file importiert.\n";
 <form name="import" method="post" enctype="multipart/form-data" action="addressB.php">
 <!--form name="import" method="post"  action="addressB.php"-->
 <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
-<input type="hidden" name="login" value="<?= $login ?>">
+<input type="hidden" name="login" value="<?php echo  $login ?>">
 <table>
 <tr><td></td><td><input type="submit" name="ok" value="Hilfe"></td></tr>
 <tr><td>Zieltabelle</td><td><input type="radio" name="ziel" value="customer" checked>customer <input type="radio" name="ziel" value="vendor">vendor</td></tr>
@@ -264,4 +264,4 @@ echo $j." $file importiert.\n";
 <tr><td></td><td><input type="submit" name="ok" value="Import"></td></tr>
 </table>
 </form>
-<? }; ?>
+<?php }; ?>
diff --git a/lxo-import/blz.php b/lxo-import/blz.php
index 85b73664c3400faff226427fdecf81695f50ba6b..c1f726061df4a12eb1cc536651ec25cf404ce206 100644 (file)
--- a/lxo-import/blz.php
+++ b/lxo-import/blz.php
@@ -152,7 +152,7 @@ Achtung!! Die bestehenden BLZ-Daten werden zun&auml;chst gel&ouml;scht.
 <br>
 <form name="import" method="post" enctype="multipart/form-data" action="blz.php">
 <input type="hidden" name="MAX_FILE_SIZE" value="20000000">
-<input type="hidden" name="login" value="<?= $login ?>">
+<input type="hidden" name="login" value="<?php echo $login ?>">
 <table>
 <tr><td>Test</td><td><input type="checkbox" name="test" value="1">ja</td></tr>
 <tr><td>Daten</td><td><input type="file" name="Datei"></td></tr>
diff --git a/lxo-import/contactB.php b/lxo-import/contactB.php
index 49e2adcb8368a7251bb21e3d546a555fd0b8ce5a..4a157c4f93dfa0e9bff89e1a76e64034e76519c7 100644 (file)
--- a/lxo-import/contactB.php
+++ b/lxo-import/contactB.php
@@ -1,7 +1,7 @@
 <html>
 <LINK REL="stylesheet" HREF="../css/lx-office-erp.css" TYPE="text/css" TITLE="Lx-Office stylesheet">
 <body>
-<?
+<?php
 /*
 Kontaktimport mit Browser nach Lx-Office ERP
 
@@ -265,4 +265,4 @@ echo $j." $file importiert.\n";} else {
 <tr><td></td><td><input type="submit" name="ok" value="Import"></td></tr>
 </table>
 </form>
-<? }; ?>
+<?php }; ?>
diff --git a/lxo-import/db.php b/lxo-import/db.php
index 3c884d0e8c43e55c24462d310d5f874e19350bd5..a7b030d4ebc779bcdf8b2ecdf77cb10121263c00 100644 (file)
--- a/lxo-import/db.php
+++ b/lxo-import/db.php
@@ -1,4 +1,4 @@
-<?
+<?php
 require_once "DB.php";
 class myDB extends DB {
 
diff --git a/lxo-import/partsB.php b/lxo-import/partsB.php
index 920b31b7f0b801debc43ca85877da1f63d88a109..62fc53101fb9d137cf79c437ccabe21205f708db 100644 (file)
--- a/lxo-import/partsB.php
+++ b/lxo-import/partsB.php
@@ -1,7 +1,7 @@
 <html>
 <LINK REL="stylesheet" HREF="../css/lx-office-erp.css" TYPE="text/css" TITLE="Lx-Office stylesheet">
 <body>
-<?
+<?php
 /*
 Warenimport mit Browser nach Lx-Office ERP
 Henry Margies <h.margies@maxina.de>
@@ -134,7 +134,7 @@ if ($_POST["ok"]) {
 <br>
 <form name="import" method="post" enctype="multipart/form-data" action="partsB.php">
 <input type="hidden" name="MAX_FILE_SIZE" value="20000000">
-<input type="hidden" name="login" value="<?= $login ?>">
+<input type="hidden" name="login" value="<?php echo  $login ?>">
 <table>
 <tr><td><input type="submit" name="ok" value="Hilfe"></td><td></td></tr>
 <tr><td>Trennzeichen</td><td>
@@ -166,9 +166,9 @@ if ($_POST["ok"]) {
             <input type="Radio" name="ware" value="D">Dienstleistung
             <input type="Radio" name="ware" value="G">gemischt (Spalte 'art' vorhanden)</td></tr>
 <tr><td>Default Bugru<br></td><td><select name="bugru">
-<?    if ($bugrus) foreach ($bugrus as $bg) { ?>
-            <option value="<?= $bg["id"] ?>"><?= $bg["description"]."\n" ?>
-<?    } ?>
+<?php    if ($bugrus) foreach ($bugrus as $bg) { ?>
+            <option value="<?php echo  $bg["id"] ?>"><?php echo  $bg["description"]."\n" ?>
+<?php    } ?>
     </select>
     <input type="radio" name="bugrufix" value="0">nie<br>
     <input type="radio" name="bugrufix" value="1" checked>f&uuml;r alle Artikel verwenden
@@ -188,4 +188,4 @@ if ($_POST["ok"]) {
 <tr><td></td><td><input type="submit" name="ok" value="Import"></td></tr>
 </table>
 </form>
-<? }; ?>
+<?php }; ?>
diff --git a/lxo-import/shiptoB.php b/lxo-import/shiptoB.php
index 5bb41d6a7e108255be1cff067c71f07bb56ca3d7..5e22a285f7f56b5e4de41b0e7111e168629118b6 100644 (file)
--- a/lxo-import/shiptoB.php
+++ b/lxo-import/shiptoB.php
@@ -1,7 +1,7 @@
 <html>
 <LINK REL="stylesheet" HREF="../css/lx-office-erp.css" TYPE="text/css" TITLE="Lx-Office stylesheet">
 <body>
-<?
+<?php
 /*
 Lieferanschriftimport mit Browser nach Lx-Office ERP
 
@@ -230,4 +230,4 @@ if ($_POST["ok"] == "Import") {
 <tr><td></td><td><input type="submit" name="ok" value="Import"></td></tr>
 </table>
 </form>
-<? }; ?>
+<?php }; ?>
diff --git a/templates/webpages/ar/search_de.html b/templates/webpages/ar/search_de.html
index a6bf91010c83f0f46301c65a14438985fa3ca21c..b90aa3bc4e0405e10b270cc962df2a438f11f510 100644 (file)
--- a/templates/webpages/ar/search_de.html
+++ b/templates/webpages/ar/search_de.html
@@ -1,4 +1,4 @@
-<body
+<body>
 
  <form method=post name="search" action=[% script %]>
 
@@ -73,12 +73,12 @@
      <tr>
       <th align=right nowrap>Von</th>
       <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
+       <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
        <input type=button name=transdatefrom id="trigger1" value=?>
       </td>
      <th align=right>bis</th>
      <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
+      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
       <input type=button name=transdateto name=transdateto id="trigger2" value=?>
      </td>
     </tr>
@@ -188,16 +188,16 @@
    <br>
    <input class=submit type=submit name=action value="Weiter">
   </form>
- </body>
  <script type="text/javascript">
  <!--
    Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
    Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
    $(document).ready(function(){
-    focus();
+    $('customer').focus();
     setupDateFormat('[% dateformat | html %]','Falsches Datumsformat!');
     setupPoints('[% numberformat | html %]','Falsches Format');
    })
  //-->
  </script>
+ </body>
 </html>
diff --git a/templates/webpages/ar/search_en.html b/templates/webpages/ar/search_en.html
index 7b7975fd16fd1638f996406acb3bb51b0f18f817..036b7d5446aa070a9b222b51e6711e3082b6a3f2 100644 (file)
--- a/templates/webpages/ar/search_en.html
+++ b/templates/webpages/ar/search_en.html
@@ -1,4 +1,4 @@
-<body
+<body>
 
  <form method=post name="search" action=[% script %]>
 
@@ -73,12 +73,12 @@
      <tr>
       <th align=right nowrap>From</th>
       <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
+       <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
        <input type=button name=transdatefrom id="trigger1" value=button>
       </td>
      <th align=right>Bis</th>
      <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
+      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
       <input type=button name=transdateto name=transdateto id="trigger2" value=button>
      </td>
     </tr>
@@ -188,16 +188,16 @@
    <br>
    <input class=submit type=submit name=action value="Continue">
   </form>
- </body>
  <script type="text/javascript">
  <!--
    Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
    Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
    $(document).ready(function(){
-    focus();
+    $('customer').focus();
     setupDateFormat('[% dateformat | html %]','Falsches Datumsformat!');
     setupPoints('[% numberformat | html %]','wrongformat');
    })
  //-->
  </script>
+ </body>
 </html>
diff --git a/templates/webpages/ar/search_master.html b/templates/webpages/ar/search_master.html
index 250cfd9eb8c311e4d220c3ff937fa01c4a5d61c8..7b1342580c427c90ee1a1e4cc9c9d070a641e1d4 100644 (file)
--- a/templates/webpages/ar/search_master.html
+++ b/templates/webpages/ar/search_master.html
@@ -1,4 +1,4 @@
-<body
+<body>
 
  <form method=post name="search" action=[% script %]>
 
@@ -73,12 +73,12 @@
      <tr>
       <th align=right nowrap><translate>From</translate></th>
       <td>
-       <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
+       <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
        <input type=button name=transdatefrom id="trigger1" value=<translate>button</translate>>
       </td>
      <th align=right><translate>Bis</translate></th>
      <td>
-      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
+      <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
       <input type=button name=transdateto name=transdateto id="trigger2" value=<translate>button</translate>>
      </td>
     </tr>
@@ -188,16 +188,16 @@
    <br>
    <input class=submit type=submit name=action value="<translate>Continue</translate>">
   </form>
- </body>
  <script type="text/javascript">
  <!--
    Calendar.setup( { inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "trigger1" });
    Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
    $(document).ready(function(){
-    focus();
+    $('customer').focus();
     setupDateFormat('[% dateformat | html %]','<translate>Falsches Datumsformat!</translate>');
     setupPoints('[% numberformat | html %]','<translate>wrongformat</translate>');
    })
  //-->
  </script>
+ </body>
 </html>
Unnamed repository; edit this file 'description' to name the repository.