[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 04/16: FIX bug due changes Data_SQL
From: |
dwm |
Subject: |
[Noalyss-commit] [noalyss] 04/16: FIX bug due changes Data_SQL |
Date: |
Tue, 27 May 2025 09:26:07 -0400 (EDT) |
sparkyx pushed a commit to branch unstable
in repository noalyss.
commit 8ab18c6825d9f41e7aa6633a5eca8d07304f08af
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun May 18 15:31:02 2025 +0200
FIX bug due changes Data_SQL
---
include/class/acc_ledger.class.php | 2 +-
include/class/acc_ledger_fin.class.php | 2 +-
include/class/print_ledger_detail_item.class.php | 1 +
include/class/print_ledger_fin.class.php | 1 +
include/class/print_ledger_simple.class.php | 23 +++++++++++++++++++++++
include/lib/data_sql.class.php | 1 +
6 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/include/class/acc_ledger.class.php
b/include/class/acc_ledger.class.php
index d778550a9..182ce4173 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -43,7 +43,7 @@ class Acc_Ledger extends jrn_def_sql
var $currency_id;
/**!< is_loaded true the ledger definition is loaded or false, it is not */
protected $is_loaded ;
-
+ var $ledger_name;
/**
* @brief construct
diff --git a/include/class/acc_ledger_fin.class.php
b/include/class/acc_ledger_fin.class.php
index 3e5206221..f02b00543 100644
--- a/include/class/acc_ledger_fin.class.php
+++ b/include/class/acc_ledger_fin.class.php
@@ -34,7 +34,7 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
class Acc_Ledger_Fin extends Acc_Ledger
{
-
+ public $bank_id; //! bank_id (int) FICHE.F_ID for bank
function __construct($p_cn, $p_init)
{
parent::__construct($p_cn, $p_init);
diff --git a/include/class/print_ledger_detail_item.class.php
b/include/class/print_ledger_detail_item.class.php
index 243ef9217..6f42f1d1f 100644
--- a/include/class/print_ledger_detail_item.class.php
+++ b/include/class/print_ledger_detail_item.class.php
@@ -26,6 +26,7 @@
class Print_Ledger_Detail_Item extends Print_Ledger
{
+ private $show_col; //!< $show_col (bool) show columns
public function __construct (Database $p_cn,Acc_Ledger
$p_jrn,$p_from,$p_to,$p_filter_operation)
{
diff --git a/include/class/print_ledger_fin.class.php
b/include/class/print_ledger_fin.class.php
index 7352df6dc..663efc6a9 100644
--- a/include/class/print_ledger_fin.class.php
+++ b/include/class/print_ledger_fin.class.php
@@ -32,6 +32,7 @@ class Print_Ledger_Financial extends Print_Ledger
{
private $rap_amount; /* amount from begining exercice */
private $tp_amount; /* amount total page */
+ private $jrn_type; //!< $jrn_type (VEN,ACH,ODS,FIN) ledger type
function __construct(Database $p_cn, Acc_Ledger $p_jrn,$p_from,$p_to)
{
diff --git a/include/class/print_ledger_simple.class.php
b/include/class/print_ledger_simple.class.php
index 5ac660b18..8247d24c7 100644
--- a/include/class/print_ledger_simple.class.php
+++ b/include/class/print_ledger_simple.class.php
@@ -32,6 +32,29 @@
class Print_Ledger_Simple extends \Print_Ledger
{
+
+ private $a_Tva; //!< $a_Tva array ( tva_id,tva_label,tva_poste ) of
existing_vat
+ private $rap_tva; //!< $rap_tva array(tva_id,amount)
+ private $rap_other_tax; //!< $rap_other_tav, amount to report for other
tax than VAT
+ private $jrn_type;//! $jrn_type (string) 'VEN','ACH','ODS','FIN'
+ private $previous;//! $previous (array) see Acc_Ledger->previous_amount
+ private $other_tax_previous;//! $other_tax_previous (array)
+ //see Acc_Ledger->previous_other_tax
+ private $rap_htva; //!< $rap_htva (float) previous price w/o VAT
+ private $rap_tvac; //!< $rap_tvac (float) previous amount
+ //All Tax Include (full price)
+ private $rap_priv; //!< $rap_priv (float) personal expense
+ private $rap_nd; //!< $rap_nd (float) $no-deductible tax
+ private $rap_tva_np; //!< $rap_tva_np VAT not deductible
+ private $flag_other_tax; //!< $flag_other_tax(bool) true if other tax
exists
+ private $tp_htva; //!< $tp_htva (float) total page price w/o VAT
+ private $tp_tva; //!< $tp_tva (float) total page VAT
+ private $tp_tvac; //!< $tp_tvac (float) total page full price All Tax Incl.
+ private $tp_priv;//!< $tp_priv (float) total page personal expense
+ private $tp_nd;//!< $tp_nd (float) total page price w/o VAT
+ private $tp_tva_np;//!< $tp_tva_np (float) total page not deductible
+ private $tp_other_tax;//!< $tp_other_tax (float) other tax
+
public function __construct ($p_cn, Acc_Ledger
$p_jrn,$p_from,$p_to,$p_filter_operation)
{
diff --git a/include/lib/data_sql.class.php b/include/lib/data_sql.class.php
index 54fffbdc3..aa4299ae2 100644
--- a/include/lib/data_sql.class.php
+++ b/include/lib/data_sql.class.php
@@ -94,6 +94,7 @@
*
*/
+#[\AllowDynamicProperties]
abstract class Data_SQL
{
var $cn; //! Database connection
- [Noalyss-commit] [noalyss] branch unstable updated (a21554139 -> 34489f687), dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 03/16: Cosmetic width menu, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 10/16: Data_SQL and Table_Data_SQL add virtual column, to allow transformation of columns in SQL, faster than transforming in PHP afterward, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 04/16: FIX bug due changes Data_SQL,
dwm <=
- [Noalyss-commit] [noalyss] 02/16: FONT MONSERRAT ROBOTO Title and menu, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 05/16: FREC : checkbox, checked by range, hidden elements must not be checked, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 08/16: Improve Code: Database : add __toString, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 14/16: Add column timestamp for table TOOL_UOS, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 01/16: Code Improve : Data_SQL, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 06/16: FIX bug due changes Data_SQL, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 07/16: Detail Operation for small screen, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 09/16: Code Improve : Single_Record, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 12/16: Data_SQL if we use $this->sql , then must be set SQL, dwm, 2025/05/27
- [Noalyss-commit] [noalyss] 13/16: Data_SQL if column doesn't exist, dwm, 2025/05/27