[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 21/27: Fix bug from merge
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 21/27: Fix bug from merge |
Date: |
Sat, 11 Jul 2020 13:25:21 -0400 (EDT) |
sparkyx pushed a commit to annotated tag E-8000
in repository noalyss.
commit dc150ce610f7f0fe8d3c7742153ae240dc3d07cd
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Sun Feb 3 15:55:18 2019 +0100
Fix bug from merge
---
html/ajax_misc.php | 2 +-
html/js/infobulle.js | 2 +-
include/class/fiche.class.php | 17 +++++++++++------
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index d951281..d0d3b20 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -248,7 +248,7 @@ $path = array(
// Currency , delete a rate
"CurrencyRateDelete"=>"ajax_currency",
// Display all cards using an accounting
- "display_all_card"=>"ajax_display_all_card"
+ "display_all_card"=>"ajax_display_all_card",
// Currency , add / remove / update currency
"CurrencyManage"=>"ajax_currency"
) ;
diff --git a/html/js/infobulle.js b/html/js/infobulle.js
index 381a369..7ba6def 100644
--- a/html/js/infobulle.js
+++ b/html/js/infobulle.js
@@ -20,7 +20,7 @@
* \code
// Example
echo JS_INFOBULLE;
- echo HtmlInput::infobulle(x);
+ echo Icon_Action::infobulle(x);
\endcode
*/
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 8354e46..67ba4ff 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -58,6 +58,7 @@ class Fiche
$this->cn=$p_cn;
$this->id=$p_id;
$this->quick_code='';
+ $this->attribut=array();
}
/**
*@brief used with a usort function, to sort an array of Fiche on the name
@@ -500,7 +501,7 @@ class Fiche
$w->set_attribute('ipopup', 'ipop_account');
$w->set_attribute('account', "av_text" .
$attr->ad_id);
$w->table = 1;
- $bulle = HtmlInput::infobulle(14);
+ $bulle = Icon_Action::infobulle(14);
break;
case 'select':
$w = new ISelect("av_text" . $attr->ad_id);
@@ -529,7 +530,7 @@ class Fiche
$w->name = "av_text" . $attr->ad_id;
if ($attr->ad_id == 21 ||
$attr->ad_id==22||$attr->ad_id==20||$attr->ad_id==31)
{
- $bulle=HtmlInput::infobulle(21);
+ $bulle=Icon_Action::infobulle(21);
}
if ($attr->ad_id == ATTR_DEF_NAME || $attr->ad_id==
ATTR_DEF_QUICKCODE)
$class=" input_text highlight info";
@@ -598,7 +599,7 @@ class Fiche
$sql="select account_auto($this->fiche_def)";
$ret_sql=$this->cn->exec_sql($sql);
$a=Database::fetch_array($ret_sql, 0);
- $bulle=HtmlInput::infobulle(10);
+ $bulle=Icon_Action::infobulle(10);
if ($a['account_auto']=='t')
$bulle.=HtmlInput::warnbulle(11);
@@ -640,7 +641,7 @@ class Fiche
$w->dbl_click_history();
$w->width=$r->ad_size;
$w->table=0;
- $bulle=HtmlInput::infobulle(14);
+ $bulle=Icon_Action::infobulle(14);
$w->value=$r->av_text;
break;
case 'card':
@@ -712,7 +713,7 @@ class Fiche
if ($r->ad_id==21||$r->ad_id==22||$r->ad_id==20||$r->ad_id==31)
{
- $bulle=HtmlInput::infobulle(21);
+ $bulle=Icon_Action::infobulle(21);
}
if ($r->ad_id == ATTR_DEF_NAME || $r->ad_id==
ATTR_DEF_QUICKCODE||$r->ad_id==ATTR_DEF_ACCOUNT)
$class=" input_text highlight info";
@@ -1210,6 +1211,7 @@ class Fiche
" jr_comment as description,jrn_def_name as
jrn_name,j_poste,".
" jr_pj_number,".
"j_debit, jr_internal,jr_id,(select distinct
jl_id from sqlletter where sqlletter.j_id=j1.j_id ) as letter , ".
+ "jr_optype , ".
" jr_tech_per,p_exercice,jrn_def_name,
(with cred as (select jl_id,
sum(j_montant) as amount_cred from letter_cred left join jrnx as j3 on
(j3.j_id=j1.j_id) group by jl_id ),
deb as (select jl_id, sum(j_montant) as
amount_deb from letter_deb left join jrnx as j2 on (j2.j_id = j1.j_id) group
by jl_id )
@@ -1424,6 +1426,7 @@ class Fiche
"<TH style=\"text-align:left\">"._('Interne')." </TH>".
"<TH style=\"text-align:left\">"._('Tiers')." </TH>".
"<TH style=\"text-align:left\">"._('Description')." </TH>".
+ "<TH style=\"text-align:left\">"._('Type')."</TH>".
"<TH style=\"text-align:left\">"._('ISO')."</TH>".
"<TH style=\"text-align:right\">"._('Dev.')."</TH>".
"<TH style=\"text-align:right\">"._('Débit')." </TH>".
@@ -1519,6 +1522,8 @@ class Fiche
td().
td().
td(_('Totaux')).
+ td().
+ td().
"<TD></TD>".
"<TD style=\"text-align:right\">".nbm($sum_deb)."</TD>".
"<TD style=\"text-align:right\">".nbm($sum_cred)."</TD>".
@@ -1758,7 +1763,7 @@ class Fiche
$r.='<table id="tiers_tb" class="sortable"
style="width:90%;margin-left:5%">
<TR >
- <TH>'._('Quick Code').HtmlInput::infobulle(17).'</TH>'.
+ <TH>'._('Quick Code').Icon_Action::infobulle(17).'</TH>'.
'<th>'._('Poste comptable').'</th>'.
'<th class="sorttable_sorted">'._('Nom').'<span
id="sorttable_sortfwdind"><img src="image/up.gif"></span>'.'</th>
<th>'._('Adresse').'</th>
- [Noalyss-commit] [noalyss] 27/27: Fiche.clasS.php fix broken merge, (continued)
- [Noalyss-commit] [noalyss] 27/27: Fiche.clasS.php fix broken merge, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 08/27: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 09/27: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 12/27: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 14/27: Mantis #1626: AFFICHAGE BALANCE FICHE - soldes nuls au débit, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 13/27: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Use base64_decode to protect the string in serialize, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 16/27: Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 17/27: Mantis #1596: Dans le plan comptable, fiches non cliquables Les fiches sont cliquable dans Plan Comptable , PCMNCFG et dans la liste des postes, en plus on peut obtenir toutes les fiches d'un poste, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 19/27: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 20/27: Bug : CARD misplace of "Search Card", Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 21/27: Fix bug from merge,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 22/27: CSS : cosmetic, Dany De Bontridder, 2020/07/11