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

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Juanjo Menent 2016-04-15 18:08:12 +02:00
commit a2b680aa5a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/compta/paiement/class/paiement.class.php
View File

@ -563,6 +563,18 @@ class Paiement extends CommonObject
}
}
// Add link 'WithdrawalPayment' in bank_url
if (! $error && $label == '(WithdrawalPayment)')
{
$result=$acc->add_url_line(
$bank_line_id,
$this->id_prelevement,
DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
$this->num_paiement,
'withdraw'
);
}
if (! $error && ! $notrigger)
{
// Appel des triggers

1
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -462,6 +462,7 @@ class BonPrelevement extends CommonObject
$paiement->amounts = $amounts;
$paiement->paiementid = 3; //
$paiement->num_paiement = $this->ref ;
$paiement->id_prelevement = $this->id ;
$paiement_id = $paiement->create($user);
if ($paiement_id < 0)