From 28b8aa2ac1d8fa5be40d4f00cb1b607ef6acd1d8 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 18 Jun 2012 13:00:28 +0000 Subject: [PATCH] =?UTF-8?q?0000530:=20Ajouter=20la=20possibilit=C3=A9=20d'?= =?UTF-8?q?entrer=20une=20date=20par=20op=C3=A9ration=20dans=20la=20saisie?= =?UTF-8?q?=20du=20journal=20de=20banque?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prep. code commenté, problème avec Acc_Ledger_Fin --- html/js/acc_ledger.js | 1 + html/js/infobulle.js | 1 + include/class_acc_ledger_fin.php | 13 ++++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js index 72c9c7750..7260baf26 100644 --- a/html/js/acc_ledger.js +++ b/html/js/acc_ledger.js @@ -252,6 +252,7 @@ function ledger_fin_add_row() new_tt=new_tt.replace(/e_other0_amount/g,"e_other"+nb.value+'_amount'); new_tt=new_tt.replace(/e_concerned0/g,"e_concerned"+nb.value); new_tt=new_tt.replace(/e_other0_label/g,"e_other"+nb.value+'_label'); + // new_tt=new_tt.replace(/dateop0/g,"date"+nb.value); newCell.innerHTML=new_tt; new_tt.evalScripts(); } diff --git a/html/js/infobulle.js b/html/js/infobulle.js index 91114aa3d..d68fd3dae 100644 --- a/html/js/infobulle.js +++ b/html/js/infobulle.js @@ -43,6 +43,7 @@ content[12]="Document généré uniquement si le mode de paiement est utilisé"; content[13]="Vous pouvez utiliser le % pour indiquer le poste parent"; content[14]="Attention, le poste comptable doit exister, il ne sera pas vérifié"; content[15]="Laissez à 0 pour ne rien changer"; +content[16]="Si vous ne remplissez pas la date d'opération, ce sera la date de l'extrait qui sera utilisée"; function showBulle(p_ctl) { diff --git a/include/class_acc_ledger_fin.php b/include/class_acc_ledger_fin.php index 2c32cd41e..879531fb8 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class_acc_ledger_fin.php @@ -311,12 +311,15 @@ class Acc_Ledger_Fin extends Acc_Ledger // Parse each " tiers" for ($i = 0; $i < $max; $i++) { - $tiers = (isset(${"e_other" . $i})) ? ${"e_other" . $i} : "" - ; + $tiers = (isset(${"e_other" . $i})) ? ${"e_other" . $i} : ""; + $tiers_amount = (isset(${"e_other$i" . "_amount"})) ? round(${"e_other$i" . "_amount"}, 2) : 0; - $tiers_comment = (isset(${"e_other$i" . "_comment"})) ? ${"e_other$i" . "_comment"} : "" - ; + $tiers_comment = (isset(${"e_other$i" . "_comment"})) ? ${"e_other$i" . "_comment"} : ""; + + $operation_date=new IDate("dateop".$i); + $operation_date->value=(isset(${'dateop'.$i}))?${'dateop'.$i}:""; + $array[$i]['dateop']=$operation_date->input(); ${"e_other$i" . "_amount"} = (isset(${"e_other$i" . "_amount"})) ? ${"e_other$i" . "_amount"} : 0; $W1 = new ICard(); @@ -342,7 +345,7 @@ class Acc_Ledger_Fin extends Acc_Ledger // Card name // - $card_name = ""; + $card_name = ""; if ($tiers != "") { $fiche = new Fiche($this->db);