Das XUL-/XML-Menü entfernen

[kivitendo-erp.git] / xtcom / confedit.php

diff --git a/xtcom/confedit.php b/xtcom/confedit.php
index 9a97448..0d3fb7e 100644 (file)
--- a/xtcom/confedit.php
+++ b/xtcom/confedit.php
@@ -32,6 +32,21 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
                        echo ">".$row[1]."\n";
                }
        }
+    /**
+     * TODO: short description.
+     * 
+     * @param string $sel 
+     * 
+     * @return TODO
+     */
+    function charset($sel) {
+        $chars = array('','latin9','utf-8');
+        foreach ($chars as $c) {
+           echo "\t<option value='$c' ";
+                  if ($sel==$c) echo " selected";
+                  echo ">$c\n";
+        }
+    }
        function shoplang($sel,$default) {
        global $dbM;
                if (!$dbM) return;
@@ -87,7 +102,19 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
                        return 0;
                }
        }
-
+       function getBugru() {
+       global $dbP;
+               if (!$dbP) return;
+               $sql ="select  BG.id as bugru,(T.rate * 100) as rate,TK.startdate from buchungsgruppen BG ";
+               $sql.="left join chart C on BG.income_accno_id_0=C.id left join taxkeys TK ";
+               $sql.="on TK.chart_id=C.id left join tax T on T.id=TK.tax_id where ";
+               $sql.="TK.startdate <= now() order by BG.id, TK.startdate";
+               $rs=$dbP->getAll($sql,DB_FETCHMODE_ASSOC);
+               if ($rs) foreach ($rs as $row) {
+                       $bugru[$row["bugru"]]=$row["rate"];
+               }
+               return $bugru;
+       }
        if ($_POST["ok"]=="sichern") {
                $ok=true;
                 $dsnP = array(
@@ -105,32 +132,31 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
                        echo $dbP->userinfo;
                        $dbP=false;
                } else {
-                       $sql="SELECT P.id,P.description,(t.rate * 100) as rate FROM ";
-                       $sql.="parts P left join chart c on c.id=P.income_accno_id left join tax t on c.taxkey_id=t.taxkey ";
-                       $sql.="where P.partnumber = '%s'";
+                       $bugru=getBugru();
+                       $sql="SELECT id,description,buchungsgruppen_id FROM parts where partnumber = '%s'";
                        $rs=$dbP->getall(sprintf($sql,$_POST["div16NR"]));
                        $_POST["div16ID"]=$rs[0][0];
                        $div16txt=addslashes($rs[0][1]);
-                       $_POST["div16TAX"]=$rs[0][2];
+                       $_POST["div16TAX"]=$bugru[$rs[0][2]];
                        $rs=$dbP->getall(sprintf($sql,$_POST["div07NR"]));
                        $_POST["div07ID"]=$rs[0][0];
-                       $_POST["div07TAX"]=$rs[0][2];
+                       $_POST["div07TAX"]=$bugru[$rs[0][2]];
                        $div07txt=addslashes($rs[0][1]);
                        $rs=$dbP->getall(sprintf($sql,$_POST["versandNR"]));
                        $_POST["versandID"]=$rs[0][0];
-                       $_POST["versandTAX"]=$rs[0][2];
+                       $_POST["versandTAX"]=$bugru[$rs[0][2]];
                        $versandtxt=addslashes($rs[0][1]);
                        $rs=$dbP->getall(sprintf($sql,$_POST["nachnNR"]));
                        $_POST["nachnID"]=$rs[0][0];
-                       $_POST["nachnTAX"]=$rs[0][2];
+                       $_POST["nachnTAX"]=$bugru[$rs[0][2]];
                        $nachntxt=addslashes($rs[0][1]);
                        $rs=$dbP->getall(sprintf($sql,$_POST["minderNR"]));
                        $_POST["minderID"]=$rs[0][0];
-                       $_POST["minderTAX"]=$rs[0][2];
+                       $_POST["minderTAX"]=$bugru[$rs[0][2]];
                        $mindertxt=addslashes($rs[0][1]);
                        $rs=$dbP->getall(sprintf($sql,$_POST["paypalNR"]));
                        $_POST["paypalID"]=$rs[0][0];
-                       $_POST["paypalTAX"]=$rs[0][2];
+                       $_POST["paypalTAX"]=$bugru[$rs[0][2]];
                        $paypaltxt=addslashes($rs[0][1]);
                        $rs=$dbP->getall("select id from employee where login = '".$_POST["ERPusrN"]."'");
                        $_POST["ERPusrID"]=$rs[0][0];
@@ -145,7 +171,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
                 );
                $dbM=@DB::connect($dsnM);
                if (DB::isError($dbM)||!$dbM) {
-                       $ok=false;
+                       //$ok=false;
                        echo "Keine Verbindung zum Shop<br>";
                        echo $dbM->userinfo;
                        $dbM=false;
@@ -177,6 +203,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
                        fputs($f,"\$SHOPdbname=\"".$_POST["SHOPdbname"]."\";\n");
                        fputs($f,"\$SHOPdns=\"mysql://\$SHOPuser:\$SHOPpass@\$SHOPhost/\$SHOPdbname\";\n");
                        fputs($f,"\$SHOPdir=\"".$_POST["SHOPdir"]."\";\n");
+                       fputs($f,"\$SHOPchar=\"".$_POST["SHOPchar"]."\";\n");
                        fputs($f,"\$SHOPimgdir=\"".$_POST["SHOPimgdir"]."\";\n");
                        fputs($f,"\$SHOPftphost=\"".$_POST["SHOPftphost"]."\";\n");
                        fputs($f,"\$SHOPftpuser=\"".$_POST["SHOPftpuser"]."\";\n");
@@ -233,6 +260,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
                        fputs($f,"\$SpracheAlle=\"".$_POST["SpracheAlle"]."\";\n");
                        fputs($f,"?>");
                        fclose($f);
+                       echo "<br>'conf.php' geschrieben!<br>";
                        if (file_exists ("conf$login.php")) {
                                require "conf$login.php";
                        } else {
@@ -279,6 +307,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
                        $SHOPpass=$_POST["SHOPpass"];
                        $SHOPhost=$_POST["SHOPhost"];
                        $SHOPport=$_POST["SHOPport"];
+                       $SHOPchart=$_POST["SHOPchart"];
                        $SHOPdbname=$_POST["SHOPdbname"];
                        $SHOPlang=$_POST["SHOPlang"];
                        $SHOPdir=$_POST["SHOPdir"];
@@ -387,8 +416,10 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
 <tr>
        <td>User-ID</td>
        <td colspan="2"><input type="text" name="ERPusrN" size="10" value="<?= $ERPusr["Name"] ?>">
-               <input type="checkbox" name="a1" <?= (empty($ERPusr["ID"])?"":"checked") ?> onFocus="blur();"></td>
-       <td></td>
+               <input type="checkbox" name="a1" <?= (empty($ERPusr["ID"])?"":"checked") ?> onFocus="blur();"> &nbsp; Charset Shop:</td>
+       <td><select name="SHOPchar">
+<? charset($SHOPchar); ?>
+           </select></td>
 </tr>
 <tr>
        <td>CSV-Dir</td>