[Noalyss-commit] [noalyss] 24/28: Merge branch 'dev-7200'

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit eda776ccc80c0d2b6d291a97399c867edf8fd6a8
Merge: b23f4d4 9f54258
Author: Dany De Bontridder <address@hidden>
Date:   Sun Nov 24 22:00:02 2019 +0100

    Merge branch 'dev-7200'

 html/index.css                                     |  10 +-
 html/index.php                                     |   7 +-
 html/js/acc_ledger.js                              |  20 +-
 include/ajax/ajax_search_filter.php                |   2 +-
 include/class/acc_account_ledger.class.php         |  10 +-
 include/class/acc_ledger.class.php                 | 105 ++--
 include/class/acc_ledger_fin.class.php             |   2 +-
 include/class/acc_ledger_history.class.php         |  81 ++-
 .../class/acc_ledger_history_financial.class.php   |   6 +-
 include/class/acc_ledger_history_generic.class.php |   1 +
 .../class/acc_ledger_history_purchase.class.php    |  20 +-
 include/class/acc_ledger_history_sale.class.php    |  17 +-
 include/class/acc_ledger_purchase.class.php        |  25 +-
 include/class/acc_ledger_search.class.php          |  40 +-
 include/class/acc_ledger_sold.class.php            |  27 +-
 include/class/document_export.class.php            |   6 +-
 include/class/pdf.class.php                        |  11 +-
 include/class/print_ledger.class.php               | 351 +++++++----
 include/class/print_ledger_detail.class.php        |  15 +-
 include/class/print_ledger_detail_item.class.php   |  30 +-
 include/class/print_ledger_fin.class.php           |  20 +-
 include/class/print_ledger_misc.class.php          |  17 +-
 include/class/print_ledger_simple.class.php        |  85 +--
 .../print_ledger_simple_without_vat.class.php      |  47 +-
 include/class/tax_summary.class.php                | 331 +++++++----
 include/class/tva_rate_mtable.class.php            |  19 +-
 include/constant.php                               |   2 +-
 include/database/tva_rate_sql.class.php            |   5 +
 include/database/user_filter_sql.class.php         |   4 +-
 include/database/v_tva_rate_sql.class.php          |   5 +
 include/export/export_ledger_csv.php               |  21 +-
 include/export/export_ledger_pdf.php               |   9 +-
 include/export/export_printtva_csv.php             |   3 +
 include/export/export_printtva_pdf.php             |  13 +-
 include/impress_jrn.inc.php                        |  18 +-
 include/lib/database_core.class.php                |   2 +-
 include/lib/message_javascript.php                 |   2 +
 include/lib/noalyss_sql.class.php                  |   9 +-
 include/sql/patch/upgrade138.sql                   |  36 ++
 include/sql/patch/upgrade139.sql                   | 119 ++++
 include/tax_summary.inc.php                        |  10 +
 include/template/ledger_search.php                 |   2 +-
 unit-test/create-dossier-test.sh                   |   4 +-
 unit-test/facility.class.php                       |   1 +
 .../include/class/acc_account_ledger.Test.php      | 399 +++++++++++++
 .../include/class/acc_account_ledgerTest.class.php | 280 ---------
 ..._balanceTest.class.php => acc_balance.Test.php} |   8 +-
 ...{acc_bilanTest.class.php => acc_bilan.Test.php} |   2 +-
 ..._computeTest.class.php => acc_compute.Test.php} |   0
 ...cc_ledgerTest.class.php => acc_ledger.Test.php} | 141 +++--
 ...r_finTest.class.php => acc_ledger_fin.Test.php} |   5 +-
 unit-test/include/class/acc_ledger_historyTest.php | 136 +++++
 ...s.php => acc_ledger_history_financial.Test.php} |  11 +-
 ...ass.php => acc_ledger_history_generic.Test.php} |   9 +-
 ...ss.php => acc_ledger_history_purchase.Test.php} |   9 +-
 ....class.php => acc_ledger_history_sale.Test.php} |  10 +-
 ...infoTest.class.php => acc_ledger_info.Test.php} |   0
 ...Test.class.php => acc_ledger_purchase.Test.php} | 105 +++-
 ...soldTest.class.php => acc_ledger_sold.Test.php} |  90 ++-
 ...rationTest.class.php => acc_operation.Test.php} |  12 -
 ...m_codeTest.class.php => acc_parm_code.Test.php} |   0
 ...y_sqlTest.class.php => anc_grandlivre.Test.php} |  19 +-
 .../include/class/anc_grandlivreTest.class.php     | 114 ----
 ...{anc_key_sqlTest.class.php => anc_key.Test.php} |  16 +-
 unit-test/include/class/anc_keyTest.class.php      | 141 -----
 ..._key_sqlTest.class.php => anc_key_sql.Test.php} |   0
 ...ey_sqlTest.class.php => anc_operation.Test.php} |  16 +-
 .../include/class/anc_operationTest.class.php      | 225 -------
 .../class/data/tax_summary_getrow_purchase_o.php   | 199 +++++++
 .../class/data/tax_summary_getrow_purchase_p.php   |  48 ++
 .../class/data/tax_summary_getrow_purchase_t.php   | 198 +++++++
 .../class/data/tax_summary_getrow_sale_o.php       |  63 ++
 .../class/data/tax_summary_getrow_sale_p.php       |  28 +
 .../class/data/tax_summary_getrow_sale_t.php       |  64 ++
 .../data/tax_summary_getsummary_purchase_o.php     | 130 ++++
 .../data/tax_summary_getsummary_purchase_p.php     |  31 +
 .../data/tax_summary_getsummary_purchase_t.php     | 129 ++++
 .../class/data/tax_summary_getsummary_sale_o.php   |  48 ++
 .../class/data/tax_summary_getsummary_sale_p.php   |  26 +
 .../class/data/tax_summary_getsummary_sale_t.php   |  48 ++
 ...{anc_key_sqlTest.class.php => dossier.Test.php} |  18 +-
 unit-test/include/class/dossierTest.class.php      | 234 --------
 unit-test/include/class/fiche.Test.php             |  67 +++
 unit-test/include/class/ficheTest.class.php        | 547 -----------------
 ...class.php => noalyss_parameter_folder.Test.php} |   0
 unit-test/include/class/print_LedgerTest.php       | 147 +++++
 .../class/print_ledger_detail.classTest.php        |  81 +++
 .../class/print_ledger_detail_item.classTest.php   | 162 +++++
 .../include/class/print_ledger_fin.classTest.php   | 111 ++++
 .../include/class/print_ledger_misc.classTest.php  |  89 +++
 .../class/print_ledger_simple.classTest.php        | 166 ++++++
 .../print_ledger_simple_without_vat.classTest.php  | 161 +++++
 unit-test/include/class/tax_summary.Test.php       | 267 +++++++++
 unit-test/include/class/tax_summaryTest.class.php  | 655 ---------------------
 unit-test/include/class/user.Test.php              | 116 ++++
 unit-test/include/class/userTest.class.php         | 645 --------------------
 unit-test/test-file.sh                             |  12 +-
 97 files changed, 4335 insertions(+), 3473 deletions(-)

diff --cc include/class/acc_ledger.class.php
index 6c75319,2221c1e..606a7de
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@@ -79,9 -78,9 +78,9 @@@ class Acc_Ledger  extends jrn_def_sq
          $this->db=$p_cn;
          $this->row=null;
          $this->nb=MAX_ARTICLE;
-          parent::__construct($p_cn, $p_id);
+         if ($p_id <> 0 ) parent::__construct($p_cn, $p_id);
      }
 -
 +    
      function get_last_pj()
      {
          if (isNumber($this->id)==0)