[Noalyss-commit] [noalyss] 125/173: Merge branch 'dev-7200' into entreprise

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 80e18cf29ea318bc2a5135d61822787c77e2305d
Merge: f51e4b6 9e8d2e9
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Sat Nov 2 23:01:02 2019 +0100

    Merge branch 'dev-7200' into entreprise

 include/class/acc_balance.class.php                |  16 +-
 include/class/acc_ledger.class.php                 |  24 +-
 include/class/acc_ledger_fin.class.php             | 115 +---
 include/class/acc_ledger_history.class.php         |  11 +-
 .../class/acc_ledger_history_financial.class.php   |   2 +-
 include/class/acc_ledger_history_generic.class.php |   3 -
 .../class/acc_ledger_history_purchase.class.php    |   1 +
 include/class/acc_ledger_history_sale.class.php    |   1 +
 include/class/acc_ledger_info.class.php            |  16 -
 include/class/acc_ledger_sold.class.php            |  46 +-
 include/class/pre_op_ven.class.php                 |   2 +-
 include/export/export_printtva_pdf.php             |  14 +-
 include/lib/pdf_core.class.php                     |   2 +-
 unit-test/bootstrap.php.example                    |   2 +-
 unit-test/create-dossier-test.sh                   |   5 +-
 unit-test/document/fr_be/bnb.form                  |   3 +
 unit-test/document/fr_be/bnb.rtf                   |   0
 unit-test/facility.class.php                       |  69 ++
 unit-test/global.php                               |   8 +-
 .../include/class/acc_account_ledgerTest.class.php |   7 +-
 unit-test/include/class/acc_balanceTest.class.php  |  20 +-
 unit-test/include/class/acc_bilanTest.class.php    |  92 +--
 unit-test/include/class/acc_computeTest.class.php  | 148 ++++-
 unit-test/include/class/acc_ledgerTest.class.php   | 734 ++++++++++-----------
 .../include/class/acc_ledger_finTest.class.php     | 173 +++--
 .../acc_ledger_history_financialTest.class.php     |  96 +++
 .../class/acc_ledger_history_genericTest.class.php | 117 ++++
 .../acc_ledger_history_purchaseTest.class.php      | 116 ++++
 .../class/acc_ledger_history_saleTest.class.php    | 113 ++++
 .../include/class/acc_ledger_infoTest.class.php    |  85 +++
 .../class/acc_ledger_purchaseTest.class.php        | 162 +++--
 .../include/class/acc_ledger_soldTest.class.php    | 125 +++-
 .../include/class/acc_operationTest.class.php      |   5 +-
 .../include/class/acc_parm_codeTest.class.php      |   9 +-
 .../include/class/anc_grandlivreTest.class.php     |   9 +-
 .../class/noalyss_parameter_folderTest.class.php   |   1 +
 unit-test/include/class/tax_summaryTest.class.php  | 655 +++++++++++++++---
 unit-test/jrn.csv                                  |  18 +
 unit-test/test-file.sh                             |  41 +-
 39 files changed, 2124 insertions(+), 942 deletions(-)

diff --cc include/class/acc_ledger_sold.class.php
index 44b724e,138c070..78780ca
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@@ -1608,22 -1394,9 +1571,15 @@@ EOF
          $array['price_per_unit'] = _('PU');
          $array['htva'] = _('HTVA Opération');
          $array['tot_vat'] = _('TVA Opération');
 +        $array['tot_vat_np'] = _('TVA ND');
 +        $array['oc_amount'] = _('Mont. Devise');
 +        $array['oc_vat_amount'] = _('Mont. TVA Devise');
 +        $array['cr_code_iso'] = _('Devise');
 +        
          return $array;
      }
 -
 +    
-     /*!\brief test function
-      */
 +    
-     static function test_me($p_string = '') {
-         $cn = Dossier::connect();
-         $a = new Acc_Ledger_Sold($cn, 2);
-         echo $a->input();
-     }
      
  }