[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12013] property: fix bug in accounting period transi
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [12013] property: fix bug in accounting period transition |
Date: |
Thu, 12 Jun 2014 19:45:13 +0000 |
Revision: 12013
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12013
Author: sigurdne
Date: 2014-06-12 19:45:12 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
property: fix bug in accounting period transition
Modified Paths:
--------------
trunk/property/inc/export/default/Agresso_X114
Modified: trunk/property/inc/export/default/Agresso_X114
===================================================================
--- trunk/property/inc/export/default/Agresso_X114 2014-06-12 13:58:28 UTC
(rev 12012)
+++ trunk/property/inc/export/default/Agresso_X114 2014-06-12 19:45:12 UTC
(rev 12013)
@@ -793,38 +793,15 @@
$accountline = array();
- if ( $oRsBilag[0]['periode'] )
+ $_periode = $oRsBilag[0]['periode'] ?
$oRsBilag[0]['periode'] : date('Ym');
+
+ if((int)$this->min_period < (int)$_periode)
{
- if((int)$this->min_period <
(int)$oRsBilag[0]['periode'])
- {
- $periode = $this->min_period;
- }
- else
- {
- $periode = $oRsBilag[0]['periode'];
- }
+ $periode = $this->min_period;
}
- else if
(isset($this->config->config_data['export']['dato_aarsavslutning']) && time() <
$this->config->config_data['export']['dato_aarsavslutning'] )
- {
- if(date('Y',time()) == date('Y',
$this->config->config_data['export']['dato_aarsavslutning']))
- {
- $periode = date('Y',time()) - 1 . '12';
- }
- else
- {
- $periode = date('Ym',time());
- }
- }
else
{
- $time = time();
-
- if ( date('j',$time) < 7 ) //Day of the month
without leading zeros
- {
- $time = $time - (7 * 24 * 3600);
- }
-
- $periode = date('Ym',$time);
+ $periode = $_periode;
}
$sum_amount = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12013] property: fix bug in accounting period transition,
Sigurd Nes <=