diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 09cc56c54e8..c0b3743c980 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -121,7 +121,7 @@ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1); // R if ($id) { $project->fetch($id); - $project->societe->fetch($project->societe->id); + $project->fetch_thirdparty(); } $tasksarray=$taskstatic->getTasksArray(0,0,($project->id?$project->id:$projectsListId),$socid,0); // We want to see all task of project i am allowed to see, not only mine. Later only mine will be editable later. diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 3279221d0c4..7f8fd52c500 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -53,7 +53,6 @@ class Project extends CommonObject var $statuts; var $oldcopy; - /** * Constructor * @@ -62,7 +61,6 @@ class Project extends CommonObject function __construct($db) { $this->db = $db; - $this->societe = new Societe($db); $this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed'); $this->statuts = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed'); @@ -982,6 +980,7 @@ class Project extends CommonObject // Load source object $clone_project->fetch($fromid); + $clone_project->fetch_thirdparty(); $orign_dt_start=$clone_project->date_start; $orign_project_ref=$clone_project->ref; @@ -1009,7 +1008,7 @@ class Project extends CommonObject require_once DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.'.php'; $modProject = new $obj; - $defaultref = $modProject->getNextValue($clone_project->societe->id,$clone_project); + $defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty)?$clone_project->thirdparty->id:0,$clone_project); } if (is_numeric($defaultref) && $defaultref <= 0) $defaultref=''; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 53559c74333..abdf6f81b5b 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -89,7 +89,7 @@ $userstatic=new User($db); $project = new Project($db); $project->fetch($projectid,$ref); -$project->societe->fetch($project->societe->id); +$project->fetch_thirdparty(); // To verify role of users $userAccess = $project->restrictedProjectArea($user); @@ -115,7 +115,7 @@ print ''; print '
| '.$langs->trans("Ref").' | '; print ''.$langs->trans("Date").' | '; @@ -272,7 +272,7 @@ foreach ($listofreferent as $key => $value) { if ($element->close_code == 'replaced') $qualifiedfortotal=false; // Replacement invoice } - + $var=!$var; print "
';
if (! $qualifiedfortotal) print '| ';
if (! $qualifiedfortotal) print ' | |