[Noalyss-commit] [noalyss] 10/20: Merge master

[dwm]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 1b69d6dcc8ff2336c659816a2695c89d3d102bed
Merge: 7e6a9954b 4f1d7e155
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Tue Dec 5 13:57:01 2023 +0100

    Merge master

 html/ajax_misc.php                                 |  15 ++
 html/css/style-classic7.css                        |  20 +-
 html/direct.php                                    |   7 +-
 html/install.php                                   |  14 +-
 html/js/acc_ledger.js                              |   3 +
 html/js/noalyss_script.js                          |  54 ++++-
 include/ajax/ajax_follow_up.php                    |   4 +-
 include/ajax/ajax_preference.php                   |  29 ++-
 include/class/acc_bilan.class.php                  |   3 +
 include/class/acc_ledger_sale.class.php            |   9 +-
 include/class/acc_ledger_search.class.php          |   3 +-
 include/class/dossier.class.php                    |  56 ++---
 include/class/extension.class.php                  |   1 +
 include/class/noalyss_user.class.php               |   3 +-
 include/class/pdf.class.php                        |   2 +-
 include/class/pdf_land.class.php                   |   2 +-
 include/class/periode.class.php                    |  10 +-
 include/class/print_ledger_detail.class.php        |   2 +-
 include/class/print_ledger_detail_item.class.php   |   2 +-
 include/class/print_ledger_fin.class.php           |   2 +-
 include/class/print_ledger_misc.class.php          |   2 +-
 include/class/print_ledger_simple.class.php        |   2 +-
 .../print_ledger_simple_without_vat.class.php      |   2 +-
 include/constant.php                               |   6 +-
 include/export/export_fiche_balance_pdf.php        |  75 +++----
 include/export/export_fiche_pdf.php                | 233 ---------------------
 include/header_print.php                           |   3 +
 include/lib/ac_common.php                          | 120 ++++++++++-
 include/lib/database_core.class.php                |  31 ++-
 include/lib/html_input.class.php                   |  27 +--
 include/lib/inplace_edit.class.php                 |   8 +-
 include/lib/manage_table_sql.class.php             |  24 ++-
 include/lib/pdf_core.class.php                     |   4 +-
 include/recover.php                                |  21 +-
 include/sql/patch/upgrade189.sql                   |   6 +
 include/template/ledger_search.php                 |   2 +-
 include/template/module.php                        |   4 +-
 include/template/profile_menu_display_module.php   |   2 +-
 include/template/stock_histo.php                   |   4 +-
 include/template/stock_summary_table.php           |   2 +-
 include/tfpdf/tfpdf.php                            |   4 +-
 include/user.inc.php                               |  36 +++-
 include/user_detail.inc.php                        |   2 +
 .../class/{dossier.Test.php => dossierTest.php}    |  33 +++
 unit-test/include/lib/ac_commonTest.php            |  42 ++++
 .../{table_sql.Test.php => noalyss_sqlTest.php}    |   0
 46 files changed, 524 insertions(+), 412 deletions(-)

diff --cc include/class/acc_bilan.class.php
index 34160aa41,3f398e09c..e0b51d7df
--- a/include/class/acc_bilan.class.php
+++ b/include/class/acc_bilan.class.php
@@@ -452,7 -398,10 +452,10 @@@ class Acc_Bila
          $regex="/&lt;&lt;\\$[A-Z]*[0-9]*&gt;&gt;/";
          $lt="&lt;";
          $gt="&gt;";
 -      // convert to UTF8
 +          
$header_txt=mb_convert_encoding(header_txt($this->db),'UTF-8','ISO8859-1');
+       $header_txt=iconv('ISO-8859-1','UTF-8//IGNORE',header_txt($this->db));
+       
+       
  
          while ( !feof($p_file) )
          {
diff --cc include/header_print.php
index 16852c126,8f4aaacf5..90fb24b81
--- a/include/header_print.php
+++ b/include/header_print.php
@@@ -34,7 -34,10 +34,10 @@@ function header_txt($p_cn
      $soc=$own->MY_NAME;
  
      $date=date('d / m / Y H:i ');
 -    $str=sprintf(" Dossier : %s",dossier::name());
 +    $dossier=mb_convert_encoding(" Dossier : 
".dossier::name(),'ISO-8859-1','UTF-8');
+     // convert to latin1
+     $dossier=iconv('UTF-8','ISO-8859-1//IGNORE',$str);
+     
      return $dossier." ".$soc." ".$date;
  }
  
diff --cc include/lib/ac_common.php
index 93d4ea129,82ea4dbac..d65c1ed4f
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@@ -1381,7 -1381,10 +1381,10 @@@ if(!function_exists('tracedebug')) 
  function convert_to_rtf($p_string)
  {
      $result="";
 -    // convert to latin 
 +    $p_string2=mb_convert_encoding($p_string,'ISO-8859-1','UTF-8');
+     $p_string2=iconv('UTF-8','ISO-8859-1//IGNORE',$p_string);
+  
+     
      $nb_result=strlen($p_string2);
      for ($i = 0 ; $i < $nb_result ; $i++ ){
          if (ord($p_string[$i]) < 127 ) {