From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 16 May 2016 16:04:03 +0000 (+0200)
Subject: rent_yead
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=63767f0d78c5e4cac586279c5a2d71ccd179d293;p=nb.git

rent_yead
---

diff --git a/etc/dbs/rent.php b/etc/dbs/rent.php
index e3311b19..b2bcaa3b 100644
--- a/etc/dbs/rent.php
+++ b/etc/dbs/rent.php
@@ -24,10 +24,13 @@ $CONF['_rent'] = array (
         #extra: "rent * (1 + ( strftime('%m',end)+12*strftime('%Y',end) ) -  ( strftime('%m',start)+12*strftime('%Y',start) ))"
         #$r['rent_year'] = $r['rent'] * (1 + ( date('m',strtotime($r['end']))+12
         $r['Total'] = $r['rent'] + $r['charge'];
-        if (1) $r['rent_year'] = sprintf('%.2f',$r['rent'] * (1 +
-          ( date('m',strtotime($r['end'])) + 12 * date('Y',strtotime($r['end'])) )
-          - 
-          ( date('m',strtotime($r['start'])) + 12 * date('Y',strtotime($r['start'])) )
+# NB 16.05.16         if (1) $r['rent_year'] = sprintf('%.2f',$r['rent'] * (1 +
+# NB 16.05.16           ( date('m',strtotime($r['end'])) + 12 * date('Y',strtotime($r['end'])) )
+# NB 16.05.16           - 
+# NB 16.05.16           ( date('m',strtotime($r['start'])) + 12 * date('Y',strtotime($r['start'])) )
+# NB 16.05.16         ));
+        $r['rent_year'] = sprintf('%.2f',$r['rent'] * (
+          1 + 12 - date('m',strtotime($r['start']))
         ));
       },