admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug from merge

Browse source
This commit is contained in:
Dany De Bontridder 2019-02-03 15:55:18 +01:00
parent 3d0aba87e3
commit dc150ce610
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/ajax_misc.php
View file

@ -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"
) ;

2
html/js/infobulle.js
View file

@ -20,7 +20,7 @@
* \code
// Example
echo JS_INFOBULLE;
echo HtmlInput::infobulle(x);
echo Icon_Action::infobulle(x);
\endcode
*/

17
include/class/fiche.class.php
View file

@ -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>