Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Browse Source 
Conflicts:
	.travis.yml
	htdocs/api/class/api_documents.class.php
	htdocs/core/db/pgsql.class.php
This commit is contained in:
Laurent Destailleur
2023-07-26 01:42:22 +02:00
parent ff3e871bae 981f803ad0
commit ec39199b85
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/api/class/api_documents.class.php
View File

@@ -547,6 +547,17 @@ class Documents extends DolibarrApi
}
$upload_dir = $conf->contrat->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'contract');
} elseif ($modulepart == 'projet' || $modulepart == 'project') {
$modulepart = 'project';
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
$object = new Project($this->db);
$result = $object->fetch($id, $ref);
if (!$result) {
throw new RestException(404, 'Project not found');
}
$upload_dir = $conf->projet->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'project');
} else {
throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
}
@@ -676,7 +687,7 @@ class Documents extends DolibarrApi
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
$object = new CommandeFournisseur($this->db);
} elseif ($modulepart == 'project') {
} elseif ($modulepart == 'projet' || $modulepart == 'project') {
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$object = new Project($this->db);
} elseif ($modulepart == 'task' || $modulepart == 'project_task') {