Skip to content

Commit

Permalink
Merge pull request #28813 from Hystepik/fix-warnings-and-trad-not-sho…
Browse files Browse the repository at this point in the history
…wing

Fix warnings and trad not showing
  • Loading branch information
eldy authored Mar 14, 2024
2 parents df0ba88 + f1a8d71 commit b3cd83a
Show file tree
Hide file tree
Showing 3 changed files with 178 additions and 174 deletions.
2 changes: 1 addition & 1 deletion htdocs/admin/pdf_other.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';

// Load translation files required by the page
$langs->loadLangs(array('admin', 'bills', 'companies', 'languages', 'members', 'other', 'products', 'propal', 'receptions', 'stocks', 'trips'));
$langs->loadLangs(array('admin', 'bills', 'companies', 'languages', 'members', 'other', 'products', 'propal', 'receptions', 'stocks', 'trips', 'orders'));

if (!$user->admin) {
accessforbidden();
Expand Down
2 changes: 1 addition & 1 deletion htdocs/mrp/class/mo.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1859,7 +1859,7 @@ public function getMoChilds()
* Function used to return all child MOs recursively
*
* @param int $depth Depth for recursing loop count
* @return Mo[]|int array of MOs if OK, -1 if KO
* @return Mo[]|int[]|int array of MOs if OK, -1 if KO
*/
public function getAllMoChilds($depth = 0)
{
Expand Down
Loading

0 comments on commit b3cd83a

Please sign in to comment.