[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 02/03: Bug Import Operation : period ne peut
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 02/03: Bug Import Operation : period ne peut être donnée |
Date: |
Mon, 6 Mar 2017 15:36:13 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit a611f1282349dee427065f56db527f529b976c23
Author: Dany De Bontridder <address@hidden>
Date: Mon Mar 6 21:06:00 2017 +0100
Bug Import Operation : period ne peut être donnée
---
include/class/class_acc_ledger.php | 10 ++++++----
include/class/class_acc_ledger_fin.php | 5 +++--
include/class/class_acc_ledger_purchase.php | 4 ++--
include/class/class_acc_ledger_sold.php | 4 ++--
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/include/class/class_acc_ledger.php
b/include/class/class_acc_ledger.php
index 935120d..0788238 100644
--- a/include/class/class_acc_ledger.php
+++ b/include/class/class_acc_ledger.php
@@ -1868,14 +1868,16 @@ class Acc_Ledger extends jrn_def_sql
throw new Exception('Date invalide', 2);
}
$periode = new Periode($this->db);
- /* find the periode if we have enabled the check_periode */
- if ($this->check_periode() == false)
+ /* find the periode if we have enabled the check_periode
+ * or if period is not set
+ */
+ if ($this->check_periode() == false || ! isset
($p_array['period']) )
{
$periode->find_periode($e_date);
}
else
{
- $periode->p_id = $period;
+ $periode->p_id = $p_array['period'];
list ($min, $max) = $periode->get_date_limit();
if (cmpDate($e_date, $min) < 0 ||
cmpDate($e_date, $max) > 0)
@@ -2023,7 +2025,7 @@ class Acc_Ledger extends jrn_def_sql
$tot_cred = 0;
$oPeriode = new Periode($this->db);
$check_periode = $this->check_periode();
- if ($check_periode == false)
+ if ($check_periode == false || ! isset
($p_array['period']))
{
$oPeriode->find_periode($e_date);
}
diff --git a/include/class/class_acc_ledger_fin.php
b/include/class/class_acc_ledger_fin.php
index 7a8cd6f..05ad19b 100644
--- a/include/class/class_acc_ledger_fin.php
+++ b/include/class/class_acc_ledger_fin.php
@@ -756,7 +756,7 @@ class Acc_Ledger_Fin extends Acc_Ledger
if ($chdate == 2 && $get_solde )
{
$get_solde=false;
- if ($this->check_periode() == true)
+ if ($this->check_periode() == true &&
isset($p_array['periode']))
{
$pPeriode->p_id = $periode;
}
@@ -765,7 +765,8 @@ class Acc_Ledger_Fin extends Acc_Ledger
$pPeriode->find_periode($e_date);
}
$exercice = $pPeriode->get_exercice();
- $filter_year = " j_tech_per in (select
p_id from parm_periode where p_exercice='" . $exercice . "')";
+ $filter_year = " j_tech_per in (select
p_id from parm_periode where p_exercice='" .
+ sql_string($exercice ). "')";
$solde =
$acc_account->get_solde($filter_year);
$new_solde = $solde;
}
diff --git a/include/class/class_acc_ledger_purchase.php
b/include/class/class_acc_ledger_purchase.php
index e4ca02b..150c914 100644
--- a/include/class/class_acc_ledger_purchase.php
+++ b/include/class/class_acc_ledger_purchase.php
@@ -89,7 +89,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
throw new Exception(_('Date invalide'), 2);
}
$oPeriode=new Periode($this->db);
- if ( $this->check_periode() == false)
+ if ( $this->check_periode() == false || ! isset($p_array['period']))
{
$tperiode=$oPeriode->find_periode($e_date);
}
@@ -511,7 +511,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$oPeriode=new Periode($this->db);
$check_periode=$this->check_periode();
- if ( $check_periode == true )
+ if ( $check_periode == true && isset($p_array['period']) )
$tperiode=$period;
else
$tperiode=$oPeriode->find_periode($e_date);
diff --git a/include/class/class_acc_ledger_sold.php
b/include/class/class_acc_ledger_sold.php
index 6fceee8..b2b0faa 100644
--- a/include/class/class_acc_ledger_sold.php
+++ b/include/class/class_acc_ledger_sold.php
@@ -93,7 +93,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
}
$oPeriode = new Periode($this->db);
- if ($this->check_periode() == true) {
+ if ($this->check_periode() == true && isset($p_array['period'])) {
$tperiode = $period;
/* check that the datum is in the choosen periode */
$oPeriode->p_id = $period;
@@ -244,7 +244,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$oPeriode = new Periode($this->db);
$check_periode = $this->check_periode();
- if ($check_periode == true)
+ if ($check_periode == true && isset($p_array['period']))
$tperiode = $period;
else
$tperiode = $oPeriode->find_periode($e_date);