diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index b8ce8aa9be0..be1031003ce 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -105,7 +105,7 @@ if ($_POST["action"] == 'add')
if ($id)
{
propale_pdf_create($db, $id, $_POST["modelpdf"]);
- $_GET["propalid"] = $id;
+ Header ("Location: propal.php?propalid=$id");
}
}
@@ -506,7 +506,7 @@ if ($_GET["propalid"])
print '| ';
print $html->select_tva("np_tva_tx") . ' | ';
print ' | ';
- print ' % | ';
+ print ' % | ';
print ' | ';
print ' | ';
print '';
@@ -518,7 +518,7 @@ if ($_GET["propalid"])
$var=!$var;
print "| | | ";
print ' | ';
- print ' % | ';
+ print ' % | ';
print ' | ';
print ' | ';
print "
\n";
diff --git a/htdocs/includes/menus/barre_top/default.php b/htdocs/includes/menus/barre_top/default.php
index bc26245c2de..d8bfa9258a8 100644
--- a/htdocs/includes/menus/barre_top/default.php
+++ b/htdocs/includes/menus/barre_top/default.php
@@ -28,81 +28,110 @@ if ($conf->compta->enabled || $conf->banque->enabled || $conf->caisse->enabled)
if ($conf->produit->enabled || $conf->service->enabled) $nbofentries++;
if ($conf->webcal->enabled) $nbofentries++;
-print '';
-
-if (! $nbofentries) {
- print '| | ';
-}
-else
+if ($conf->commercial->enabled)
{
- $widthtd=floor(100/$nbofentries);
-
- if ($conf->commercial->enabled)
- {
- $langs->load("commercial");
+ $langs->load("commercial");
- $class="";
- if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "commercial") { $class="menusel"; }
- elseif (ereg("^".DOL_URL_ROOT."\/comm\/",$_SERVER["PHP_SELF"])) { $class="menusel"; }
- print '';
- print ''.$langs->trans("Commercial").'';
- print ' | ';
- }
-
- if ($conf->adherent->enabled)
+ $class="";
+ if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "commercial")
{
- $langs->load("members");
-
- $class="";
- if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "adherent") { $class="menusel"; }
- elseif (ereg("^".DOL_URL_ROOT."\/adherents\/",$_SERVER["PHP_SELF"])) { $class="menusel"; }
- print '';
- print ''.$langs->trans("Members").'';
- print ' | ';
+ $class='class="tmenu" id="sel"';
}
-
- if ($conf->compta->enabled || $conf->banque->enabled || $conf->caisse->enabled)
+ elseif (ereg("^".DOL_URL_ROOT."\/comm\/",$_SERVER["PHP_SELF"]))
{
- $langs->load("compta");
-
- $class="";
- if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "compta") { $class="menusel"; }
- elseif (ereg("^".DOL_URL_ROOT."\/compta\/",$_SERVER["PHP_SELF"])) { $class="menusel"; }
- print '';
- print ''.$langs->trans("Accountancy")."/".$langs->trans("Treasury").'';
- print ' | ';
+ $class='class="tmenu" id="sel"';
}
-
- if ($conf->produit->enabled || $conf->service->enabled)
+ else
{
- $langs->load("products");
-
- $class="";
- if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "product") { $class="menusel"; }
- elseif (ereg("^".DOL_URL_ROOT."\/product\/",$_SERVER["PHP_SELF"])) { $class="menusel"; }
- $chaine="";
- if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
- if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
- if ($conf->service->enabled) { $chaine.="Services"; }
- print '';
- print ''.$chaine.'';
- print ' | ';
+ $class = 'class="tmenu"';
}
-
- if ($conf->webcal->enabled)
- {
- $langs->load("other");
- $class="";
- if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; }
- elseif (ereg("^".DOL_URL_ROOT."\/projet\/",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/webcalendar\/",$_SERVER["PHP_SELF"])) { $class="menusel"; }
- print '';
- print ''.$langs->trans("Calendar").'';
- print ' | ';
- };
-
+ print ''.$langs->trans("Commercial").'';
+
}
-print '
';
+if ($conf->adherent->enabled)
+{
+ $langs->load("members");
+
+ $class="";
+ if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "adherent")
+ {
+ $class='class="tmenu" id="sel"';
+ }
+ elseif (ereg("^".DOL_URL_ROOT."\/adherents\/",$_SERVER["PHP_SELF"]))
+ {
+ $class='class="tmenu" id="sel"';
+ }
+ print '';
+ print ''.$langs->trans("Members").'';
+ print ' | ';
+}
+
+if ($conf->compta->enabled || $conf->banque->enabled || $conf->caisse->enabled)
+{
+ $langs->load("compta");
+
+ $class="";
+ if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "compta")
+ {
+ $class='class="tmenu" id="sel"';
+ }
+ elseif (ereg("^".DOL_URL_ROOT."\/compta\/",$_SERVER["PHP_SELF"]))
+ {
+ $class='class="tmenu" id="sel"';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ print ''.$langs->trans("Accountancy")."/".$langs->trans("Treasury").'';
+
+}
+
+if ($conf->produit->enabled || $conf->service->enabled)
+{
+ $langs->load("products");
+
+ $class="";
+ if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "product")
+ {
+ $class='class="tmenu" id="sel"';
+ }
+ elseif (ereg("^".DOL_URL_ROOT."\/product\/",$_SERVER["PHP_SELF"]))
+ {
+ $class='class="tmenu" id="sel"';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+ $chaine="";
+ if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
+ if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
+ if ($conf->service->enabled) { $chaine.="Services"; }
+
+
+ print ''.$chaine.'';
+
+}
+
+if ($conf->webcal->enabled)
+{
+ $langs->load("other");
+
+ $class="";
+ if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; }
+ elseif (ereg("^".DOL_URL_ROOT."\/projet\/",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/webcalendar\/",$_SERVER["PHP_SELF"])) { $class="menusel"; }
+
+ print '';
+ print ''.$langs->trans("Calendar").'';
+ print ' | ';
+};
+
+
+
+
?>
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index bf1530401f3..dd33073d5a3 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -194,6 +194,8 @@ if ($_POST["action"] == "set")
// Si creation utilisateur admin demandée, on le crée
if (isset($_POST["db_create_user"]) && $_POST["db_create_user"] == "on")
{
+ dolibarr_syslog ("Creation de l'utilisateur : ".$dolibarr_main_db_user);
+
$conf = new Conf();
$conf->db->host = $dolibarr_main_db_host;
$conf->db->name = "mysql";
@@ -206,16 +208,18 @@ if ($_POST["action"] == "set")
$sql .= "(Host,User,password)";
$sql .= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_user',password('$dolibarr_main_db_pass'))";
- $db->query($sql);
-
+ print $db->query($sql);
+
$sql = "INSERT INTO db ";
$sql .= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv)";
$sql .= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_name','$dolibarr_main_db_user'";
$sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y')";
+ print $sql;
+
if ($db->query($sql))
{
-
+ dolibarr_syslog("flush privileges");
$db->query("flush privileges");
print "| Création de l'utilisateur : $dolibarr_main_db_user | OK |
";
diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php
index 7315023e32a..c1865da1fad 100644
--- a/htdocs/propal.class.php
+++ b/htdocs/propal.class.php
@@ -491,6 +491,7 @@ class Propal
else
{
print $this->db->error() . ' in ' . $sql;
+ return -1;
}
}
}
diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php
index d07b39e414f..9f723e1bb92 100644
--- a/htdocs/societe.class.php
+++ b/htdocs/societe.class.php
@@ -173,7 +173,7 @@ class Societe {
$sql .= ", s.siret, s.capital, s.ape, s.tva_intra, s.rubrique, s.fk_effectif";
$sql .= ", e.libelle as effectif, e.id as effectif_id";
$sql .= ", s.fk_forme_juridique as forme_juridique_code, fj.libelle as forme_juridique";
- $sql .= ", s.fk_departement, s.fk_pays, s.fk_stcomm";
+ $sql .= ", s.fk_departement, s.fk_pays, s.fk_stcomm, s.remise_client";
$sql .= ", p.libelle as pays";
$sql .= ", st.libelle as stcomm";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -230,6 +230,8 @@ class Societe {
$this->forme_juridique = $obj->forme_juridique;
$this->prefix_comm = $obj->prefix_comm;
+
+ $this->remise_client = $obj->remise_client;
$this->client = $obj->client;
$this->fournisseur = $obj->fournisseur;
@@ -414,6 +416,32 @@ class Societe {
return $this->db->query($sql);
}
}
+ /**
+ * Définit la société comme un client
+ *
+ *
+ */
+ function set_remise_client($remise, $user)
+ {
+ if ($this->id)
+ {
+ $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+ $sql .= " SET remise_client = '".$remise."'";
+ $sql .= " WHERE idp = " . $this->id .";";
+
+ $this->db->query($sql);
+
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise ";
+ $sql .= " ( datec, fk_soc, remise_client, fk_user_author )";
+ $sql .= " VALUES (now(),".$this->id.",'".$remise."',".$user->id.")";
+
+ if (! $this->db->query($sql) )
+ {
+ print $this->db->error();
+ }
+
+ }
+ }
/*
* Renvoie le nom d'une societe a partir d'un id