Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@@ -424,7 +424,8 @@ class doc_generic_user_odt extends ModelePDFUser
}
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
function get_substitutionarray_object($object,$outputlangs, $array_key='object') {
function get_substitutionarray_object($object,$outputlangs,$array_key='object')
{
$array_other=array();
foreach($object as $key => $value) {
if (!is_array($value) && !is_object($value)) {

5
htdocs/core/modules/user/modules_user.class.php
View File

@@ -38,7 +38,10 @@
*/
abstract class ModelePDFUser extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**