Fix sort of linked elements
This commit is contained in:
parent
cf82587504
commit
a74eaaff4d
@ -43,6 +43,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
|
||||
// Load translation files required by the page
|
||||
$langs->load("propal");
|
||||
|
||||
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
|
||||
|
||||
$total=0; $ilink=0;
|
||||
foreach($linkedObjectBlock as $key => $objectlink)
|
||||
{
|
||||
|
||||
@ -39,6 +39,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
|
||||
// Load translation files required by the page
|
||||
$langs->load("orders");
|
||||
|
||||
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
|
||||
|
||||
$total=0; $ilink=0;
|
||||
foreach($linkedObjectBlock as $key => $objectlink)
|
||||
{
|
||||
|
||||
@ -38,6 +38,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
|
||||
|
||||
$langs->load("bills");
|
||||
|
||||
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
|
||||
|
||||
$total=0; $ilink=0;
|
||||
foreach($linkedObjectBlock as $key => $objectlink)
|
||||
{
|
||||
|
||||
@ -6480,7 +6480,7 @@ class Form
|
||||
public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
|
||||
{
|
||||
global $conf,$langs,$hookmanager;
|
||||
global $bc;
|
||||
global $bc, $action;
|
||||
|
||||
$object->fetchObjectLinked();
|
||||
|
||||
@ -6525,6 +6525,7 @@ class Form
|
||||
$showImportButton=true;
|
||||
}
|
||||
|
||||
$regs = array();
|
||||
if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
|
||||
{
|
||||
$element = $regs[1];
|
||||
@ -6628,7 +6629,7 @@ class Form
|
||||
public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
|
||||
{
|
||||
global $conf, $langs, $hookmanager;
|
||||
global $bc;
|
||||
global $bc, $action;
|
||||
|
||||
$linktoelem='';
|
||||
$linktoelemlist='';
|
||||
@ -6663,8 +6664,6 @@ class Form
|
||||
);
|
||||
}
|
||||
|
||||
global $action;
|
||||
|
||||
// Can complete the possiblelink array
|
||||
$hookmanager->initHooks(array('commonobject'));
|
||||
$parameters=array('listofidcompanytoscan' => $listofidcompanytoscan);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user