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

Merge branch 'develop' into patch-4

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-16 19:39:33 +01:00 committed by GitHub
commit 85b09de61f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/debugbar/class/DataCollector/DolConfigCollector.php
View File

@ -11,6 +11,7 @@ class DolConfigCollector extends ConfigCollector
/**
* Return widget settings
*
* @return array Array
*/
public function getWidgets()
{
@ -29,6 +30,7 @@ class DolConfigCollector extends ConfigCollector
/**
* Return collected data
*
* @return array Array
*/
public function collect()
{
@ -40,6 +42,7 @@ class DolConfigCollector extends ConfigCollector
/**
* Returns an array with config data
*
* @return array Array of config
*/
protected function getConfig()
{
@ -67,6 +70,7 @@ class DolConfigCollector extends ConfigCollector
/**
* Convert an object to array
*
* @return array Array
*/
protected function object_to_array($obj)
{

2
htdocs/debugbar/class/DataCollector/DolLogsCollector.php
View File

@ -38,6 +38,7 @@ class DolLogsCollector extends MessagesCollector
/**
* Return widget settings
*
* @return array Array
*/
public function getWidgets()
{
@ -63,6 +64,7 @@ class DolLogsCollector extends MessagesCollector
/**
* Return collected data
*
* @return array Array
*/
public function collect()
{

1
htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
View File

@ -11,6 +11,7 @@ class DolMemoryCollector extends MemoryCollector
/**
* Return widget settings
*
* @return void
*/
public function getWidgets()
{

1
htdocs/debugbar/class/DataCollector/DolMessagesCollector.php
View File

@ -11,6 +11,7 @@ class DolMessagesCollector extends MessagesCollector
/**
* Return widget settings
*
* @return array Array
*/
public function getWidgets()
{

4
htdocs/debugbar/class/DataCollector/DolQueryCollector.php
View File

@ -20,7 +20,6 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
/**
* Constructor
*
*/
public function __construct()
{
@ -73,6 +72,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
/**
* Return collector name
*
* @param string Name
*/
public function getName()
{
@ -82,6 +82,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
/**
* Return widget settings
*
* @param array Array
*/
public function getWidgets()
{
@ -106,6 +107,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
/**
* Return assets
*
* @param array Array
*/
public function getAssets()
{

3
htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
View File

@ -11,6 +11,7 @@ class DolRequestDataCollector extends RequestDataCollector
/**
* Return widget settings
*
* @return void
*/
public function getWidgets()
{
@ -25,4 +26,4 @@ class DolRequestDataCollector extends RequestDataCollector
)
);
}
}
}

1
htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php
View File

@ -11,6 +11,7 @@ class DolTimeDataCollector extends TimeDataCollector
/**
* Return widget settings
*
* @return array Array
*/
public function getWidgets()
{

1
htdocs/debugbar/class/DataCollector/DolibarrCollector.php
View File

@ -32,6 +32,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
/**
* Return database info as an HTML string
*
* @return string HTML string
*/
protected function getDatabaseInfo()
{

2
htdocs/debugbar/class/autoloader.php
View File

@ -15,4 +15,4 @@ spl_autoload_register(function ($class) {
return false;
}
return true;
});
});

4
htdocs/product/card.php
View File

@ -1039,7 +1039,7 @@ else
// Nature
print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
$statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
print $form->selectarray('finished', $statutarray, GETPOST('finished','alpha'), 1);
print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
print '</td></tr>';
// Weight
@ -1424,7 +1424,7 @@ else
// Nature
print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
$statutarray=array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
print $form->selectarray('finished' ,$statutarray, $object->finished);
print $form->selectarray('finished', $statutarray, $object->finished);
print '</td></tr>';
// Weight