[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 16/16: Task #1045 - Amélioration apparence
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 16/16: Task #1045 - Amélioration apparence : Amélioration detail operation |
Date: |
Tue, 18 Nov 2014 01:09:07 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 4a3e79e0dda7a3c726f0744ee559e95cb9ac510f
Author: Dany De Bontridder <address@hidden>
Date: Tue Nov 18 02:06:47 2014 +0100
Task #1045 - Amélioration apparence :
Amélioration detail operation
---
include/class_anc_operation.php | 6 ++++--
include/template/ledger_detail_ach.php | 7 +++----
include/template/ledger_detail_bottom.php | 2 +-
include/template/ledger_detail_ven.php | 7 +++----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/class_anc_operation.php b/include/class_anc_operation.php
index c87d953..cd56324 100644
--- a/include/class_anc_operation.php
+++ b/include/class_anc_operation.php
@@ -616,8 +616,10 @@ class Anc_Operation
* Add a button for distribution key
*
*/
-
- $ledger=$this->db->get_value('select j_jrn_def from jrnx where
j_id=$1',array($this->j_id));
+ $ledger=HtmlInput::default_value_post("p_jrn", 0);
+ if ($ledger==0) {
+ $ledger=$this->db->get_value('select j_jrn_def from jrnx where
j_id=$1',array($this->j_id));
+ }
$gDossier=Dossier::id();
$button_key=new IButton();
$button_key->javascript="anc_key_choice(".$gDossier.",'".$p_id."$table_id',$p_amount,'".$ledger."');";
diff --git a/include/template/ledger_detail_ach.php
b/include/template/ledger_detail_ach.php
index 3522dc0..3b7c83a 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -144,10 +144,9 @@ $str_anc="";
$a_anc = $anc->get_list(' order by pa_id ');
$x = count($a_anc);
/* set the width of the col */
- $str_anc.='<tr><th>Code</th><th>Montant</th><th colspan="'
. $x . '">' . _('Compt. Analytique') . '</th>';
-
/* add hidden variables pa[] to hold the value of pa_id */
- $str_anc.=Anc_Plan::hidden($a_anc);
+ $str_anc.='<tr><th>Code</th><th>Montant</th><th colspan="'
. $x . '">' . _('Compt. Analytique') . Anc_Plan::hidden($a_anc).'</th></tr>';
+
}
echo '</tr>';
for ($e = 0; $e < count($obj->det->array); $e++)
@@ -228,7 +227,7 @@ $str_anc="";
$str_anc.='<tr>';
$str_anc.=td($qcode);
$str_anc.=td(nbm($htva));
- $str_anc.='<td>'.$anc_op->display_table(1, $htva,
$div).'</td>';
+ $str_anc.=$anc_op->display_table(1, $htva, $div);
} else
{
$row.=td('');
diff --git a/include/template/ledger_detail_bottom.php
b/include/template/ledger_detail_bottom.php
index b72a417..43d31f5 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -239,7 +239,7 @@ require_once('template/ledger_detail_file.php');
<h1 class="legend"><?php echo $a_tab['analytic_div']['label']?></h1>
<?php endif; ?>
<?php if ( $owner->MY_ANALYTIC != "nu") :
- if ( strpos('<td>',$str_anc) ==0 ):
+ if ( strpos($str_anc,'<td>') == true ):
?>
<table class="result">
diff --git a/include/template/ledger_detail_ven.php
b/include/template/ledger_detail_ven.php
index dbb7bf5..b550c8e 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -148,10 +148,9 @@ echo $ipaid->input();
$a_anc = $anc->get_list(" order by pa_id ");
$x = count($a_anc);
/* set the width of the col */
- $str_anc.='<tr><th>Code</th><th>Montant</th><th colspan="'
. $x . '">' . _('Compt. Analytique') . '</th>';
-
/* add hidden variables pa[] to hold the value of pa_id */
- $str_anc.=Anc_Plan::hidden($a_anc);
+ $str_anc.='<tr><th>Code</th><th>Montant</th><th colspan="'
. $x . '">' . _('Compt. Analytique') .Anc_Plan::hidden($a_anc). '</th>'.'</tr>';
+
}
echo '</tr>';
@@ -227,7 +226,7 @@ echo $ipaid->input();
$str_anc.='<tr>';
$str_anc.=td($qcode);
$str_anc.=td(nbm($htva));
- $str_anc.='<td>'.$anc_op->display_table(1, $htva,
$div).'</td>';
+ $str_anc.=$anc_op->display_table(1, $htva,
$div).'</tr>';
// $row.=($div == 'popup') ?
$anc_op->display_table(1, $htva, $div):"";
} else
{
- [Noalyss-commit] [noalyss] 05/16: Remove global, (continued)
- [Noalyss-commit] [noalyss] 05/16: Remove global, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 09/16: Task #1045 - Amélioration apparence : Improve window detail op, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 06/16: Adapt change for class_extension.php, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 08/16: Adapt change for class_extension.php, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 11/16: Task #1045 - Amélioration apparence : Improve apparence profie, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 12/16: profile_menu Extends profile_menu_sql, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 10/16: Task #1045 - Amélioration apparence :, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 13/16: class_menu_ref_sql add column me_description_etendue, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 07/16: Code rewrite, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 14/16: Fix SQL bug in restore, Dany De Bontridder, 2014/11/17
- [Noalyss-commit] [noalyss] 16/16: Task #1045 - Amélioration apparence : Amélioration detail operation,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 15/16: Task #1052 - Automatic integration of plugin Plugin management, Dany De Bontridder, 2014/11/17