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

Fix sort of linked elements

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-17 15:54:54 +02:00
parent cf82587504
commit a74eaaff4d
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
View File

@ -43,6 +43,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
// Load translation files required by the page // Load translation files required by the page
$langs->load("propal"); $langs->load("propal");
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
$total=0; $ilink=0; $total=0; $ilink=0;
foreach($linkedObjectBlock as $key => $objectlink) foreach($linkedObjectBlock as $key => $objectlink)
{ {

2
htdocs/commande/tpl/linkedobjectblock.tpl.php
View File

@ -39,6 +39,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
// Load translation files required by the page // Load translation files required by the page
$langs->load("orders"); $langs->load("orders");
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
$total=0; $ilink=0; $total=0; $ilink=0;
foreach($linkedObjectBlock as $key => $objectlink) foreach($linkedObjectBlock as $key => $objectlink)
{ {

2
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
View File

@ -38,6 +38,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills"); $langs->load("bills");
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
$total=0; $ilink=0; $total=0; $ilink=0;
foreach($linkedObjectBlock as $key => $objectlink) foreach($linkedObjectBlock as $key => $objectlink)
{ {

7
htdocs/core/class/html.form.class.php
View File

@ -6480,7 +6480,7 @@ class Form
public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false) public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
{ {
global $conf,$langs,$hookmanager; global $conf,$langs,$hookmanager;
global $bc; global $bc, $action;
$object->fetchObjectLinked(); $object->fetchObjectLinked();
@ -6525,6 +6525,7 @@ class Form
$showImportButton=true; $showImportButton=true;
} }
$regs = array();
if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
{ {
$element = $regs[1]; $element = $regs[1];
@ -6628,7 +6629,7 @@ class Form
public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array()) public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
{ {
global $conf, $langs, $hookmanager; global $conf, $langs, $hookmanager;
global $bc; global $bc, $action;
$linktoelem=''; $linktoelem='';
$linktoelemlist=''; $linktoelemlist='';
@ -6663,8 +6664,6 @@ class Form
); );
} }
global $action;
// Can complete the possiblelink array // Can complete the possiblelink array
$hookmanager->initHooks(array('commonobject')); $hookmanager->initHooks(array('commonobject'));
$parameters=array('listofidcompanytoscan' => $listofidcompanytoscan); $parameters=array('listofidcompanytoscan' => $listofidcompanytoscan);