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

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-02-28 11:49:10 +01:00
commit 40b412728f
6 changed files with 239 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/tpl/objectline_edit.tpl.php
View File

@ -124,13 +124,13 @@ $coldisplay=-1; // We remove first td
if (!empty($conf->multicurrency->enabled)) { if (!empty($conf->multicurrency->enabled)) {
$colspan++; $colspan++;
print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat" size="8" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>'; print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
} }
if ($inputalsopricewithtax) if ($inputalsopricewithtax)
{ {
$coldisplay++; $coldisplay++;
print '<td align="right"><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"'; print '<td align="right"><input type="text" class="flat" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
if ($this->situation_counter > 1) print ' readonly'; if ($this->situation_counter > 1) print ' readonly';
print '></td>'; print '></td>';
} }

3
htdocs/core/triggers/interface_20_all_Logevents.class.php
View File

@ -175,6 +175,9 @@ class InterfaceLogevents extends DolibarrTriggers
} }
*/ */
// Add more information into desc from the context property
if (! empty($desc) && ! empty($object->context['audit'])) $desc.=' - '.$object->context['audit'];
// Add entry in event table // Add entry in event table
include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';

7
htdocs/user/card.php
View File

@ -318,16 +318,14 @@ if (empty($reshook)) {
$error ++; $error ++;
} }
if (!$error) { if (!$error)
{
$object->fetch($id); $object->fetch($id);
$object->oldcopy = clone $object; $object->oldcopy = clone $object;
if (!$error) {
$db->begin(); $db->begin();
$object->oldcopy = clone $object;
$object->lastname = GETPOST("lastname", 'alpha'); $object->lastname = GETPOST("lastname", 'alpha');
$object->firstname = GETPOST("firstname", 'alpha'); $object->firstname = GETPOST("firstname", 'alpha');
$object->login = GETPOST("login", 'alpha'); $object->login = GETPOST("login", 'alpha');
@ -490,7 +488,6 @@ if (empty($reshook)) {
$db->rollback(); $db->rollback();
} }
} }
}
} }
else else
{ {

50
htdocs/user/class/user.class.php
View File

@ -378,12 +378,12 @@ class User extends CommonObject
*/ */
function addrights($rid, $allmodule='', $allperms='', $entity='') function addrights($rid, $allmodule='', $allperms='', $entity='')
{ {
global $conf; global $conf, $user, $langs;
$entity = (! empty($entity)?$entity:$conf->entity); $entity = (! empty($entity)?$entity:$conf->entity);
dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms, $entity"); dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms, $entity");
$err=0; $error=0;
$whereforadd=''; $whereforadd='';
$this->db->begin(); $this->db->begin();
@ -405,7 +405,7 @@ class User extends CommonObject
$subperms=$obj->subperms; $subperms=$obj->subperms;
} }
else { else {
$err++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
@ -443,23 +443,33 @@ class User extends CommonObject
$nid = $obj->id; $nid = $obj->id;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid; $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid;
if (! $this->db->query($sql)) $err++; if (! $this->db->query($sql)) $error++;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES (".$this->id.", ".$nid.")"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES (".$this->id.", ".$nid.")";
if (! $this->db->query($sql)) $err++; if (! $this->db->query($sql)) $error++;
$i++; $i++;
} }
} }
else else
{ {
$err++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
} }
if ($err) { if (! $error)
{
$this->context = array('audit'=>$langs->trans("PermissionsAdd"));
// Call trigger
$result=$this->call_trigger('USER_MODIFY',$user);
if ($result < 0) { $error++; }
// End call triggers
}
if ($error) {
$this->db->rollback(); $this->db->rollback();
return -$err; return -$error;
} }
else { else {
$this->db->commit(); $this->db->commit();
@ -480,9 +490,9 @@ class User extends CommonObject
*/ */
function delrights($rid, $allmodule='', $allperms='', $entity='') function delrights($rid, $allmodule='', $allperms='', $entity='')
{ {
global $conf; global $conf, $user, $langs;
$err=0; $error=0;
$wherefordel=''; $wherefordel='';
$entity = (! empty($entity)?$entity:$conf->entity); $entity = (! empty($entity)?$entity:$conf->entity);
@ -505,7 +515,7 @@ class User extends CommonObject
$subperms=$obj->subperms; $subperms=$obj->subperms;
} }
else { else {
$err++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
@ -543,21 +553,31 @@ class User extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";
$sql.= " WHERE fk_user = ".$this->id." AND fk_id=".$nid; $sql.= " WHERE fk_user = ".$this->id." AND fk_id=".$nid;
if (! $this->db->query($sql)) $err++; if (! $this->db->query($sql)) $error++;
$i++; $i++;
} }
} }
else else
{ {
$err++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
} }
if ($err) { if (! $error)
{
$this->context = array('audit'=>$langs->trans("PermissionsDelete"));
// Call trigger
$result=$this->call_trigger('USER_MODIFY',$user);
if ($result < 0) { $error++; }
// End call triggers
}
if ($error) {
$this->db->rollback(); $this->db->rollback();
return -$err; return -$error;
} }
else { else {
$this->db->commit(); $this->db->commit();

54
htdocs/user/class/usergroup.class.php
View File

@ -249,7 +249,7 @@ class UserGroup extends CommonObject
} }
/** /**
* Ajoute un droit a l'utilisateur * Add a permission to a group
* *
* @param int $rid id du droit a ajouter * @param int $rid id du droit a ajouter
* @param string $allmodule Ajouter tous les droits du module allmodule * @param string $allmodule Ajouter tous les droits du module allmodule
@ -258,10 +258,10 @@ class UserGroup extends CommonObject
*/ */
function addrights($rid,$allmodule='',$allperms='') function addrights($rid,$allmodule='',$allperms='')
{ {
global $conf; global $conf, $user, $langs;
dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms"); dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms");
$err=0; $error=0;
$whereforadd=''; $whereforadd='';
$this->db->begin(); $this->db->begin();
@ -283,7 +283,7 @@ class UserGroup extends CommonObject
$subperms=$obj->subperms; $subperms=$obj->subperms;
} }
else { else {
$err++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
@ -323,23 +323,33 @@ class UserGroup extends CommonObject
$nid = $obj->id; $nid = $obj->id;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights WHERE fk_usergroup = $this->id AND fk_id=".$nid; $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights WHERE fk_usergroup = $this->id AND fk_id=".$nid;
if (! $this->db->query($sql)) $err++; if (! $this->db->query($sql)) $error++;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_rights (fk_usergroup, fk_id) VALUES ($this->id, $nid)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_rights (fk_usergroup, fk_id) VALUES ($this->id, $nid)";
if (! $this->db->query($sql)) $err++; if (! $this->db->query($sql)) $error++;
$i++; $i++;
} }
} }
else else
{ {
$err++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
if (! $error)
{
$this->context = array('audit'=>$langs->trans("PermissionsAdd"));
// Call trigger
$result=$this->call_trigger('GROUP_MODIFY',$user);
if ($result < 0) { $error++; }
// End call triggers
}
} }
if ($err) { if ($error) {
$this->db->rollback(); $this->db->rollback();
return -$err; return -$error;
} }
else { else {
$this->db->commit(); $this->db->commit();
@ -350,7 +360,7 @@ class UserGroup extends CommonObject
/** /**
* Retire un droit a l'utilisateur * Remove a permission from group
* *
* @param int $rid id du droit a retirer * @param int $rid id du droit a retirer
* @param string $allmodule Retirer tous les droits du module allmodule * @param string $allmodule Retirer tous les droits du module allmodule
@ -359,9 +369,9 @@ class UserGroup extends CommonObject
*/ */
function delrights($rid,$allmodule='',$allperms='') function delrights($rid,$allmodule='',$allperms='')
{ {
global $conf; global $conf, $user, $langs;
$err=0; $error=0;
$wherefordel=''; $wherefordel='';
$this->db->begin(); $this->db->begin();
@ -383,7 +393,7 @@ class UserGroup extends CommonObject
$subperms=$obj->subperms; $subperms=$obj->subperms;
} }
else { else {
$err++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
@ -424,21 +434,31 @@ class UserGroup extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
$sql.= " WHERE fk_usergroup = $this->id AND fk_id=".$nid; $sql.= " WHERE fk_usergroup = $this->id AND fk_id=".$nid;
if (! $this->db->query($sql)) $err++; if (! $this->db->query($sql)) $error++;
$i++; $i++;
} }
} }
else else
{ {
$err++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
if (! $error)
{
$this->context = array('audit'=>$langs->trans("PermissionsDelete"));
// Call trigger
$result=$this->call_trigger('GROUP_MODIFY',$user);
if ($result < 0) { $error++; }
// End call triggers
}
} }
if ($err) { if ($error) {
$this->db->rollback(); $this->db->rollback();
return -$err; return -$error;
} }
else { else {
$this->db->commit(); $this->db->commit();

26
htdocs/user/group/card.php
View File

@ -311,15 +311,15 @@ else
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref // Ref
print '<tr><td width="25%">'.$langs->trans("Ref").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">'; print '<td>';
print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin); print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Name // Name
print '<tr><td width="25%">'.$langs->trans("Name").'</td>'; print '<tr><td>'.$langs->trans("Name").'</td>';
print '<td width="75%" class="valeur">'.$object->name; print '<td class="valeur">'.$object->name;
if (empty($object->entity)) if (empty($object->entity))
{ {
print img_picto($langs->trans("GlobalGroup"),'redstar'); print img_picto($langs->trans("GlobalGroup"),'redstar');
@ -331,12 +331,12 @@ else
{ {
$mc->getInfo($object->entity); $mc->getInfo($object->entity);
print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>'; print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
print '<td width="75%" class="valeur">'.$mc->label; print '<td class="valeur">'.$mc->label;
print "</td></tr>\n"; print "</td></tr>\n";
} }
// Note // Note
print '<tr><td width="25%" class="tdtop">'.$langs->trans("Description").'</td>'; print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
print '<td class="valeur">'.dol_htmlentitiesbr($object->note).'&nbsp;</td>'; print '<td class="valeur">'.dol_htmlentitiesbr($object->note).'&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
@ -397,8 +397,8 @@ else
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="adduser">'; print '<input type="hidden" name="action" value="adduser">';
print '<table class="noborder" width="100%">'."\n"; print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("NonAffectedUsers").'</td>'."\n"; print '<tr class="liste_titre"><td class="titlefield liste_titre">'.$langs->trans("NonAffectedUsers").'</td>'."\n";
print '<td>'; print '<td class="liste_titre">';
print $form->select_dolusers('', 'user', 1, $exclude, 0, '', '', $object->entity, 0, 0, '', 0, '', 'maxwidth300'); print $form->select_dolusers('', 'user', 1, $exclude, 0, '', '', $object->entity, 0, 0, '', 0, '', 'maxwidth300');
print ' &nbsp; '; print ' &nbsp; ';
// Multicompany // Multicompany
@ -491,7 +491,7 @@ else
} }
else else
{ {
print '<tr><td colspan=2 class="opacitymedium">'.$langs->trans("None").'</td></tr>'; print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
} }
print "</table>"; print "</table>";
print "<br>"; print "<br>";
@ -509,8 +509,8 @@ else
dol_fiche_head($head, 'group', $title, 0, 'group'); dol_fiche_head($head, 'group', $title, 0, 'group');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="25%" valign="top" class="fieldrequired">'.$langs->trans("Name").'</td>'; print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Name").'</td>';
print '<td width="75%" class="valeur"><input size="15" type="text" name="group" value="'.$object->name.'">'; print '<td class="valeur"><input size="15" type="text" name="group" value="'.$object->name.'">';
print "</td></tr>\n"; print "</td></tr>\n";
// Multicompany // Multicompany
@ -528,7 +528,7 @@ else
} }
} }
print '<tr><td width="25%" valign="top">'.$langs->trans("Description").'</td>'; print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
print '<td class="valeur">'; print '<td class="valeur">';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,'90%'); $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,'90%');
@ -536,7 +536,7 @@ else
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
// Other attributes // Other attributes
$parameters=array('colspan' => ' colspan="2"'); $parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook) && ! empty($extrafields->attribute_label)) if (empty($reshook) && ! empty($extrafields->attribute_label))
{ {