[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 165/173: Currency : adapt test
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 165/173: Currency : adapt test |
Date: |
Mon, 22 Mar 2021 12:59:24 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit ea8a88bb679567503b67b5f7dddb57fd5e881d2e
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Wed Mar 17 11:17:40 2021 +0100
Currency : adapt test
---
include/ajax/ajax_search_display_tag.php | 1 +
include/template/tag_search_select.php | 7 +++++--
unit-test/include/class/acc_ledger_purchase.Test.php | 4 +++-
unit-test/include/class/acc_ledger_sold.Test.php | 2 ++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/ajax/ajax_search_display_tag.php
b/include/ajax/ajax_search_display_tag.php
index 43efd2c..a4ced32 100644
--- a/include/ajax/ajax_search_display_tag.php
+++ b/include/ajax/ajax_search_display_tag.php
@@ -44,6 +44,7 @@ if ( $caller_obj == 'Tag_Action' ) {
throw new Exception("AJD001 invalid caller [$caller_obj]");
}
+
$response= $tag->select_search($pref);
$html=escape_xml($response);
diff --git a/include/template/tag_search_select.php
b/include/template/tag_search_select.php
index 547a548..c58cf8c 100644
--- a/include/template/tag_search_select.php
+++ b/include/template/tag_search_select.php
@@ -3,10 +3,13 @@
//see licence.txt
?><?php
+
$max=$this->cn->count($ret);
if ( $max == 0 ) {
- echo h2(_("Aucune étiquette disponible"),' class="notice"');
- return;
+ $res=h2(_("Aucune étiquette disponible"),' class="notice"').
+ HtmlInput::button_close($p_prefix.'tag_div');
+ return $res;
+
}
require_once NOALYSS_INCLUDE."/lib/output_html_tab.class.php";
$tab_tag=new Html_Tab($p_prefix."tab_tag",_("Etiquettes"));
diff --git a/unit-test/include/class/acc_ledger_purchase.Test.php
b/unit-test/include/class/acc_ledger_purchase.Test.php
index b750733..7241058 100644
--- a/unit-test/include/class/acc_ledger_purchase.Test.php
+++ b/unit-test/include/class/acc_ledger_purchase.Test.php
@@ -55,7 +55,9 @@ class Acc_Ledger_PurchaseTest extends TestCase
"sa"=>"p",
"e_mp"=>0,
"view_invoice"=>"Enregistrer",
- "ac"=>"ACH"
+ "ac"=>"ACH",
+ "p_currency_rate"=>1.09,
+ "p_currency_code"=>1
);
}
diff --git a/unit-test/include/class/acc_ledger_sold.Test.php
b/unit-test/include/class/acc_ledger_sold.Test.php
index 4632397..5e7ad60 100644
--- a/unit-test/include/class/acc_ledger_sold.Test.php
+++ b/unit-test/include/class/acc_ledger_sold.Test.php
@@ -67,6 +67,8 @@ class Acc_Ledger_SoldTest extends TestCase
"e_mp"=>"0",
"e_mp_qcode_1"=>"COMPTE",
"e_mp_qcode_2"=>"",
+ "p_currency_rate"=>1,
+ "p_currency_code"=>0,
"view_invoice"=>"Enregistrer");
}
- [Noalyss-commit] [noalyss] 136/173: Bug database.class.php : n'applique pas le patch, (continued)
- [Noalyss-commit] [noalyss] 136/173: Bug database.class.php : n'applique pas le patch, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 143/173: Merge commit '57309561191906d4099c8db08b7fa737f7c8e1e0' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 144/173: Merge commit 'b8fafe1f2b705272b9e3853a8a791200fb718fa6' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 148/173: Merge branch 'dev7400-1' into next-release-8, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 149/173: Merge branch 'enterprise' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 155/173: Merge branch 'master' into dev-8-bootstrap, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 156/173: rel8100 Merge branch 'master' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 157/173: Merge branch 'dev-8-bug-saldo-not-checked', Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 161/173: Move CSS and start to integrate BootStrap, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 163/173: Move CSS and start to integrate BootStrap Add fonts, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 165/173: Currency : adapt test,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 166/173: BootStrap : set up + move CSS and font to their own folders, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 167/173: Task 0001912: Developpement DEBUG new system with level, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 168/173: Task #1911: FOLLOW : télécharger toutes les documents en une fois, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 153/173: Improve scenario test, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 158/173: Merge branch 'dev8001', Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 172/173: Erreur : fiche_attr , first param is a DatabaseCore object, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 173/173: if a document cannot be generate, a error message is displaid and the whole operation is not cancelled, Dany De Bontridder, 2021/03/22