lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: early development of multi-company module

Browse Source
This commit is contained in:
Regis Houssin 2009-04-16 00:06:39 +00:00
parent c75e812a76
commit fd7d9b5d5a
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/admin/const.php
View File

@ -38,7 +38,7 @@ $typeconst=array('yesno','texte','chaine');
if ($_POST["action"] == 'update' || $_POST["action"] == 'add') if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
{ {
if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],1,isset($_POST["constnote"])?$_POST["constnote"]:'')); if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],1,isset($_POST["constnote"])?$_POST["constnote"]:'',$_POST["entity"]));
{ {
print $db->error(); print $db->error();
} }
@ -93,10 +93,17 @@ print '</form>';
# Affiche lignes des constantes # Affiche lignes des constantes
if ($all==1){ if ($all==1){
$sql = "SELECT rowid, name, value, note FROM llx_const ORDER BY name ASC"; $sql = "SELECT rowid, name, value, note, entity ";
$sql.= "FROM llx_const ";
$sql.= "WHERE entity = 0 OR entity = ".$conf->entity." ";
$sql.= "ORDER BY name ASC";
}else{ }else{
$sql = "SELECT rowid, name, value, note FROM llx_const WHERE visible = 1 ORDER BY name ASC"; $sql = "SELECT rowid, name, value, note, entity ";
$sql.= "FROM llx_const ";
$sql.= "WHERE visible = 1 AND (entity = 0 OR entity = ".$conf->entity.") ";
$sql.= "ORDER BY name ASC";
} }
dol_syslog("Const::listConstant sql=".$sql,LOG_DEBUG);
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
@ -113,6 +120,7 @@ if ($result)
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="rowid" value="'.$rowid.'">'; print '<input type="hidden" name="rowid" value="'.$rowid.'">';
print '<input type="hidden" name="constname" value="'.$obj->name.'">'; print '<input type="hidden" name="constname" value="'.$obj->name.'">';
print '<input type="hidden" name="entity" value="'.$obj->entity.'">';
print "<tr $bc[$var] class=value><td>$obj->name</td>\n"; print "<tr $bc[$var] class=value><td>$obj->name</td>\n";

2
htdocs/core/conf.class.php
View File

@ -84,7 +84,7 @@ class Conf
* - En $this->global->key=value * - En $this->global->key=value
*/ */
$sql = "SELECT name, value, entity FROM ".MAIN_DB_PREFIX."const "; $sql = "SELECT name, value, entity FROM ".MAIN_DB_PREFIX."const ";
$sql.= " WHERE entity = ".$this->entity; $sql.= " WHERE entity = 0 OR entity = ".$this->entity;
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {

11
mysql/tables/llx_const.sql
View File

@ -36,4 +36,13 @@ create table llx_const
tms timestamp, tms timestamp,
entity integer DEFAULT 1 NOT NULL, -- multi company id entity integer DEFAULT 1 NOT NULL, -- multi company id
UNIQUE INDEX(name) UNIQUE INDEX(name)
)type=innodb; )type=innodb;
--
-- List of codes for the field entity
--
-- 0 : common constant
-- 1 : first company constant
-- 2 : second company constant
-- 3 : etc...
--