From ce74d3a2a884157a09db7034c7c19159b72bdfc5 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 18 Sep 2019 20:36:39 +0200 Subject: [PATCH 1/6] =?UTF-8?q?task=20#0001698:=20Probl=C3=A8me=20affichag?= =?UTF-8?q?e=20historique=20fiches=20Prevent=20direct=20use=20of=20http=5F?= =?UTF-8?q?request=20translation=20Cosmetic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/index.css | 2 +- html/install.php | 4 ++-- html/style-classic7.css | 2 +- include/fiche.inc.php | 31 +++++++++++++++++-------------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/html/index.css b/html/index.css index 63fcc4eaf..c33471356 100644 --- a/html/index.css +++ b/html/index.css @@ -261,7 +261,7 @@ BODY { width: 148px; left: 5px; top: 22px; - height: 115px; + height: 155px; } #login_frm { position:absolute; diff --git a/html/install.php b/html/install.php index 5f923e65d..e4c44026c 100644 --- a/html/install.php +++ b/html/install.php @@ -1,4 +1,4 @@ - @@ -132,7 +132,7 @@ if ( ! isset($_GET['lang'])){ require_once '../include/constant.php'; include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; include_once NOALYSS_INCLUDE.'/lib/html_input.class.php'; -include_once '../lib/function_javascript.php'; +include_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; load_all_script(); diff --git a/html/style-classic7.css b/html/style-classic7.css index ddbaf862c..51105a1e9 100644 --- a/html/style-classic7.css +++ b/html/style-classic7.css @@ -837,7 +837,7 @@ div.topmenu { .topmenu table { border-collapse:collapse; border-spacing:1px; - + width:100%; } @media only screen and (max-width:320px) { diff --git a/include/fiche.inc.php b/include/fiche.inc.php index bb8147022..a6838287b 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -402,19 +402,21 @@ if ($histo->selected == 4 || $histo->selected == 5) echo _('Filtre rapide:').HtmlInput::filter_table($id, '0,1,2', '1'); echo ''; echo tr( - th('Quick Code') . - th('Libellé') . - ''. - th('Débit', 'style="text-align:right"') . - th('Crédit', 'style="text-align:right"') . - th('Solde', 'style="text-align:right"') . - th('D/C', 'style="text-align:right"') + th(_('Quick Code')) . + th(_('Libellé')) . + ''. + th(_('Débit'), 'style="text-align:right"') . + th(_('Crédit'), 'style="text-align:right"') . + th(_('Solde'), 'style="text-align:right"') . + th(_('D/C'), 'style="text-align:right"') ); $idx = 0;$sum_deb=0;$sum_cred=0;$sum_solde=0;bcscale(4); for ($i = 0; $i < Database::num_row($ret); $i++) { - $filter = " (j_date >= to_date('" . $_REQUEST['start'] . "','DD.MM.YYYY') " . - " and j_date <= to_date('" . $_REQUEST['end'] . "','DD.MM.YYYY')) "; + $start=$http->request("start",'date'); + $end=$http->request("end",'date'); + $filter = " (j_date >= to_date('" . $start. "','DD.MM.YYYY') " . + " and j_date <= to_date('" . $end . "','DD.MM.YYYY')) "; $aCard = Database::fetch_array($ret, $i); $oCard = new Fiche($cn, $aCard['f_id']); $solde = $oCard->get_solde_detail($filter); @@ -482,6 +484,7 @@ echo $export_csv; echo $export_pdf; echo $export_print; $fiche = new Fiche($cn); +$histo=$http->get("histo","number"); for ($e = 0; $e < count($afiche); $e++) { $array = Fiche::get_fiche_def($cn, $afiche[$e]['fd_id'], 'name_asc'); @@ -494,22 +497,22 @@ for ($e = 0; $e < count($afiche); $e++) $letter->set_parameter('start', $periode_start->value ); $letter->set_parameter('end', $periode_end->value ); // all - if ($_GET['histo'] == 0) + if ($histo== 0) { $letter->get_all(); } // lettered - if ($_GET['histo'] == 1) + if ($histo == 1) { $letter->get_letter(); } // unlettered - if ($_GET['histo'] == 2) + if ($histo == 2) { $letter->get_unletter(); } - if ($_GET['histo'] == 6) + if ($histo== 6) { $letter->get_letter_diff(); } @@ -567,7 +570,7 @@ for ($e = 0; $e < count($afiche); $e++) $prog = bcsub($prog, $row['j_montant']); } $side = " " . $fiche->get_amount_side($prog); - echo td(nbm($prog) . $side, 'style="text-align:right"'); + echo td(nbm(abs($prog)) . $side, 'style="text-align:right"'); $html_let=""; if ($row['letter']!=-1) { $span_error = ""; From 33dcb5bcfb6efe5fbfc63acc00d1749005acb30c Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 18 Sep 2019 20:43:24 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Task=20#0001698:=20Probl=C3=A8me=20affichag?= =?UTF-8?q?e=20historique=20fiches?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/class/fiche.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index 51ac1a69d..4d0728363 100644 --- a/include/class/fiche.class.php +++ b/include/class/fiche.class.php @@ -2157,7 +2157,7 @@ class Fiche function get_amount_side($p_amount) { if ($p_amount == 0) - return "="; + return ""; if ($p_amount < 0) return "C"; if ($p_amount > 0) From c00f9979bc55052cb0ea39786c77aba2be78dca3 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 18 Sep 2019 23:11:21 +0200 Subject: [PATCH 3/6] Task #0001703: Faciliter effacement montants dans les filtres --- include/template/ledger_search.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/template/ledger_search.php b/include/template/ledger_search.php index 2677d704d..efb271f26 100644 --- a/include/template/ledger_search.php +++ b/include/template/ledger_search.php @@ -51,7 +51,11 @@ @@ -68,7 +72,9 @@ From ad641ae43b1ea06d7e458bcd28e19c1033df866f Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 18 Sep 2019 23:12:33 +0200 Subject: [PATCH 4/6] Improve PHPUNIT Test for phpunit7 and phpunit8 --- unit-test/README | 26 +- unit-test/bootstrap.php.example | 450 +++++++----------- unit-test/global.php | 33 ++ .../include/class/acc_account.classTest.php | 10 +- unit-test/test-file.sh | 9 + 5 files changed, 226 insertions(+), 302 deletions(-) create mode 100644 unit-test/global.php create mode 100755 unit-test/test-file.sh diff --git a/unit-test/README b/unit-test/README index 0aa553d9c..dd6bdf52b 100644 --- a/unit-test/README +++ b/unit-test/README @@ -4,16 +4,26 @@ Il faut configurer Netbeans pour pouvoir l'utiliser : 2 . dans GLOBAL PATH (propriété du projet) ajouter le fichier phpunit.phar 3. Donner unit-test comme répertoire de test +Global.php +========== + +Donner le dossier +$_REQUEST['dossier'] + +Utilisateur pour Noalyss +$_SESSION['g_user']='phpcompta'; + +Mot de passe pour g_user +$_SESSION['g_pass']='dany'; + +Bootstrap +========= Ensuite copier bootstrap.php.example vers bootstrap.php et modifier les variables (le dossier à utiliser, include_path ...) + Testing commande en ligne ========================= -Génération - php /phpunit-skelgen.phar --bootstrap bootstrap.php --test -- Intervat ../include/class_transform_intervat.php -ou - php /phpunit-skelgen.phar generate-test --bootstrap bootstrap.php -- Acc_Account_Ledger ../include/class/class_acc_account_ledger.php - test (depuis repertoire include) php /phpunit.phar --tap --colors --bootstrap ../bootstrap.php class_acc_accountTest.php @@ -28,10 +38,12 @@ php /phpunit.phar --coverage-html html --bootstrap bootstrap.php include exemple depuis NETBEANS "/usr/bin/php" "/home/dany/Program/phpunit-skelgen.phar" "--ansi" "generate-test" "--bootstrap=/home/dany/developpement/phpcompta/noalyss/unit-test/bootstrap.php" "View_SQL" "/home/dany/developpement/phpcompta/noalyss/include/lib/view_sql.class.php" "View_SQLTest" "/home/dany/developpement/phpcompta/noalyss/unit-test/include/lib/view_sql.classTest.php" +Note développeur +================ Pour avoir tous les fichiers à inclure -========================================= +-------------------------------------- Depuis ici, faites cd ../include -find class lib -type f | awk '{print "require_once NOALYSS_INCLUDE.--""--;";}'|sed -e 's/--/"/g' >> ../unit-test/bootstrap.php +find class lib -type f | awk '{print "require_once NOALYSS_INCLUDE.--/"$1"--;";}'|sed -e 's/--/"/g' >> ../unit-test/bootstrap.php diff --git a/unit-test/bootstrap.php.example b/unit-test/bootstrap.php.example index fc3f769a8..b598df349 100644 --- a/unit-test/bootstrap.php.example +++ b/unit-test/bootstrap.php.example @@ -22,295 +22,173 @@ require_once '../include/constant.php'; -define ("DOSSIER",37); +define ("ALLOWED",1); + +define ("DOSSIER",26); + /** * Class to include, */ -require_once NOALYSS_INCLUDE.'/class/class_acc_account.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_balance.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_bilan.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_compute.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_info.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_payment.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_report_row.php'; -require_once NOALYSS_INCLUDE.'/class/class_acc_tva.php'; -require_once NOALYSS_INCLUDE.'/class/class_admin.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_acc_link.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_acc_list.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_account.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_balance_double.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_balance_simple.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_grandlivre.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_group_operation.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_group.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_key.php'; -require_once NOALYSS_INCLUDE.'/database/class_anc_key_sql.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_listing.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class/class_anc_table.php'; -require_once NOALYSS_INCLUDE.'/class/class_anticipation.php'; -require_once NOALYSS_INCLUDE.'/class/class_bank.php'; -require_once NOALYSS_INCLUDE.'/class/class_calendar.php'; -require_once NOALYSS_INCLUDE.'/class/class_contact.php'; -require_once NOALYSS_INCLUDE.'/class/class_customer.php'; -require_once NOALYSS_INCLUDE.'/lib/class_database.php'; -require_once NOALYSS_INCLUDE.'/class/class_default_menu.php'; -require_once NOALYSS_INCLUDE.'/database/class_default_menu_sql.php'; -require_once NOALYSS_INCLUDE.'/class/class_document_export.php'; -require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; -require_once NOALYSS_INCLUDE.'/class/class_document.php'; -require_once NOALYSS_INCLUDE.'/class/class_document_type.php'; -require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; -require_once NOALYSS_INCLUDE.'/class/class_extension.php'; -require_once NOALYSS_INCLUDE.'/class/class_fiche_attr.php'; -require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class/class_fiche_def_ref.php'; -require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/lib/class_filetosend.php'; -require_once NOALYSS_INCLUDE.'/class/class_follow_up_detail.php'; -require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; -require_once NOALYSS_INCLUDE.'/class/class_forecast_cat.php'; -require_once NOALYSS_INCLUDE.'/class/class_forecast_item.php'; -require_once NOALYSS_INCLUDE.'/class/class_forecast.php'; -require_once NOALYSS_INCLUDE.'/class/class_gestion_purchase.php'; -require_once NOALYSS_INCLUDE.'/class/class_gestion_sold.php'; -require_once NOALYSS_INCLUDE.'/class/class_gestion_table.php'; -require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/lib/class_html_table.php'; -require_once NOALYSS_INCLUDE.'/lib/class_iaction.php'; -require_once NOALYSS_INCLUDE.'/lib/class_ianccard.php'; -require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; -require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/lib/class_iconcerned.php'; -require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; -require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; -require_once NOALYSS_INCLUDE.'/lib/class_inum.php'; -require_once NOALYSS_INCLUDE.'/lib/class_iperiod.php'; -require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; -require_once NOALYSS_INCLUDE.'/lib/class_iposte.php'; -require_once NOALYSS_INCLUDE.'/lib/class_iradio.php'; -require_once NOALYSS_INCLUDE.'/lib/class_irelated_action.php'; -require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/lib/class_itextarea.php'; -require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; -require_once NOALYSS_INCLUDE.'/lib/class_itva_popup.php'; -require_once NOALYSS_INCLUDE.'/database/class_jrn_def_sql.php'; -require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; -require_once NOALYSS_INCLUDE.'/class/class_manager.php'; -require_once NOALYSS_INCLUDE.'/class/class_menu_ref.php'; -require_once NOALYSS_INCLUDE.'/database/class_menu_ref_sql.php'; -require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; -require_once NOALYSS_INCLUDE.'/class/class_own.php'; -require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; -require_once NOALYSS_INCLUDE.'/class/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class/class_pre_op_ach.php'; -require_once NOALYSS_INCLUDE.'/class/class_pre_op_advanced.php'; -require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; -require_once NOALYSS_INCLUDE.'/class/class_pre_op_fin.php'; -require_once NOALYSS_INCLUDE.'/class/class_pre_op_ods.php'; -require_once NOALYSS_INCLUDE.'/class/class_pre_op_ven.php'; -require_once NOALYSS_INCLUDE.'/class/class_print_ledger_detail_item.php'; -require_once NOALYSS_INCLUDE.'/class/class_print_ledger_detail.php'; -require_once NOALYSS_INCLUDE.'/class/class_print_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class/class_print_ledger_misc.php'; -require_once NOALYSS_INCLUDE.'/class/class_print_ledger.php'; -require_once NOALYSS_INCLUDE.'/class/class_print_ledger_simple.php'; -require_once NOALYSS_INCLUDE.'/class/class_print_ledger_simple_without_vat.php'; -require_once NOALYSS_INCLUDE.'/class/class_profile_menu.php'; -require_once NOALYSS_INCLUDE.'/database/class_profile_menu_sql.php'; -require_once NOALYSS_INCLUDE.'/database/class_profile_sql.php'; -require_once NOALYSS_INCLUDE.'/lib/class_sendmail.php'; -require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; -require_once NOALYSS_INCLUDE.'/class/class_stock_goods.php'; -require_once NOALYSS_INCLUDE.'/database/class_stock_goods_sql.php'; -require_once NOALYSS_INCLUDE.'/class/class_stock.php'; -require_once NOALYSS_INCLUDE.'/database/class_stock_sql.php'; -require_once NOALYSS_INCLUDE.'/class/class_supplier.php'; -require_once NOALYSS_INCLUDE.'/class/class_tag.php'; -require_once NOALYSS_INCLUDE.'/database/class_tag_sql.php'; -require_once NOALYSS_INCLUDE.'/class/class_todo_list.php'; -require_once NOALYSS_INCLUDE.'/lib/class_single_record.php'; -require_once NOALYSS_INCLUDE.'/class/class_user.php'; -require_once NOALYSS_INCLUDE.'/lib/class_zip_extended.php'; +require_once NOALYSS_INCLUDE."/class/package_repository.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_compute.class.php"; +require_once NOALYSS_INCLUDE."/class/sendmail.class.php"; +require_once NOALYSS_INCLUDE."/class/fiche_attr.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_report.class.php"; +require_once NOALYSS_INCLUDE."/class/database.class.php"; +require_once NOALYSS_INCLUDE."/class/gestion_table.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_report_row.class.php"; +require_once NOALYSS_INCLUDE."/class/package_core.class.php"; +require_once NOALYSS_INCLUDE."/class/print_ledger.class.php"; +require_once NOALYSS_INCLUDE."/class/pre_op_ods.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_table.class.php"; +require_once NOALYSS_INCLUDE."/class/prepared_query.class.php"; +require_once NOALYSS_INCLUDE."/class/pdfbalance_simple.class.php"; +require_once NOALYSS_INCLUDE."/class/tag.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_purchase.class.php"; +require_once NOALYSS_INCLUDE."/class/lettering.class.php"; +require_once NOALYSS_INCLUDE."/class/profile_menu.class.php"; +require_once NOALYSS_INCLUDE."/class/forecast_cat.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_operation.class.php"; +require_once NOALYSS_INCLUDE."/class/print_ledger_fin.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_bilan.class.php"; +require_once NOALYSS_INCLUDE."/class/pre_op_ach.class.php"; +require_once NOALYSS_INCLUDE."/class/exercice.class.php"; +require_once NOALYSS_INCLUDE."/class/document_export.class.php"; +require_once NOALYSS_INCLUDE."/class/admin.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_payment.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_reconciliation.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_history_generic.class.php"; +require_once NOALYSS_INCLUDE."/class/template_card_category.class.php"; +require_once NOALYSS_INCLUDE."/class/print_ledger_simple.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_account_table.class.php"; +require_once NOALYSS_INCLUDE."/class/todo_list.class.php"; +require_once NOALYSS_INCLUDE."/class/supplier.class.php"; +require_once NOALYSS_INCLUDE."/class/document.class.php"; +require_once NOALYSS_INCLUDE."/class/periode.class.php"; +require_once NOALYSS_INCLUDE."/class/fiche_def_ref.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_acc_link.class.php"; +require_once NOALYSS_INCLUDE."/class/noalyss_parameter_folder.class.php"; +require_once NOALYSS_INCLUDE."/class/extension.class.php"; +require_once NOALYSS_INCLUDE."/class/pre_op_fin.class.php"; +require_once NOALYSS_INCLUDE."/class/forecast_item.class.php"; +require_once NOALYSS_INCLUDE."/class/manager.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_group_operation.class.php"; +require_once NOALYSS_INCLUDE."/class/user.class.php"; +require_once NOALYSS_INCLUDE."/class/menu_ref.class.php"; +require_once NOALYSS_INCLUDE."/class/print_ledger_detail_item.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_plan.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_key.class.php"; +require_once NOALYSS_INCLUDE."/class/gestion_purchase.class.php"; +require_once NOALYSS_INCLUDE."/class/stock_goods.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_balance_double.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_account.class.php"; +require_once NOALYSS_INCLUDE."/class/payment_method_mtable.class.php"; +require_once NOALYSS_INCLUDE."/class/default_menu.class.php"; +require_once NOALYSS_INCLUDE."/class/follow_up.class.php"; +require_once NOALYSS_INCLUDE."/class/pre_operation.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_balance.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_balance_simple.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_acc_list.class.php"; +require_once NOALYSS_INCLUDE."/class/dossier.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_print.class.php"; +require_once NOALYSS_INCLUDE."/class/print_ledger_simple_without_vat.class.php"; +require_once NOALYSS_INCLUDE."/class/gestion_sold.class.php"; +require_once NOALYSS_INCLUDE."/class/balance_age.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_group.class.php"; +require_once NOALYSS_INCLUDE."/class/print_ledger_misc.class.php"; +require_once NOALYSS_INCLUDE."/class/periode_ledger_table.class.php"; +require_once NOALYSS_INCLUDE."/class/package_noalyss.class.php"; +require_once NOALYSS_INCLUDE."/class/calendar.class.php"; +require_once NOALYSS_INCLUDE."/class/forecast.class.php"; +require_once NOALYSS_INCLUDE."/class/pdf.class.php"; +require_once NOALYSS_INCLUDE."/class/package_template.class.php"; +require_once NOALYSS_INCLUDE."/class/package_plugin.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger.class.php"; +require_once NOALYSS_INCLUDE."/class/tva_rate_mtable.class.php"; +require_once NOALYSS_INCLUDE."/class/tax_summary.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_fin.class.php"; +require_once NOALYSS_INCLUDE."/class/print_ledger_detail.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_history_financial.class.php"; +require_once NOALYSS_INCLUDE."/class/stock.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_listing.class.php"; +require_once NOALYSS_INCLUDE."/class/anc_grandlivre.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_history.class.php"; +require_once NOALYSS_INCLUDE."/class/customer.class.php"; +require_once NOALYSS_INCLUDE."/class/fiche.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_info.class.php"; +require_once NOALYSS_INCLUDE."/class/package_contrib.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_parm_code.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_plan_mtable.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_history_sale.class.php"; +require_once NOALYSS_INCLUDE."/class/pdf_operation.class.php"; +require_once NOALYSS_INCLUDE."/class/periode_ledger.class.php"; +require_once NOALYSS_INCLUDE."/class/contact.class.php"; +require_once NOALYSS_INCLUDE."/class/pre_op_advanced.class.php"; +require_once NOALYSS_INCLUDE."/class/document_type.class.php"; +require_once NOALYSS_INCLUDE."/class/bank.class.php"; +require_once NOALYSS_INCLUDE."/class/fiche_def.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_tva.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_operation.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_sold.class.php"; +require_once NOALYSS_INCLUDE."/class/pdf_land.class.php"; +require_once NOALYSS_INCLUDE."/class/pre_op_ven.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_account_ledger.class.php"; +require_once NOALYSS_INCLUDE."/class/follow_up_detail.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_history_purchase.class.php"; +require_once NOALYSS_INCLUDE."/class/anticipation.class.php"; +require_once NOALYSS_INCLUDE."/class/document_modele.class.php"; +require_once NOALYSS_INCLUDE."/class/acc_ledger_search.class.php"; +require_once NOALYSS_INCLUDE."/lib/irelated_action.class.php"; +require_once NOALYSS_INCLUDE."/lib/http_input.class.php"; +require_once NOALYSS_INCLUDE."/lib/zip_extended.class.php"; +require_once NOALYSS_INCLUDE."/lib/sendmail_core.class.php"; +require_once NOALYSS_INCLUDE."/lib/iperiod.class.php"; +require_once NOALYSS_INCLUDE."/lib/single_record.class.php"; +require_once NOALYSS_INCLUDE."/lib/icard.class.php"; +require_once NOALYSS_INCLUDE."/lib/data_sql.class.php"; +require_once NOALYSS_INCLUDE."/lib/ac_common.php"; +require_once NOALYSS_INCLUDE."/lib/inplace_edit.class.php"; +require_once NOALYSS_INCLUDE."/lib/noalyss_sql.class.php"; +require_once NOALYSS_INCLUDE."/lib/ibutton.class.php"; +require_once NOALYSS_INCLUDE."/lib/user_common.php"; +require_once NOALYSS_INCLUDE."/lib/icon_action.class.php"; +require_once NOALYSS_INCLUDE."/lib/sort_table.class.php"; +require_once NOALYSS_INCLUDE."/lib/iradio.class.php"; +require_once NOALYSS_INCLUDE."/lib/ianccard.class.php"; +require_once NOALYSS_INCLUDE."/lib/ispan.class.php"; +require_once NOALYSS_INCLUDE."/lib/iconcerned.class.php"; +require_once NOALYSS_INCLUDE."/lib/itva_popup.class.php"; +require_once NOALYSS_INCLUDE."/lib/html_table.class.php"; +require_once NOALYSS_INCLUDE."/lib/inplace_switch.class.php"; +require_once NOALYSS_INCLUDE."/lib/noalyss_csv.class.php"; +require_once NOALYSS_INCLUDE."/lib/database_core.class.php"; +require_once NOALYSS_INCLUDE."/lib/html_input.class.php"; +require_once NOALYSS_INCLUDE."/lib/function_javascript.php"; +require_once NOALYSS_INCLUDE."/lib/iselect.class.php"; +require_once NOALYSS_INCLUDE."/lib/iposte.class.php"; +require_once NOALYSS_INCLUDE."/lib/select_box.class.php"; +require_once NOALYSS_INCLUDE."/lib/ifile.class.php"; +require_once NOALYSS_INCLUDE."/lib/input_switch.class.php"; +require_once NOALYSS_INCLUDE."/lib/output_html_tab.class.php"; +require_once NOALYSS_INCLUDE."/lib/user_menu.php"; +require_once NOALYSS_INCLUDE."/lib/html_tab.class.php"; +require_once NOALYSS_INCLUDE."/lib/idate.class.php"; +require_once NOALYSS_INCLUDE."/lib/itext.class.php"; +require_once NOALYSS_INCLUDE."/lib/pdf_core.class.php"; +require_once NOALYSS_INCLUDE."/lib/progress_bar.class.php"; +require_once NOALYSS_INCLUDE."/lib/config_file.php"; +require_once NOALYSS_INCLUDE."/lib/impress.class.php"; +require_once NOALYSS_INCLUDE."/lib/iaction.class.php"; +require_once NOALYSS_INCLUDE."/lib/inum.class.php"; +require_once NOALYSS_INCLUDE."/lib/ipopup.class.php"; +require_once NOALYSS_INCLUDE."/lib/icheckbox.class.php"; +require_once NOALYSS_INCLUDE."/lib/itextarea.class.php"; +require_once NOALYSS_INCLUDE."/lib/filetosend.class.php"; +require_once NOALYSS_INCLUDE."/lib/ihidden.class.php"; +require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php"; -require_once NOALYSS_INCLUDE."class/package_repository.class.php"; -require_once NOALYSS_INCLUDE."class/acc_compute.class.php"; -require_once NOALYSS_INCLUDE."class/sendmail.class.php"; -require_once NOALYSS_INCLUDE."class/fiche_attr.class.php"; -require_once NOALYSS_INCLUDE."class/acc_report.class.php"; -require_once NOALYSS_INCLUDE."class/database.class.php"; -require_once NOALYSS_INCLUDE."class/gestion_table.class.php"; -require_once NOALYSS_INCLUDE."class/acc_report_row.class.php"; -require_once NOALYSS_INCLUDE."class/package_core.class.php"; -require_once NOALYSS_INCLUDE."class/print_ledger.class.php"; -require_once NOALYSS_INCLUDE."class/pre_op_ods.class.php"; -require_once NOALYSS_INCLUDE."class/anc_table.class.php"; -require_once NOALYSS_INCLUDE."class/pdfbalance_simple.class.php"; -require_once NOALYSS_INCLUDE."class/tag.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_purchase.class.php"; -require_once NOALYSS_INCLUDE."class/lettering.class.php"; -require_once NOALYSS_INCLUDE."class/profile_menu.class.php"; -require_once NOALYSS_INCLUDE."class/forecast_cat.class.php"; -require_once NOALYSS_INCLUDE."class/anc_operation.class.php"; -require_once NOALYSS_INCLUDE."class/print_ledger_fin.class.php"; -require_once NOALYSS_INCLUDE."class/acc_bilan.class.php"; -require_once NOALYSS_INCLUDE."class/pre_op_ach.class.php"; -require_once NOALYSS_INCLUDE."class/exercice.class.php"; -require_once NOALYSS_INCLUDE."class/document_export.class.php"; -require_once NOALYSS_INCLUDE."class/admin.class.php"; -require_once NOALYSS_INCLUDE."class/class_print_ledger_misc.php.rej"; -require_once NOALYSS_INCLUDE."class/acc_payment.class.php"; -require_once NOALYSS_INCLUDE."class/acc_reconciliation.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_history_generic.class.php"; -require_once NOALYSS_INCLUDE."class/template_card_category.class.php"; -require_once NOALYSS_INCLUDE."class/print_ledger_simple.class.php"; -require_once NOALYSS_INCLUDE."class/anc_account_table.class.php"; -require_once NOALYSS_INCLUDE."class/todo_list.class.php"; -require_once NOALYSS_INCLUDE."class/supplier.class.php"; -require_once NOALYSS_INCLUDE."class/document.class.php"; -require_once NOALYSS_INCLUDE."class/periode.class.php"; -require_once NOALYSS_INCLUDE."class/fiche_def_ref.class.php"; -require_once NOALYSS_INCLUDE."class/anc_acc_link.class.php"; -require_once NOALYSS_INCLUDE."class/noalyss_parameter_folder.class.php"; -require_once NOALYSS_INCLUDE."class/extension.class.php"; -require_once NOALYSS_INCLUDE."class/pre_op_fin.class.php"; -require_once NOALYSS_INCLUDE."class/forecast_item.class.php"; -require_once NOALYSS_INCLUDE."class/manager.class.php"; -require_once NOALYSS_INCLUDE."class/anc_group_operation.class.php"; -require_once NOALYSS_INCLUDE."class/user.class.php"; -require_once NOALYSS_INCLUDE."class/menu_ref.class.php"; -require_once NOALYSS_INCLUDE."class/print_ledger_detail_item.class.php"; -require_once NOALYSS_INCLUDE."class/anc_plan.class.php"; -require_once NOALYSS_INCLUDE."class/anc_key.class.php"; -require_once NOALYSS_INCLUDE."class/gestion_purchase.class.php"; -require_once NOALYSS_INCLUDE."class/stock_goods.class.php"; -require_once NOALYSS_INCLUDE."class/anc_balance_double.class.php"; -require_once NOALYSS_INCLUDE."class/acc_account.class.php"; -require_once NOALYSS_INCLUDE."class/default_menu.class.php"; -require_once NOALYSS_INCLUDE."class/follow_up.class.php"; -require_once NOALYSS_INCLUDE."class/pre_operation.class.php"; -require_once NOALYSS_INCLUDE."class/class_acc_ledger.php.orig"; -require_once NOALYSS_INCLUDE."class/acc_balance.class.php"; -require_once NOALYSS_INCLUDE."class/anc_balance_simple.class.php"; -require_once NOALYSS_INCLUDE."class/anc_acc_list.class.php"; -require_once NOALYSS_INCLUDE."class/dossier.class.php"; -require_once NOALYSS_INCLUDE."class/anc_print.class.php"; -require_once NOALYSS_INCLUDE."class/print_ledger_simple_without_vat.class.php"; -require_once NOALYSS_INCLUDE."class/gestion_sold.class.php"; -require_once NOALYSS_INCLUDE."class/balance_age.class.php"; -require_once NOALYSS_INCLUDE."class/anc_group.class.php"; -require_once NOALYSS_INCLUDE."class/print_ledger_misc.class.php"; -require_once NOALYSS_INCLUDE."class/periode_ledger_table.class.php"; -require_once NOALYSS_INCLUDE."class/package_noalyss.class.php"; -require_once NOALYSS_INCLUDE."class/calendar.class.php"; -require_once NOALYSS_INCLUDE."class/forecast.class.php"; -require_once NOALYSS_INCLUDE."class/pdf.class.php"; -require_once NOALYSS_INCLUDE."class/package_template.class.php"; -require_once NOALYSS_INCLUDE."class/class_periode.php.orig"; -require_once NOALYSS_INCLUDE."class/package_plugin.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger.class.php"; -require_once NOALYSS_INCLUDE."class/tva_rate_mtable.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_fin.class.php"; -require_once NOALYSS_INCLUDE."class/print_ledger_detail.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_history_financial.class.php"; -require_once NOALYSS_INCLUDE."class/stock.class.php"; -require_once NOALYSS_INCLUDE."class/anc_listing.class.php"; -require_once NOALYSS_INCLUDE."class/anc_grandlivre.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_history.class.php"; -require_once NOALYSS_INCLUDE."class/customer.class.php"; -require_once NOALYSS_INCLUDE."class/fiche.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_info.class.php"; -require_once NOALYSS_INCLUDE."class/Acc_Account_LedgerTest.php"; -require_once NOALYSS_INCLUDE."class/class_print_ledger_misc.php.orig"; -require_once NOALYSS_INCLUDE."class/class_acc_ledger.php.rej"; -require_once NOALYSS_INCLUDE."class/package_contrib.class.php"; -require_once NOALYSS_INCLUDE."class/acc_parm_code.class.php"; -require_once NOALYSS_INCLUDE."class/acc_plan_mtable.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_history_sale.class.php"; -require_once NOALYSS_INCLUDE."class/pdf_operation.class.php"; -require_once NOALYSS_INCLUDE."class/periode_ledger.class.php"; -require_once NOALYSS_INCLUDE."class/contact.class.php"; -require_once NOALYSS_INCLUDE."class/pre_op_advanced.class.php"; -require_once NOALYSS_INCLUDE."class/document_type.class.php"; -require_once NOALYSS_INCLUDE."class/bank.class.php"; -require_once NOALYSS_INCLUDE."class/fiche_def.class.php"; -require_once NOALYSS_INCLUDE."class/acc_tva.class.php"; -require_once NOALYSS_INCLUDE."class/acc_operation.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_sold.class.php"; -require_once NOALYSS_INCLUDE."class/pdf_land.class.php"; -require_once NOALYSS_INCLUDE."class/pre_op_ven.class.php"; -require_once NOALYSS_INCLUDE."class/acc_account_ledger.class.php"; -require_once NOALYSS_INCLUDE."class/follow_up_detail.class.php"; -require_once NOALYSS_INCLUDE."class/class_periode.php.rej"; -require_once NOALYSS_INCLUDE."class/acc_ledger_history_purchase.class.php"; -require_once NOALYSS_INCLUDE."class/anticipation.class.php"; -require_once NOALYSS_INCLUDE."class/document_modele.class.php"; -require_once NOALYSS_INCLUDE."class/acc_ledger_search.class.php"; -require_once NOALYSS_INCLUDE."lib/irelated_action.class.php"; -require_once NOALYSS_INCLUDE."lib/http_input.class.php"; -require_once NOALYSS_INCLUDE."lib/zip_extended.class.php"; -require_once NOALYSS_INCLUDE."lib/sendmail_core.class.php"; -require_once NOALYSS_INCLUDE."lib/iperiod.class.php"; -require_once NOALYSS_INCLUDE."lib/single_record.class.php"; -require_once NOALYSS_INCLUDE."lib/icard.class.php"; -require_once NOALYSS_INCLUDE."lib/data_sql.class.php"; -require_once NOALYSS_INCLUDE."lib/ac_common.php"; -require_once NOALYSS_INCLUDE."lib/inplace_edit.class.php"; -require_once NOALYSS_INCLUDE."lib/noalyss_sql.class.php"; -require_once NOALYSS_INCLUDE."lib/iselect.class.php.orig"; -require_once NOALYSS_INCLUDE."lib/ibutton.class.php"; -require_once NOALYSS_INCLUDE."lib/user_common.php"; -require_once NOALYSS_INCLUDE."lib/icon_action.class.php"; -require_once NOALYSS_INCLUDE."lib/sort_table.class.php"; -require_once NOALYSS_INCLUDE."lib/ac_common.php.orig"; -require_once NOALYSS_INCLUDE."lib/iradio.class.php"; -require_once NOALYSS_INCLUDE."lib/ianccard.class.php"; -require_once NOALYSS_INCLUDE."lib/ispan.class.php"; -require_once NOALYSS_INCLUDE."lib/message_javascript.php"; -require_once NOALYSS_INCLUDE."lib/iconcerned.class.php"; -require_once NOALYSS_INCLUDE."lib/itva_popup.class.php"; -require_once NOALYSS_INCLUDE."lib/html_table.class.php"; -require_once NOALYSS_INCLUDE."lib/inplace_switch.class.php"; -require_once NOALYSS_INCLUDE."lib/noalyss_csv.class.php"; -require_once NOALYSS_INCLUDE."lib/database_core.class.php"; -require_once NOALYSS_INCLUDE."lib/html_input.class.php"; -require_once NOALYSS_INCLUDE."lib/function_javascript.php"; -require_once NOALYSS_INCLUDE."lib/iselect.class.php"; -require_once NOALYSS_INCLUDE."lib/iposte.class.php"; -require_once NOALYSS_INCLUDE."lib/select_box.class.php"; -require_once NOALYSS_INCLUDE."lib/ifile.class.php"; -require_once NOALYSS_INCLUDE."lib/output_html_tab.class.php"; -require_once NOALYSS_INCLUDE."lib/user_menu.php"; -require_once NOALYSS_INCLUDE."lib/html_tab.class.php"; -require_once NOALYSS_INCLUDE."lib/idate.class.php"; -require_once NOALYSS_INCLUDE."lib/itext.class.php"; -require_once NOALYSS_INCLUDE."lib/ac_common.php.rej"; -require_once NOALYSS_INCLUDE."lib/pdf_core.class.php"; -require_once NOALYSS_INCLUDE."lib/progress_bar.class.php"; -require_once NOALYSS_INCLUDE."lib/config_file.php"; -require_once NOALYSS_INCLUDE."lib/impress.class.php"; -require_once NOALYSS_INCLUDE."lib/iaction.class.php"; -require_once NOALYSS_INCLUDE."lib/inum.class.php"; -require_once NOALYSS_INCLUDE."lib/ipopup.class.php"; -require_once NOALYSS_INCLUDE."lib/icheckbox.class.php"; -require_once NOALYSS_INCLUDE."lib/itextarea.class.php"; -require_once NOALYSS_INCLUDE."lib/filetosend.class.php"; -require_once NOALYSS_INCLUDE."lib/ihidden.class.php"; -require_once NOALYSS_INCLUDE."lib/manage_table_sql.class.php"; + + +require_once 'global.php'; diff --git a/unit-test/global.php b/unit-test/global.php new file mode 100644 index 000000000..b37fd1c1e --- /dev/null +++ b/unit-test/global.php @@ -0,0 +1,33 @@ +object=new Acc_Account($cn, '400'); } - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - - } /** * @covers Acc_Account::get_parameter diff --git a/unit-test/test-file.sh b/unit-test/test-file.sh new file mode 100755 index 000000000..dec82b1b4 --- /dev/null +++ b/unit-test/test-file.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +PHPUNIT=~/Program/phpunit-7.5.16.phar +if [ ! -f "$1" ] ; then + echo "File $1 not found" + exit 1 +fi + +$PHPUNIT --bootstrap bootstrap.php --color $1 From 595ec31ffe453e7a9e7f79fe669fec6393983d1a Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 18 Sep 2019 23:13:33 +0200 Subject: [PATCH 5/6] documentation + traduction --- include/class/acc_ledger_search.class.php | 4 ++-- include/fiche.inc.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php index 9506dddeb..f9891a153 100644 --- a/include/class/acc_ledger_search.class.php +++ b/include/class/acc_ledger_search.class.php @@ -24,8 +24,7 @@ if (!defined('ALLOWED')) /** * @file - * @brief - * @param type $name Descriptionara + * @brief search in ledger */ class Acc_Ledger_Search { @@ -168,6 +167,7 @@ class Acc_Ledger_Search $f_amount_min->value=$http->request("amount_min","string",0); $f_amount_max=new INum('amount_max', '0', $this->div."amount_max"); $f_amount_max->value=$http->request("amount_max","string",0); + /* input quick code */ $f_qcode=new ICard($this->div.'qcode'); diff --git a/include/fiche.inc.php b/include/fiche.inc.php index a6838287b..31e8f5dca 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -259,7 +259,7 @@ $export_pdf.=HtmlInput::hidden('end', $periode_end->value ); $export_pdf.=HtmlInput::hidden('histo', $phisto); $export_pdf.=HtmlInput::request_to_hidden(array('allcard')); $export_pdf.=dossier::hidden(); -$export_pdf.=HtmlInput::submit('pdf', 'Export en PDF'); +$export_pdf.=HtmlInput::submit('pdf', _('Export en PDF')); $export_pdf.=''; $export_print = HtmlInput::print_window(); @@ -272,7 +272,7 @@ $export_csv.=HtmlInput::hidden('end', $periode_end->value ); $export_csv.=HtmlInput::hidden('histo', $phisto); $export_csv.=HtmlInput::request_to_hidden(array('allcard')); $export_csv.=dossier::hidden(); -$export_csv.=HtmlInput::submit('CSV', 'Export en CSV'); +$export_csv.=HtmlInput::submit('CSV', _('Export en CSV')); $export_csv.=''; /* * Date is important is requested balance @@ -280,7 +280,7 @@ $export_csv.=''; if (isDate($_REQUEST['start']) == null || isDate($_REQUEST['end']) == null) { echo h2('Date invalide !', 'class="error"'); - alert('Date invalide !'); + alert(_('Date invalide !')); return; } /*************************************************************************************************************************/ From 9cc52525e47a3030927f9c30bf81b32a2c24f7d4 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sun, 22 Sep 2019 15:49:41 +0200 Subject: [PATCH 6/6] PHPUNIT : Acc_Compute --- unit-test/include/class/acc_computeTest.class.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/unit-test/include/class/acc_computeTest.class.php b/unit-test/include/class/acc_computeTest.class.php index 1b19e5fb9..09b9386af 100644 --- a/unit-test/include/class/acc_computeTest.class.php +++ b/unit-test/include/class/acc_computeTest.class.php @@ -155,7 +155,14 @@ class Acc_ComputeTest extends TestCase */ public function testCorrect() { + $this->object->amount=100.0; + $this->object->amount_perso=15.3333; + $this->object->amount_vat=20.6666; + $this->object->amount_nd_vat=1.5; $this->object->correct(); + $this->assertEquals($this->object->amount,84.6667); + $this->assertEquals($this->object->amount_perso,15.3333); + $this->assertEquals($this->object->amount_vat,20.67); } /** @@ -167,6 +174,7 @@ class Acc_ComputeTest extends TestCase $this->object->verify(); $new=new Acc_Compute(); $this->object->verify($new); + $this->assertTrue(TRUE); } /** @@ -176,7 +184,11 @@ class Acc_ComputeTest extends TestCase */ public function testDisplay() { + ob_start(); $this->object->display(); + $result= ob_get_flush(); + $this->assertStringStartsWith("key amount Description amount value is 0
key amount_vat Description amount_vat value is 0
",$result); + $this->assertStringEndsWith("
key amount_perso_rate Description amount_perso_rate value is 0
",$result); } /**
Poste'.Icon_Action::infobulle(27).''._('Poste').Icon_Action::infobulle(27).' -input(); ?> input(); ; ?> + id)); + echo $f_amount_min->input(); ?> + id)); + echo $f_amount_max->input(); ; ?>
-input(); ?> +id)); +echo $f_accounting->input(); ?>