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

Fix bug reported by scrutinizer

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-25 11:21:31 +01:00
parent 412c4e335d
commit aaf08ade2f
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/journal/bankjournal.php
View File

@ -1021,7 +1021,7 @@ function getSourceDocRef($val, $typerecord)
if ($ref == '(DonationPayment)') { if ($ref == '(DonationPayment)') {
$ref = $langs->trans('Donation'); $ref = $langs->trans('Donation');
} }
if ($refl == '(SubscriptionPayment)') { if ($ref == '(SubscriptionPayment)') {
$ref = $langs->trans('Subscription'); $ref = $langs->trans('Subscription');
} }
if ($ref == '(ExpenseReportPayment)') { if ($ref == '(ExpenseReportPayment)') {
@ -1030,6 +1030,8 @@ function getSourceDocRef($val, $typerecord)
if ($ref == '(payment_salary)') { if ($ref == '(payment_salary)') {
$ref = $langs->trans('Employee'); $ref = $langs->trans('Employee');
} }
$sqlmid = '';
if ($typerecord == 'payment') if ($typerecord == 'payment')
{ {
$sqlmid = 'SELECT payfac.fk_facture as id, f.facnumber as ref'; $sqlmid = 'SELECT payfac.fk_facture as id, f.facnumber as ref';

3
htdocs/compta/bank/class/account.class.php
View File

@ -1286,9 +1286,10 @@ class Account extends CommonObject
* @param string $mode ''=Link to card, 'transactions'=Link to transactions card * @param string $mode ''=Link to card, 'transactions'=Link to transactions card
* @param string $option ''=Show ref, 'reflabel'=Show ref+label * @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 $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 * @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; global $conf, $langs;

3
htdocs/fourn/class/paiementfourn.class.php
View File

@ -534,9 +534,10 @@ class PaiementFourn extends Paiement
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
* @param string $option Sur quoi pointe le lien * @param string $option Sur quoi pointe le lien
* @param string $mode 'withlistofinvoices'=Include list of invoices into tooltip * @param string $mode 'withlistofinvoices'=Include list of invoices into tooltip
* @param int $notooltip 1=Disable tooltip
* @return string Chaine avec URL * @return string Chaine avec URL
*/ */
function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices') function getNomUrl($withpicto=0, $option='', $mode='withlistofinvoices', $notooltip=0)
{ {
global $langs; global $langs;

2
htdocs/install/repair.php
View File

@ -960,7 +960,7 @@ if ($ok && GETPOST('force_disable_of_modules_not_found','alpha'))
} }
catch(Exception $e) catch(Exception $e)
{ {
// No catch yet
} }
if (! $result) if (! $result)

2
htdocs/product/inventory/class/inventory.class.php
View File

@ -227,7 +227,7 @@ class Inventory extends CommonObject
public function fetch($id, $ref = null) public function fetch($id, $ref = null)
{ {
$result = $this->fetchCommon($id, $ref); $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; return $result;
} }