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

fix php warning

Browse Source
This commit is contained in:
florian HENRY 2019-02-06 09:01:24 +01:00
parent cdfeeafab9
commit 95cc9faf7e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,6 +340,8 @@ abstract class CommonDocGenerator
global $conf; global $conf;
$sumpayed=$sumdeposit=$sumcreditnote=''; $sumpayed=$sumdeposit=$sumcreditnote='';
$already_payed_all=0;
$remain_to_pay=0;
if ($object->element == 'facture') if ($object->element == 'facture')
{ {
$invoice_source=new Facture($this->db); $invoice_source=new Facture($this->db);
@ -350,6 +352,8 @@ abstract class CommonDocGenerator
$sumpayed = $object->getSommePaiement(); $sumpayed = $object->getSommePaiement();
$sumdeposit = $object->getSumDepositsUsed(); $sumdeposit = $object->getSumDepositsUsed();
$sumcreditnote = $object->getSumCreditNotesUsed(); $sumcreditnote = $object->getSumCreditNotesUsed();
$already_payed_all=$sumpayed + $sumdeposit + $sumcreditnote;
$remain_to_pay=$sumpayed - $sumdeposit - $sumcreditnote;
} }
$date = ($object->element == 'contrat' ? $object->date_contrat : $object->date); $date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
@ -411,12 +415,12 @@ abstract class CommonDocGenerator
$array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs), $array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
$array_key.'_already_creditnote'=>price2num($sumcreditnote), $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_locale'=>price(price2num($already_payed_all, 'MT'), 0, $outputlangs),
$array_key.'_already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'), $array_key.'_already_payed_all'=> price2num($already_payed_all, 'MT'),
// Remain to pay with all know infrmation (except open direct debit requests) // 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_locale'=>price(price2num($object->total_ttc - $remain_to_pay, 'MT'), 0, $outputlangs),
$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT') $array_key.'_remain_to_pay'=>price2num($object->total_ttc - $remain_to_pay, 'MT')
); );
if (method_exists($object, 'getTotalDiscount')) { if (method_exists($object, 'getTotalDiscount')) {

2
htdocs/imports/import.php
View File

@ -1332,7 +1332,7 @@ if ($step == 5 && $datatoimport)
} }
print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>'; print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
} else { } else {
if (count($objimport->array_import_updatekeys[0])) if (is_array($objimport->array_import_updatekeys[0]) && count($objimport->array_import_updatekeys[0]))
{ {
print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%'); print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt")); print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));