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

Merge remote-tracking branch 'origin/3.8' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-17 19:52:13 +02:00
commit 27b1f2ecc6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/exe/doliwamp/UsedPort.cpp
View File

@ -277,7 +277,7 @@ help=!(Port > 0);
Usage: Usage:
if (help) { if (help) {
printf("----- %s V%s (c)Laurent Destailleur -----\n",PROG,VERSION); printf("----- %s V%s (c)Laurent Destailleur -----\n",PROG,VERSION);
printf("%s is a software that allows you to know if a TCP/IP port is used\n",PROG); printf("%s is software that allows you to know if a TCP/IP port is used\n",PROG);
printf("%s sources can be compiled for WIN32 (VC++, GCC CYGWIN, MINGW) or for\n"); printf("%s sources can be compiled for WIN32 (VC++, GCC CYGWIN, MINGW) or for\n");
printf("Unix/Linux (GCC)\n",PROG); printf("Unix/Linux (GCC)\n",PROG);
printf("\n"); printf("\n");

4
htdocs/core/class/html.form.class.php
View File

@ -3016,7 +3016,7 @@ class Form
global $langs; global $langs;
$langs->load("categories"); $langs->load("categories");
include_once DOL_DOCUMENT_ROOT.'/categories/class.categorie.class.php'; include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$cat = new Categorie($this->db); $cat = new Categorie($this->db);
$cate_arbo = $cat->get_full_arbo($type,$excludeafterid); $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
@ -4677,7 +4677,7 @@ class Form
{ {
global $db; global $db;
include_once DOL_DOCUMENT_ROOT.'/categories/class.categorie.class.php'; include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$cat = new Categorie($db); $cat = new Categorie($db);
$categories = $cat->containing($id, $type); $categories = $cat->containing($id, $type);

10
htdocs/user/card.php
View File

@ -278,7 +278,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
{ {
$editgroup = new UserGroup($db); $editgroup = new UserGroup($db);
$editgroup->fetch($group); $editgroup->fetch($group);
$editgroup->oldcopy=dol_clone($editgroup); $editgroup->oldcopy=clone($editgroup);
$object->fetch($id); $object->fetch($id);
if ($action == 'addgroup') $object->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity)); if ($action == 'addgroup') $object->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
@ -340,7 +340,7 @@ if ($action == 'update' && ! $_POST["cancel"])
{ {
$db->begin(); $db->begin();
$object->oldcopy=dol_clone($object); $object->oldcopy=clone($object);
$object->lastname = GETPOST("lastname",'alpha'); $object->lastname = GETPOST("lastname",'alpha');
$object->firstname = GETPOST("firstname",'alpha'); $object->firstname = GETPOST("firstname",'alpha');
@ -508,7 +508,7 @@ if ($action == 'update' && ! $_POST["cancel"])
{ {
$object->fetch($id); $object->fetch($id);
$object->oldcopy=dol_clone($object); $object->oldcopy=clone($object);
$ret=$object->setPassword($user,$_POST["password"]); $ret=$object->setPassword($user,$_POST["password"]);
if ($ret < 0) if ($ret < 0)
@ -1046,7 +1046,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
{ {
print '<tr><td>'.$langs->trans("ColorUser").'</td>'; print '<tr><td>'.$langs->trans("ColorUser").'</td>';
print '<td>'; print '<td>';
print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset'); print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
print '</td></tr>'; print '</td></tr>';
} }
@ -2151,7 +2151,7 @@ else
{ {
print '<tr><td>'.$langs->trans("ColorUser").'</td>'; print '<tr><td>'.$langs->trans("ColorUser").'</td>';
print '<td>'; print '<td>';
print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset'); print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
print '</td></tr>'; print '</td></tr>';
} }