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

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

Browse Source 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
This commit is contained in:
Laurent Destailleur 2019-08-14 04:12:37 +02:00
commit bb4618e2cf
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/fichinter/class/api_interventions.class.php
View File

@ -80,7 +80,7 @@ class Interventions extends DolibarrApi
$result = $this->fichinter->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Intervention report not found');
throw new RestException(404, 'Intervention not found');
}
if( ! DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
@ -174,7 +174,7 @@ class Interventions extends DolibarrApi
}
}
else {
throw new RestException(503, 'Error when retrieve fichinter list : '.$db->lasterror());
throw new RestException(503, 'Error when retrieve intervention list : '.$db->lasterror());
}
if( ! count($obj_ret)) {
throw new RestException(404, 'No intervention found');
@ -200,7 +200,7 @@ class Interventions extends DolibarrApi
}
if ($this->fichinter->create(DolibarrApiAccess::$user) < 0) {
throw new RestException(500, "Error creating fichinter", array_merge(array($this->fichinter->error), $this->fichinter->errors));
throw new RestException(500, "Error creating intervention", array_merge(array($this->fichinter->error), $this->fichinter->errors));
}
return $this->fichinter->id;
@ -301,7 +301,7 @@ class Interventions extends DolibarrApi
throw new RestException(404, 'Intervention not found');
}
if( ! DolibarrApi::_checkAccessToResource('commande', $this->fichinter->id)) {
if( ! DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}

BIN
htdocs/install/doctemplates/websites/website_template-corporate.zip
View File

Binary file not shown.

3
htdocs/website/index.php
View File

@ -1167,7 +1167,6 @@ if ($action == 'updatecss')
setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
}
// Message if no error
if (! $error)
{
@ -2933,7 +2932,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
if ($action != 'createcontainer')
{
print '<tr><td>';
print $langs->trans('LastModificationAuthor');
print $langs->trans('UserModif');
print '</td><td>';
if ($pageusermodifid > 0)
{