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

Merge pull request #14845 from TobiasSekan/FixWrongExpectedTypeInViewcat

Browse Source 
FIX wrong expected type for "dol_print_error" in "viewcat.php"
This commit is contained in:
Laurent Destailleur 2020-09-28 17:23:28 +02:00 committed by GitHub
commit 53b9866d20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/categories/viewcat.php
View File

@ -317,7 +317,7 @@ print '</tr>';
$cats = $object->get_filles(); $cats = $object->get_filles();
if ($cats < 0) if ($cats < 0)
{ {
dol_print_error($db, $cats->error, $cats->errors); dol_print_error($db, $object->error, $object->errors);
} elseif (count($cats) < 1) } elseif (count($cats) < 1)
{ {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
@ -432,7 +432,7 @@ if ($type == Categorie::TYPE_PRODUCT)
$prods = $object->getObjectsInCateg($type, 0, $limit, $offset); $prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($prods < 0) if ($prods < 0)
{ {
dol_print_error($db, $prods->error, $prods->errors); dol_print_error($db, $object->error, $object->errors);
} else { } else {
// Form to add record into a category // Form to add record into a category
$showclassifyform = 1; $showclassifyform = 1;
@ -511,7 +511,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
$socs = $object->getObjectsInCateg($type, 0, $limit, $offset); $socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($socs < 0) if ($socs < 0)
{ {
dol_print_error($db, $socs->error, $socs->errors); dol_print_error($db, $object->error, $object->errors);
} else { } else {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
@ -568,7 +568,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
$socs = $object->getObjectsInCateg($type, 0, $limit, $offset); $socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($socs < 0) if ($socs < 0)
{ {
dol_print_error($db, $socs->error, $socs->errors); dol_print_error($db, $object->error, $object->errors);
} else { } else {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
@ -627,7 +627,7 @@ if ($type == Categorie::TYPE_MEMBER)
$prods = $object->getObjectsInCateg($type, 0, $limit, $offset); $prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($prods < 0) if ($prods < 0)
{ {
dol_print_error($db, $prods->error, $prods->errors); dol_print_error($db, $object->error, $object->errors);
} else { } else {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
@ -686,7 +686,7 @@ if ($type == Categorie::TYPE_CONTACT)
$contacts = $object->getObjectsInCateg($type, 0, $limit, $offset); $contacts = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($contacts < 0) if ($contacts < 0)
{ {
dol_print_error($db, $contacts->error, $contacts->errors); dol_print_error($db, $object->error, $object->errors);
} else { } else {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
@ -748,7 +748,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
$accounts = $object->getObjectsInCateg($type, 0, $limit, $offset); $accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($accounts < 0) if ($accounts < 0)
{ {
dol_print_error($db, $accounts->error, $accounts->errors); dol_print_error($db, $object->error, $object->errors);
} else { } else {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';