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

Merge branch 'dev7400-1' into next-release-8

Browse source
This commit is contained in:
Dany De Bontridder 2020-07-17 11:50:04 +02:00
commit b9c1bdfa3e
47 changed files with 138 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/class/acc_operation.class.php
View file

@ -609,8 +609,8 @@ class Acc_Operation
$ret=new Acc_Fin($this->db,$this->jr_id);
break;
default:
$ret=new Acc_Misc($this->db,$this->jr_id);
break;
$ret=new Acc_Misc($this->db,$this->jr_id);
break;
}
$ret->get();
if ( empty($ret->det->array))
@ -791,9 +791,20 @@ class Acc_Operation
}
$r.="</p>";
$r.=HtmlInput::simple_array_to_hidden($array);
//
// For Misc Operation , if a card is given then there is no accounting
if ( $operation->signature==="ODS") {
$nb_array=count($array);
for ($i=0;$i<$nb_array;$i++) {
if (isset ($array["qc_".$i] ) && $array["qc_".$i] != "" ) {
$array["poste".$i]="";
}
}
}
// transform the operation into hidden element
$r.=HtmlInput::simple_array_to_hidden($array);
$r.=HtmlInput::submit(uniqid(), _("Dupliquer"));
$r.='</form>';