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

Merge branch 'master' into r700-currency

Browse source
This commit is contained in:
Dany De Bontridder 2018-09-16 10:00:22 +02:00
commit 2e2ab4c19e
6 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/index.php
View file

@ -255,7 +255,7 @@ echo '
<a id="recover_link" href="#">Mot de passe oublié ? </a>
<div id="recover_box">
<span style="display:block;font-size:120%;padding:10px">Indiquez votre login ou votre email <span style="cursor: pointer;background-color: white;color:block;top:-5px;float: right;position:relative;right:-5px" id="close"><a ref="#" id="close_link"><?php echo SMALLX?></a></span></span>
<span style="display:block;font-size:120%;padding:10px">Indiquez votre login ou votre email <span style="cursor: pointer;background-color: white;top:-5px;float: right;position:relative;right:-5px" id="close"><a ref="#" id="close_link"><?php echo SMALLX?></a></span></span>
<form method="POST">
<input type="hidden" value="send_email" name="id">
<input type="hidden" value="recover" name="recover" >

4
html/js/card.js
View file

@ -318,7 +318,7 @@ function result_card_search(req)
sx=document.body.scrollTop+60;
}
var div_style="top:"+sx+"px;height:auto";
var div_style="top:"+sx+"px;min-height:80%;height:auto";
add_div({id:'search_card',cssclass:'inner_box',html:"",style:div_style,drag:false,effect:'blinddown'});
$('search_card').innerHTML=code_html;
@ -1020,4 +1020,4 @@ function delete_card(obj) {
});
}
});
}
}

3
html/js/sorttable.js
View file

@ -21,7 +21,8 @@
Show the default order
example:
<th class=" sorttable_sorted_reverse">
<th class=" sorttable_sorted">
....<span id="sorttable_sortrevind">&nbsp;&blacktriangle;</span>
<th class=" sorttable_sorted">
Sort on date
<td sorttable_customkey="<?=$row_bank['b_date']?>"> // format YYYYMMDD

2
include/class/tva_rate_mtable.class.php
View file

@ -272,7 +272,7 @@ class Tva_Rate_MTable extends Manage_Table_SQL
if ( $count < 2) {
throw new Exception(_("Vous ne pouvez pas effacer tous les taux. Si votre société n'utilise pas la TVA, changer dans le menu société"));
}
$cn->exec_sql("delete from tva_rate where tva_id=$1", [$this->table->tva_id]);
}
}

5
include/constant.php
View file

@ -126,7 +126,10 @@ define ('COMPTA_MAX_YEAR',2100);
define ('COMPTA_MIN_YEAR',1900);
define ('MAX_RECONCILE',25);
define ('MAX_QCODE',4);
define ('MAX_SEARCH_CARD',20);
if ( ! defined ('MAX_SEARCH_CARD') ) {
define ('MAX_SEARCH_CARD',20);
}
define ('MAX_FOLDER_TO_SHOW',80);
define ('MAX_ACTION_SHOW',20);

22
include/lib/manage_table_sql.class.php
View file

@ -806,9 +806,29 @@ function check()
{
if ( $this->get_col_type($v)=="select")
{
/**
* we translate the code from the database into a hardcoded label
*/
$idx=$p_row[$v];
if ( ! isset($this->a_select[$v][$idx])) {
echo td("--");
/*
* Check if index exists
*/
$array_to_search=$this->a_select[$v];
$value=$p_row[$v];
$nb_search=count($array_to_search);
$found=FALSE;
for ( $e=0;$e< $nb_search;$e++) {
if (isset ($array_to_search[$e]['value']) && $array_to_search[$e]['value']==$value ) {
$found=TRUE;
echo td($array_to_search[$e]['label']);
}
}
if ( ! $found) {
echo td("--");
}
} else {
echo td($this->a_select[$v][$idx]["label"]);
}