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

FIX #6795 #6796

Browse Source
This commit is contained in:
Laurent Destailleur 2017-05-05 17:28:33 +02:00
parent eb2124bfc8
commit 15d20497c8
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/compta/facture/class/facture.class.php
View File

@ -3560,10 +3560,11 @@ class Facture extends CommonInvoice
/** /**
* Create a withdrawal request for a standing order * Create a withdrawal request for a standing order.
* Use the remain to pay excluding all existing open direct debit requests.
* *
* @param User $fuser User asking standing order * @param User $fuser User asking the direct debit transfer
* @param float $amount Amount we request withdraw for * @param float $amount Amount we request direct debit for
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function demande_prelevement($fuser, $amount=0) function demande_prelevement($fuser, $amount=0)

23
htdocs/core/class/commondocgenerator.class.php
View File

@ -333,7 +333,7 @@ abstract class CommonDocGenerator
{ {
global $conf; global $conf;
$sumpayed=''; $alreadypayed=''; $sumpayed=$sumdeposit=$sumcreditnote='';
if ($object->element == 'facture') if ($object->element == 'facture')
{ {
$invoice_source=new Facture($this->db); $invoice_source=new Facture($this->db);
@ -342,7 +342,8 @@ abstract class CommonDocGenerator
$invoice_source->fetch($object->fk_facture_source); $invoice_source->fetch($object->fk_facture_source);
} }
$sumpayed = $object->getSommePaiement(); $sumpayed = $object->getSommePaiement();
$alreadypayed=price($sumpayed,0,$outputlangs); $sumdeposit = $object->getSumDepositsUsed();
$sumcreditnote = $object->getSumCreditNotesUsed();
} }
$resarray=array( $resarray=array(
@ -385,11 +386,21 @@ abstract class CommonDocGenerator
$array_key.'_note_private'=>$object->note, $array_key.'_note_private'=>$object->note,
$array_key.'_note_public'=>$object->note_public, $array_key.'_note_public'=>$object->note_public,
$array_key.'_note'=>$object->note_public, // For backward compatibility $array_key.'_note'=>$object->note_public, // For backward compatibility
// Payments // Payments
$array_key.'_already_payed_locale'=>price($alreadypayed, 0, $outputlangs), $array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
$array_key.'_remain_to_pay_locale'=>price($object->total_ttc - $sumpayed, 0, $outputlangs), $array_key.'_already_payed'=>price2num($sumpayed),
$array_key.'_already_payed'=>$alreadypayed, $array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed) $array_key.'_already_deposit'=>price2num($sumdeposit),
$array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
$array_key.'_already_creditnote'=>price2num($sumcreditnote),
$array_key.'_already_payed_all_locale'=>price(price2num($sumpayed + $sumdeposit + $sumcreditnote, 'MT'), 0, $outputlangs),
$array_key.'already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'),
// Remain to pay with all know infrmation (except open direct debit requests)
$array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT'), 0, $outputlangs),
$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT')
); );
// Add vat by rates // Add vat by rates