diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index c4740b4d614..bc7dfa3d7bf 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -1021,7 +1021,7 @@ function getSourceDocRef($val, $typerecord) if ($ref == '(DonationPayment)') { $ref = $langs->trans('Donation'); } - if ($refl == '(SubscriptionPayment)') { + if ($ref == '(SubscriptionPayment)') { $ref = $langs->trans('Subscription'); } if ($ref == '(ExpenseReportPayment)') { @@ -1030,6 +1030,8 @@ function getSourceDocRef($val, $typerecord) if ($ref == '(payment_salary)') { $ref = $langs->trans('Employee'); } + + $sqlmid = ''; if ($typerecord == 'payment') { $sqlmid = 'SELECT payfac.fk_facture as id, f.facnumber as ref'; diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 0747bb9543f..e9704d81c9e 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1286,9 +1286,10 @@ class Account extends CommonObject * @param string $mode ''=Link to card, 'transactions'=Link to transactions card * @param string $option ''=Show ref, 'reflabel'=Show ref+label * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking + * @param int $notooltip 1=Disable tooltip * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $mode='', $option='', $save_lastsearch_value=-1) + function getNomUrl($withpicto=0, $mode='', $option='', $save_lastsearch_value=-1, $notooltip=0) { global $conf, $langs; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 16a3fa70a2f..8f99c24f7a7 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -534,9 +534,10 @@ class PaiementFourn extends Paiement * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @param string $mode 'withlistofinvoices'=Include list of invoices into tooltip + * @param int $notooltip 1=Disable tooltip * @return string Chaine avec URL */ - function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices') + function getNomUrl($withpicto=0, $option='', $mode='withlistofinvoices', $notooltip=0) { global $langs; diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index e05fdec0beb..1396fbfb4cf 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -960,7 +960,7 @@ if ($ok && GETPOST('force_disable_of_modules_not_found','alpha')) } catch(Exception $e) { - + // No catch yet } if (! $result) diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php index d0097a11647..acc36c5b043 100644 --- a/htdocs/product/inventory/class/inventory.class.php +++ b/htdocs/product/inventory/class/inventory.class.php @@ -227,7 +227,7 @@ class Inventory extends CommonObject public function fetch($id, $ref = null) { $result = $this->fetchCommon($id, $ref); - if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines(); + //if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines(); return $result; }