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

Fix merge

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-01 15:39:11 +02:00
parent c8912d6a4f
commit c3438b79c8
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/loan/class/loanschedule.class.php
View File

@ -372,20 +372,16 @@ class LoanSchedule extends CommonObject
} }
} }
<<<<<<< HEAD /**
// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps * Calculate mensuality
function calc_mens($capital,$rate,$nbterm) *
======= * @param double $capital Capital
/** * @param double $rate rate
* Calculate mensuality * @param int $nbterm nb term
* * @return double mensuality
* @param double $capital Capital */
* @param double $rate rate // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
* @param int $nbterm nb term function calc_mens($capital, $rate, $nbterm)
* @return double mensuality
*/
function calc_mens($capital, $rate, $nbterm)
>>>>>>> upstream/develop
{ {
$result=''; $result='';