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

Merge pull request #7943 from aspangaro/7.0-b4

Browse Source 
FIX : Various payment
This commit is contained in:
Laurent Destailleur 2017-12-12 14:54:44 +01:00 committed by GitHub
commit 676e5a1bca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -462,7 +462,7 @@ class AccountingAccount extends CommonObject
} }
/** /**
* Account desactivate * Account deactivated
* *
* @param int $id Id * @param int $id Id
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
@ -494,7 +494,7 @@ class AccountingAccount extends CommonObject
} }
/** /**
* Account activate * Account activated
* *
* @param int $id Id * @param int $id Id
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK

2
htdocs/compta/bank/various_payment/card.php
View File

@ -437,7 +437,7 @@ if ($id)
if (! empty($conf->accounting->enabled)) if (! empty($conf->accounting->enabled))
{ {
$accountingaccount = new AccountingAccount($db); $accountingaccount = new AccountingAccount($db);
$accountingaccount->fetch('',$object->accountancy_code); $accountingaccount->fetch('',$object->accountancy_code, 1);
print $accountingaccount->getNomUrl(0,1,1,'',1); print $accountingaccount->getNomUrl(0,1,1,'',1);
} else { } else {

2
htdocs/compta/bank/various_payment/index.php
View File

@ -257,7 +257,7 @@ if ($result)
// Accounting account // Accounting account
if (! empty($conf->accounting->enabled)) { if (! empty($conf->accounting->enabled)) {
$accountingaccount = new AccountingAccount($db); $accountingaccount = new AccountingAccount($db);
$accountingaccount->fetch('',$obj->accountancy_code); $accountingaccount->fetch('', $obj->accountancy_code, 1);
print '<td>'.$accountingaccount->getNomUrl(0,1,1,'',1).'</td>'; print '<td>'.$accountingaccount->getNomUrl(0,1,1,'',1).'</td>';
} }