Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files

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

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