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

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

Browse Source 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
This commit is contained in:
Laurent Destailleur 2016-03-04 15:39:55 +01:00
commit f06911a8b0
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/fourn/facture/card.php
View File

@ -1667,12 +1667,6 @@ else
if ($objectref == 'PROV')
{
$savdate=$object->date;
if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))
{
$object->date=dol_now();
//TODO: Possibly will have to control payment information into suppliers
//$object->date_lim_reglement=$object->calculate_date_lim_reglement();
}
$numref = $object->getNextNumRef($societe);
}
else

2
htdocs/langs/en_US/admin.lang
View File

@ -586,6 +586,7 @@ Permission38=Export products
Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
Permission42=Create/modify projects (shared project and projects i'm contact for)
Permission44=Delete projects (shared project and projects i'm contact for)
Permission45=Export projects
Permission61=Read interventions
Permission62=Create/modify interventions
Permission64=Delete interventions
@ -639,6 +640,7 @@ Permission162=Create/modify contracts/subscriptions
Permission163=Activate a service/subscription of a contract
Permission164=Disable a service/subscription of a contract
Permission165=Delete contracts/subscriptions
Permission167=Export contracts
Permission171=Read trips and expenses (yours and your subordinates)
Permission172=Create/modify trips and expenses
Permission173=Delete trips and expenses

3
htdocs/langs/fr_FR/admin.lang
View File

@ -588,6 +588,7 @@ Permission38=Exporter les produits
Permission41=Lire les projets et les tâches (projets publiques et projets dont je suis contact). Peut également entrer le temps consommé sur les tâches assignées (feuille de temps)
Permission42=Créer/modifier les projets et tâches (partagés ou dont je suis contact)
Permission44=Supprimer les projets et tâches (partagés ou dont je suis contact)
Permission45=Exporter les projets
Permission61=Consulter les interventions
Permission62=Créer/modifier les interventions
Permission64=Supprimer les interventions
@ -778,7 +779,7 @@ Permission20002=Créer/modifier vos demandes de congé
Permission20003=Supprimer les demandes de congé
Permission20004=Lire toutes les demandes de congé (même celle des utilisateurs non subordonnés)
Permission20005=Créer/modifier les congés pour tout le monde
Permission20006=Administration des demandes de congès (configuration et mise à jour du solde)
Permission20006=Administration des demandes de congés (configuration et mise à jour du solde)
Permission23001=Voir les travaux planifiés
Permission23002=Créer/Modifier des travaux planifiées
Permission23003=Effacer travail planifié

38
htdocs/societe/commerciaux.php
View File

@ -33,7 +33,7 @@ $langs->load("suppliers");
$langs->load("banks");
// Security check
$socid = GETPOST("socid");
$socid = GETPOST('socid', 'int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe','','');
@ -43,17 +43,14 @@ $hookmanager->initHooks(array('salesrepresentativescard','globalcard'));
* Actions
*/
if($_GET["socid"] && $_GET["commid"])
if (! empty($socid) && $_GET["commid"])
{
$action = 'add';
if ($user->rights->societe->creer)
{
$object = new Societe($db);
$object->id = $_GET["socid"];
$object->fetch($_GET["socid"]);
$object->fetch($socid);
$parameters=array('id'=>$_GET["commid"]);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
@ -61,25 +58,24 @@ if($_GET["socid"] && $_GET["commid"])
if (empty($reshook)) $object->add_commercial($user, $_GET["commid"]);
header("Location: commerciaux.php?socid=".$object->id);
header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$object->id);
exit;
}
else
{
header("Location: commerciaux.php?socid=".$_GET["socid"]);
header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
exit;
}
}
if ($socid && $_GET["delcommid"])
if (! empty($socid) && $_GET["delcommid"])
{
$action = 'delete';
if ($user->rights->societe->creer)
{
$object = new Societe($db);
$object->id = $_GET["socid"];
$object->fetch($_GET["socid"]);
$object->fetch($socid);
$parameters=array('id'=>$_GET["delcommid"]);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
@ -92,7 +88,7 @@ if ($socid && $_GET["delcommid"])
}
else
{
header("Location: commerciaux.php?socid=".$_GET["socid"]);
header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
exit;
}
}
@ -107,7 +103,7 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url);
$form = new Form($db);
if ($socid)
if (! empty($socid))
{
$object = new Societe($db);
$result=$object->fetch($socid);
@ -171,7 +167,7 @@ if ($socid)
print '</a>&nbsp;';
if ($user->rights->societe->creer)
{
print '<a href="commerciaux.php?socid='.$_GET["socid"].'&amp;delcommid='.$obj->rowid.'">';
print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;delcommid='.$obj->rowid.'">';
print img_delete();
print '</a>';
}
@ -205,9 +201,17 @@ if ($socid)
$langs->load("users");
$title=$langs->trans("ListOfUsers");
$sql = "SELECT u.rowid, u.lastname, u.firstname, u.login";
$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.login";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
{
$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
$sql.= " WHERE (ug.fk_user = u.rowid";
$sql.= " AND ug.entity = ".$conf->entity.")";
$sql.= " OR u.admin = 1";
}
else
$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut<>0 ";
$sql.= " ORDER BY u.lastname ASC ";
@ -239,7 +243,7 @@ if ($socid)
print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n";
print '</a>';
print '</td><td>'.$obj->login.'</td>';
print '<td><a href="commerciaux.php?socid='.$_GET["socid"].'&amp;commid='.$obj->rowid.'">'.$langs->trans("Add").'</a></td>';
print '<td><a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;commid='.$obj->rowid.'">'.$langs->trans("Add").'</a></td>';
print '</tr>'."\n";
$i++;