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

Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5

Browse Source
This commit is contained in:
Grand Philippe 2013-11-24 14:50:07 +01:00
commit fae27842b7
6 changed files with 303 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dev/fixnotabfiles.sh Executable file
View File

@ -0,0 +1,26 @@
#!/bin/sh
#------------------------------------------------------
# Script to find files that are not Unix encoded
#
# Laurent Destailleur - eldy@users.sourceforge.net
#------------------------------------------------------
# Usage: fixnotabfiles.sh [list|fix]
#------------------------------------------------------
# Syntax
if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
then
echo "Usage: fixnotabfiles.sh [list|fix]"
fi
# To detec
if [ "x$1" = "xlist" ]
then
find build \( -iname "*.sh" -o -iname "*.spec" \) -exec grep -l -P '\t' {} \;
fi
# To convert
if [ "x$1" = "xfix" ]
then
echo Feature not implemented. Please fix files manually.
fi

6
htdocs/user/param_ihm.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro.com> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro.com>
* *
@ -78,7 +78,7 @@ $formadmin=new FormAdmin($db);
/* /*
* Actions * Actions
*/ */
if ($action == 'update' && ($caneditfield || $user->admin)) if ($action == 'update' && ($caneditfield || ! empty($user->admin)))
{ {
if (! $_POST["cancel"]) if (! $_POST["cancel"])
{ {
@ -258,7 +258,7 @@ else
} }
else else
{ {
if ($user->id == $fuser->id || ! empty($user->admin)) // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin if ($caneditfield || ! empty($user->admin)) // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
{ {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$fuser->id.'">'.$langs->trans("Modify").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$fuser->id.'">'.$langs->trans("Modify").'</a>';
} }