Qual: Start to fight deprecated code use reported by

https://scrutinizer-ci.com/g/eldy/dolibarr/issues/develop?orderField=path&order=asc
This commit is contained in:
Laurent Destailleur 2014-07-20 15:34:33 +02:00
parent cfc337a79a
commit d7163fe543
3 changed files with 8 additions and 16 deletions

View File

@ -195,16 +195,6 @@ if ($resql)
if ($status == 'done') $title=$langs->trans("DoneActions");
if ($status == 'todo') $title=$langs->trans("ToDoActions");
/*if ($socid)
{
$societe = new Societe($db);
$societe->fetch($socid);
$newtitle=$langs->trans($title).' '.$langs->trans("For").' '.$societe->nom;
}
else
{
$newtitle=$langs->trans($title);
}*/
$newtitle=$langs->trans($title);
$tabactive='';
@ -298,7 +288,7 @@ if ($resql)
{
$societestatic->id=$obj->socid;
$societestatic->client=$obj->client;
$societestatic->nom=$obj->societe;
$societestatic->name=$obj->societe;
print $societestatic->getNomUrl(1,'',10);
}
else print ' ';

View File

@ -304,7 +304,7 @@ elseif ($action == 'edit')
$societe->fetch($socid);
$head = societe_prepare_head($societe);
dol_fiche_head($head, 'card', $societe->nom);
dol_fiche_head($head, 'card', $societe->name);
print_titre($langs->trans("EditAddress"));
print "<br>\n";
@ -407,7 +407,7 @@ else
$societe->fetch($object->socid);
$head = societe_prepare_head($societe);
dol_fiche_head($head, 'customer', $societe->nom);
dol_fiche_head($head, 'customer', $societe->name);
// Confirmation delete

View File

@ -58,6 +58,7 @@ class Societe extends CommonObject
* @deprecated Use $name instead
*/
var $nom;
var $firstname;
var $lastname;
var $particulier;
@ -65,6 +66,7 @@ class Societe extends CommonObject
var $address;
var $zip;
var $town;
/**
* 0=activity ceased, 1= in activity
* @var int
@ -443,7 +445,7 @@ class Societe extends CommonObject
{
// Call trigger
$result=$this->call_trigger('COMPANY_CREATE',$user);
if ($result < 0) $error++;
if ($result < 0) $error++;
// End call triggers
}
else $error++;
@ -879,7 +881,7 @@ class Societe extends CommonObject
{
// Call trigger
$result=$this->call_trigger('COMPANY_MODIFY',$user);
if ($result < 0) $error++;
if ($result < 0) $error++;
// End call triggers
}
@ -1245,7 +1247,7 @@ class Societe extends CommonObject
// Call trigger
$result=$this->call_trigger('COMPANY_DELETE',$user);
if ($result < 0) $error++;
if ($result < 0) $error++;
// End call triggers
if (! $error)