[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 13/14: Task #1045 - Amélioration apparence
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 13/14: Task #1045 - Amélioration apparence : Détail opération : avec onglet + action liée (ajout + suppression) |
|
Date: |
Sun, 16 Nov 2014 14:28:05 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit bbf9fb1dd05b8c26e0ce2fc98705d252d20f4dae
Author: Dany De Bontridder <address@hidden>
Date: Sun Nov 16 15:25:38 2014 +0100
Task #1045 - Amélioration apparence :
Détail opération : avec onglet + action liée (ajout + suppression)
---
html/js/scripts.js | 41 ++++++++
html/style-classic.css | 57 ++++++++---
include/class_acc_ledger.php | 12 +-
include/class_acc_ledger_sold.php | 2 +-
include/template/ledger_detail_ach.php | 89 ++----------------
include/template/ledger_detail_bottom.php | 152 ++++++++++++++++++++++++++---
include/template/ledger_detail_file.php | 2 +-
include/template/ledger_detail_fin.php | 39 ++++----
include/template/ledger_detail_misc.php | 39 ++++----
include/template/ledger_detail_ven.php | 99 +++----------------
10 files changed, 287 insertions(+), 245 deletions(-)
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 5d55554..4cc5cc3 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -2569,4 +2569,45 @@ function select_cat(x)
old_class = old_select.className;
$(old_select).className = "highlight";
$('fd_id').value = x;
+}
+/**
+ * Show the DIV and hide the other, the array of possible DIV are
+ * in a_tabs,
+ * @param {array} a_tabs name of possible tabs
+ * @param {strng} p_display_tab tab to display
+ */
+function show_tabs(a_tabs,p_display_tab)
+{
+ try
+ {
+ if ( a_tabs.length == 0 ) trow ('a_tabs in empty');
+ var i=0;
+ for ( i=0;i<a_tabs.length;i++) {
+ if ( console ) console.log(a_tabs[i]);
+ $(a_tabs[i]).hide();
+ }
+ if ( console )console.log(p_display_tab);
+ $(p_display_tab).show();
+ } catch(e) {
+ if ( console )console.log(e.message);
+ }
+
+}
+/**
+ * Change the class of all the "LI" element of a UL or OL
+ * @param node of ul (this)
+ */
+function unselect_other_tab(p_tab)
+{
+ try {
+ var other = p_tab.getElementsByTagName("li");
+ var i=0;
+ var tab=null;
+ for (i=0;i<other.length;i++) {
+ tab=other[i];
+ tab.className="tabs";
+ }
+ } catch(e) {
+ if ( console ) console.log(e.message);
+ }
}
\ No newline at end of file
diff --git a/html/style-classic.css b/html/style-classic.css
index ed09405..f48707c 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -4,7 +4,7 @@ BODY {
font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
padding: 0px 0px 0px 0px ;
margin:0px;
- color:#0000FF;
+ color:#0000FF;
font-size:95%;
}
.notice {
@@ -262,15 +262,14 @@ td.mtitle {
/* background-color:#DDE6FF;*/
border:1px solid #99B1DF;
border-radius:5px;
- background: #d4e4ef; /* Old browsers */
- background: -moz-linear-gradient(top, #d4e4ef 0%, #86aecc 100%); /* FF3.6+
*/
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#d4e4ef), color-stop(100%,#86aecc)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #d4e4ef 0%,#86aecc 100%); /*
Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #d4e4ef 0%,#86aecc 100%); /* Opera
11.10+ */
- background: -ms-linear-gradient(top, #d4e4ef 0%,#86aecc 100%); /* IE10+ */
- background: linear-gradient(to bottom, #d4e4ef 0%,#86aecc 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#d4e4ef', endColorstr='#86aecc',GradientType=0 ); /* IE6-9 */
-
+ background: #C2E3FC; /* Old browsers */
+ background: -moz-linear-gradient(top, #C2E3FC 0%, #6393c1 100%); /* FF3.6+
*/
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#C2E3FC), color-stop(100%,#6393c1)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #C2E3FC 0%,#6393c1 100%); /*
Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #C2E3FC 0%,#6393c1 100%); /* Opera
11.10+ */
+ background: -ms-linear-gradient(top, #C2E3FC 0%,#6393c1 100%); /* IE10+ */
+ background: linear-gradient(to bottom, #C2E3FC 0%,#6393c1 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C2E3FC',
endColorstr='#6393c1',GradientType=0 ); /* IE6-9 */
}
td.vert_mtitle {
text-align:center;
@@ -465,7 +464,7 @@ div.content a {
font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
text-decoration: none;
display: block;
- color: #0000FF;
+ color: #0000FF;
padding: 0px;
}
@@ -1073,7 +1072,7 @@ span.remain {
}
#predef_form {
- margin-left:20%;
+ margin-left:35%;
width:60%;
position: absolute;
}
@@ -1511,9 +1510,23 @@ ul.tabs {
border-bottom: 1px solid #879ed4;
padding-left: 10px
}
+ul.tabs a {
+ display:inline;
+}
+li.tabs_selected {
+ display:inline;
+ background-color: lightblue;
+ color:red;
+ margin-left: 2px;
+ padding: 12px 15px 15px 15px;
+ border-top-left-radius: 0px;
+ border-top-right-radius: 15px;
+ border:1px #879ed4 solid;
+
+}
li.tabs {
display:inline;
- background-color: grey;
+ background-color: blue;
color:wheat;margin-left: 2px;
padding: 15px 15px 0px 15px;
border-top-left-radius: 15px;
@@ -1523,7 +1536,7 @@ li.tabs {
}
li.tabs:hover {
display:inline;
- background-color: blue;
+ background-color: lightblue;
color:wheat;margin-left: 2px;
padding: 15px 15px 0px 15px;
border-top-left-radius: 15px;
@@ -1531,12 +1544,12 @@ li.tabs:hover {
border:1px #879ed4 solid;
}
-li.tabs a {
+ul.tabs a {
text-decoration: none;
color:white;
display:inline;
}
-li.tabs a:hover {
+ul.tabs a:hover {
text-decoration: none;
color:white;
display:inline;
@@ -1606,3 +1619,15 @@ hr {
height:5px;
}
+tr.highlight{
+ font-weight: bolder;
+ font-size:14px;
+ background-color: navy;
+ color:white !important;
+ border-width: 2px;
+ border-style: solid;
+ border-color: blue;
+}
+*|*:link {
+ color: inherit;
+}
diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php
index 17c276f..03e258d 100644
--- a/include/class_acc_ledger.php
+++ b/include/class_acc_ledger.php
@@ -600,7 +600,7 @@ class Acc_Ledger extends jrn_def_sql
* @param$sql is the sql stmt, normally created by build_search_sql
* @param$offset the offset
* @param$p_paid if we want to see info about payment
- \code
+ @code
// Example
// Build the sql
list($sql,$where)=$Ledger->build_search_sql($_GET);
@@ -618,12 +618,12 @@ class Acc_Ledger extends jrn_def_sql
// show nav bar
echo $bar;
- \endcode
- * \see build_search_sql
- * \see display_search_form
- * \see search_form
+ @endcode
+ * @see build_search_sql
+ * @see display_search_form
+ * @see search_form
- * \return HTML string
+ * @return HTML string
*/
public function list_operation_to_reconcile($sql)
diff --git a/include/class_acc_ledger_sold.php
b/include/class_acc_ledger_sold.php
index 7242caf..5d01d2b 100644
--- a/include/class_acc_ledger_sold.php
+++ b/include/class_acc_ledger_sold.php
@@ -871,7 +871,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$fname = new Fiche($this->db);
$fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
$r.='<h2>' . "Payé par " . ${'e_mp_qcode_' . $e_mp} .
- " " . $fname->getName() . '</H2> ' . '<p class="decale">'
. _('Déduction acompte ') . h($acompte) . '</p>' .
+ " " . $fname->getName() . '</h2> ' . '<p class="decale">'
. _('Déduction acompte ') . h($acompte) . '</p>' .
_('Libellé :') . h($e_comm_paiement) ;
$r.='<br>';
}
diff --git a/include/template/ledger_detail_ach.php
b/include/template/ledger_detail_ach.php
index 96f8471..5752e88 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -85,18 +85,18 @@
</tr>
</table>
- </td><td>
- <table style="border:solid 1px yellow">
- <tr>
- <td>
+ </td>
+ <td
style="width:50%;height:100%;vertical-align:top;text-align: center">
+ <table style="width:99%;height:100%;vertical-align:top;">
+ <tr style="height: 5%">
+ <td style="text-align:center;vertical-align: top">
Note
</td></tr>
<tr>
- <td>
+ <td style="text-align:center;vertical-align: top">
<?php
$inote = new ITextarea('jrn_note');
- $inote->width = 25;
- $inote->heigh = 5;
+ $inote->style=' class="itextarea"
style="width:90%;height:100%;"';
$inote->value = strip_tags($obj->det->note);
echo $inote->input();
?>
@@ -245,82 +245,7 @@
</div>
- <div class="myfieldset">
- <h1 class="legend"><?php echo _('Ecritures comptables') ?></h1>
-
-
- <?php
- /* if it is not in a popup, the details are hidden */
- if ($div != 'popup')
- {
- $ib = new IButton("a" . $div);
- $ib->label = 'Afficher';
- $ib->javascript = "g('detail_" . $div .
"').style.display='block';g('a" . $div . "').style.display='none';";
- echo $ib->input();
- echo '<div id="detail_' . $div . '" class="content"
style="display:none">';
- $ib = new IButton("h" . $div);
- $ib->label = 'Cacher';
- $ib->javascript = "g('detail_" . $div .
"').style.display='none';g('a" . $div . "').style.display='block';";
- echo $ib->input();
- } else
- echo '<div class="content">';
- $detail = new Acc_Misc($cn, $obj->jr_id);
- $detail->get();
- ?>
- <table class="result">
- <tr>
- <?php
- echo th(_('Poste Comptable'));
- echo th(_('Quick Code'));
- echo th(_('Libellé'));
- echo th(_('Débit'), ' style="text-align:right"');
- echo th(_('Crédit'), ' style="text-align:right"');
- echo '</tr>';
- for ($e = 0; $e < count($detail->det->array); $e++)
- {
- $row = '';
- $q = $detail->det->array;
- $view_history = sprintf('<A class="detail"
style="text-decoration:underline"
HREF="javascript:view_history_account(\'%s\',\'%s\')" >%s</A>',
$q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']);
- $row.=td($view_history);
- if ($q[$e]['j_qcode'] != '')
- {
- $fiche = new Fiche($cn);
- $fiche->get_by_qcode($q[$e]['j_qcode']);
- $view_history = sprintf('<A class="detail"
style="text-decoration:underline"
HREF="javascript:view_history_card(\'%s\',\'%s\')" >%s</A>', $fiche->id,
$gDossier, $q[$e]['j_qcode']);
- } else
- $view_history = '';
- $row.=td($view_history);
-
- if ($q[$e]['j_text']=="")
- {
- if ($q[$e]['j_qcode'] != '')
- {
- // nom de la fiche
- $ff = new Fiche($cn);
- $ff->get_by_qcode($q[$e]['j_qcode']);
- $row.=td($ff->strAttribut(h(ATTR_DEF_NAME)));
- } else
- {
- // libellé du compte
- $name = $cn->get_value('select pcm_lib from
tmp_pcmn where pcm_val=$1', array($q[$e]['j_poste']));
- $row.=td(h($name));
- }
- }
- else
- $row.=td(h($q[$e]['j_text']));
-
- $montant = td(nbm($q[$e]['j_montant']), 'class="num"');
- $row.=($q[$e]['j_debit'] == 't') ? $montant : td('');
- $row.=($q[$e]['j_debit'] == 'f') ? $montant : td('');
- $class=($e%2==0)?' class="even"':'class="odd"';
-
- echo tr($row,$class);
- }
- ?>
- </table>
- </div>
-</div>
<?php
require_once('ledger_detail_bottom.php');
diff --git a/include/template/ledger_detail_bottom.php
b/include/template/ledger_detail_bottom.php
index 9d259d2..c551d09 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -1,9 +1,122 @@
<?php
+/**
+//This file is part of NOALYSS and is under GPL
+//see licence.txt
+*/
+/**
+ * @brief show the common parts of operation details
+ *
+ * Variables : $div = popup or box (det[0-9]
+ *
+ */
+$a_tab['writing_div']=array('id'=>'writing_div'.$div,'label'=>_('Ecriture
Comptable'),'display'=>'none');
+$a_tab['info_operation_div']=array('id'=>'info_operation_div'.$div,'label'=>_('Information'),'display'=>'none');
+$a_tab['linked_operation_div']=array('id'=>'linked_operation_div'.$div,'label'=>_('Opérations
liées'),'display'=>'none');
+$a_tab['document_operation_div']=array('id'=>'document_operation_div'.$div,'label'=>_('Document'),'display'=>'block');
+$a_tab['linked_action_div']=array('id'=>'linked_action_div'.$div,'label'=>_('Actions
liées'),'display'=>'none');
+
+// show tabs
+if ( $div != "popup") :
+ $a_tab['document_operation_div']['display']='block';
+?>
+<ul class="tabs">
+ <?php foreach ($a_tab as $idx=>$a_value): ?>
+ <?php
+ $class=($a_value['display']=='block') ?"tabs_selected":"tabs"
+ ?>
+ <li class="<?php echo $class?>">
+ <?php $div_tab_id=$a_value['id'];?>
+ <a href="javascript:void(0)"
onclick="unselect_other_tab(this.parentNode.parentNode);var
tab=Array('writing_div<?php echo $div?>','info_operation_div<?php echo
$div?>','linked_operation_div<?php echo $div?>','document_operation_div<?php
echo $div?>','linked_action_div<?php echo
$div?>');this.parentNode.className='tabs_selected' ;show_tabs(tab,'<?php echo
$div_tab_id; ?>');"><?php echo $a_value['label']?></a>
+ </li>
+ <?php endforeach; ?>
+</ul>
+<?php
+else :
+ foreach ($a_tab as $idx=>$a_value):
+ $a_tab[$idx]['display']='block';
+ endforeach;
+endif;
+?>
+
+
+<?php
$cmd=new IText('BON_COMMANDE',$obj->info->command);
$other=new IText('OTHER',$obj->info->other);
?>
-<div class="myfieldset">
- <h1 class="legend"><?php echo _("Information")?></h1>
+ <div id="writing_div<?php echo $div;?>" class="myfieldset"
style="display:<?php echo $a_tab['writing_div']['display']?>">
+ <?php
+ // display title only in popup
+ if ($div == 'popup') :
+ ?>
+ <h1 class="legend"><?php echo
$a_tab['writing_div']['label']?></h1>
+ <?php endif; ?>
+
+<div class="content">
+ <?php
+ $detail = new Acc_Misc($cn, $obj->jr_id);
+ $detail->get();
+ ?>
+ <table class="result">
+ <tr>
+ <?php
+ echo th(_('Poste Comptable'));
+ echo th(_('Quick Code'));
+ echo th(_('Libellé'));
+ echo th(_('Débit'), ' style="text-align:right"');
+ echo th(_('Crédit'), ' style="text-align:right"');
+ echo '</tr>';
+ for ($e = 0; $e < count($detail->det->array); $e++)
+ {
+ $row = '';
+ $q = $detail->det->array;
+ $view_history = sprintf('<A class="detail"
style="text-decoration:underline"
HREF="javascript:view_history_account(\'%s\',\'%s\')" >%s</A>',
$q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']);
+
+ $row.=td($view_history);
+ if ($q[$e]['j_qcode'] != '')
+ {
+ $fiche = new Fiche($cn);
+ $fiche->get_by_qcode($q[$e]['j_qcode']);
+ $view_history = sprintf('<A class="detail"
style="text-decoration:underline"
HREF="javascript:view_history_card(\'%s\',\'%s\')" >%s</A>', $fiche->id,
$gDossier, $q[$e]['j_qcode']);
+ } else
+ $view_history = '';
+ $row.=td($view_history);
+
+ if ($q[$e]['j_text']=="")
+ {
+ if ($q[$e]['j_qcode'] != '')
+ {
+ // nom de la fiche
+ $ff = new Fiche($cn);
+ $ff->get_by_qcode($q[$e]['j_qcode']);
+ $row.=td($ff->strAttribut(h(ATTR_DEF_NAME)));
+ } else
+ {
+ // libellé du compte
+ $name = $cn->get_value('select pcm_lib from
tmp_pcmn where pcm_val=$1', array($q[$e]['j_poste']));
+ $row.=td(h($name));
+ }
+ }
+ else
+ $row.=td(h($q[$e]['j_text']));
+
+ $montant = td(nbm($q[$e]['j_montant']), 'class="num"');
+ $row.=($q[$e]['j_debit'] == 't') ? $montant : td('');
+ $row.=($q[$e]['j_debit'] == 'f') ? $montant : td('');
+ $class=($e%2==0)?' class="even"':'class="odd"';
+
+ echo tr($row,$class);
+ }
+ ?>
+ </table>
+ </div>
+</div>
+<div id="info_operation_div<?php echo $div;?>" class="myfieldset"
style="display:<?php echo $a_tab['info_operation_div']['display']?>">
+ <?php
+ // display title only in popup
+ if ($div == 'popup') :
+ ?>
+ <h1 class="legend"><?php echo
$a_tab['info_operation_div']['label']?></h1>
+ <?php endif; ?>
<table>
<tr>
<td><?php echo _(" Bon de commande")?> :</td><td> <?php echo
HtmlInput::infobulle(31)." ".$cmd->input(); ?></td>
@@ -13,10 +126,13 @@
</tr>
</table>
</div>
-<div class="myfieldset">
-<h1 class="legend">
-<?php echo _('Opérations liées');?>
-</h1>
+<div id="linked_operation_div<?php echo $div;?>" style="display:<?php echo
$a_tab['linked_operation_div']['display']?>" class="myfieldset">
+ <?php
+ // display title only in popup
+ if ($div == 'popup') :
+ ?>
+ <h1 class="legend"><?php echo
$a_tab['linked_operation_div']['label']?></h1>
+ <?php endif; ?>
<?php
$oRap=new Acc_Reconciliation($cn);
$oRap->jr_id=$jr_id;
@@ -62,32 +178,38 @@ if ( $access=='W') {
</div>
<?php
$array = Follow_Up::get_all_operation($jr_id);
-if (count($array) > 0)
-{
?>
- <div class="myfieldset">
- <h1 class="legend">Actions liées</h1>
+ <div id="linked_action_div<?php echo $div;?>" style="display:<?php echo
$a_tab['linked_action_div']['display']?>" class="myfieldset">
+ <?php
+ // display title only in popup
+ if ($div == 'popup') :
+ ?>
+ <h1 class="legend"><?php echo
$a_tab['linked_action_div']['label']?></h1>
+ <?php endif; ?>
<?php
/**
- * show eventually action
+ * show possible linked actions
*/
$array = Follow_Up::get_all_operation($jr_id);
echo '<ul style="list-style-type:square;">';
for ($i = 0; $i < count($array); $i++)
{
+ $remove='';
+ if ( $access=='W')
$remove=HtmlInput::button_action_remove_operation($array[$i]['ago_id']);
if ( $div == 'popup')
{
- echo
'<li>'.HtmlInput::detail_action($array[$i]['ag_id'], h($array[$i]['ag_ref']."
".$array[$i]['ag_title']),0).'</li>';
+ echo '<li
id="op'.$array[$i]['ago_id'].'">'.HtmlInput::detail_action($array[$i]['ag_id'],
h($array[$i]['ag_ref']." ".$array[$i]['ag_title']),0).$remove.'</li>';
}
else
{
- echo
'<li>'.HtmlInput::detail_action($array[$i]['ag_id'], h($array[$i]['ag_ref']."
".$array[$i]['ag_title']),1).'</li>';
+ echo '<li
id="op'.$array[$i]['ago_id'].'">'.HtmlInput::detail_action($array[$i]['ag_id'],
h($array[$i]['ag_ref']." ".$array[$i]['ag_title']),1).$remove.'</li>';
}
}
echo '</ul>';
-
+ $related=new IRelated_Action('related');
+ $related->id='related'.$div;
+ if ( $access=='W') echo $related->input();
echo '</div>';
-}
?>
<?php
diff --git a/include/template/ledger_detail_file.php
b/include/template/ledger_detail_file.php
index 923452d..2dc67b0 100644
--- a/include/template/ledger_detail_file.php
+++ b/include/template/ledger_detail_file.php
@@ -10,6 +10,6 @@
$str='?'.dossier::get()."&div=$div&act=file&jr_id=$jr_id";
if ( isset ($_REQUEST['ajax'])) $str.="&ajax=1";
?>
-<div class="noprint">
+<div id="document_operation_div<?php echo $div;?>" class="noprint"
style="display:<?php echo $a_tab['document_operation_div']['display']?>">
<iframe frameborder=0 scrolling="no" style="margin:0px;padding:
0px;border:0px;width:100%;height:90px;overflow:hidden" src="<?php echo
'ajax_ledger.php'.$str; ?>"></iframe>
</div>
\ No newline at end of file
diff --git a/include/template/ledger_detail_fin.php
b/include/template/ledger_detail_fin.php
index 4ac66c1..f541b77 100644
--- a/include/template/ledger_detail_fin.php
+++ b/include/template/ledger_detail_fin.php
@@ -67,26 +67,27 @@ echo td(_('Pièce')).td($itext->input());
</tr>
</table>
-</td><td style='width:50%'>
- <table style="width:100%;border:solid 1px yellow">
-<tr>
-<td>
- Note
-</td></tr>
-<tr>
-<td>
-<?php
-$inote=new ITextarea('jrn_note');
-$inote->width=25;
-$inote->heigh=5;
-$inote->value=strip_tags($obj->det->note);
-echo $inote->input();
-?>
-
-</td>
-</tr>
-</table>
</td>
+ <td
style="width:50%;height:100%;vertical-align:top;text-align: center">
+ <table style="width:99%;height:100%;vertical-align:top;">
+ <tr style="height: 5%">
+ <td style="text-align:center;vertical-align: top">
+ Note
+ </td></tr>
+ <tr>
+ <td style="text-align:center;vertical-align: top">
+ <?php
+ $inote = new ITextarea('jrn_note');
+ $inote->style=' class="itextarea"
style="width:90%;height:100%;"';
+ $inote->value = strip_tags($obj->det->note);
+ echo $inote->input();
+ ?>
+
+ </td>
+ </tr>
+ </table>
+ </td>
+
</tr>
</table>
diff --git a/include/template/ledger_detail_misc.php
b/include/template/ledger_detail_misc.php
index b97b4a8..517f227 100644
--- a/include/template/ledger_detail_misc.php
+++ b/include/template/ledger_detail_misc.php
@@ -53,27 +53,26 @@ require_once ('class_anc_plan.php');
</td></tr>
</table>
</td>
- <td style='width:50%'>
- <table style="width:100%;border:solid 1px yellow">
- <tr>
- <td>
- Note
- </td>
- </tr>
- <tr>
- <td>
- <?php
- $inote=new
ITextarea('jrn_note');
- $inote->width=25;
- $inote->heigh=5;
-
$inote->value=strip_tags($obj->det->note);
- echo $inote->input();
- ?>
-
- </td>
- </tr>
- </table>
-</td>
+ <td
style="width:50%;height:100%;vertical-align:top;text-align: center">
+ <table style="width:99%;height:100%;vertical-align:top;">
+ <tr style="height: 5%">
+ <td style="text-align:center;vertical-align: top">
+ Note
+ </td></tr>
+ <tr>
+ <td style="text-align:center;vertical-align: top">
+ <?php
+ $inote = new ITextarea('jrn_note');
+ $inote->style=' class="itextarea"
style="width:90%;height:100%;"';
+ $inote->value = strip_tags($obj->det->note);
+ echo $inote->input();
+ ?>
+
+ </td>
+ </tr>
+ </table>
+ </td>
+
</tr>
</table>
diff --git a/include/template/ledger_detail_ven.php
b/include/template/ledger_detail_ven.php
index c4ec337..0d10c6d 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -94,26 +94,26 @@ echo $ipaid->input();
</table>
</td>
- <td style='width:50%'>
- <table style="width:100%;border:solid 1px yellow">
- <tr>
- <td>
- <?php echo _("Note")?>
+ <td
style="width:50%;height:100%;vertical-align:top;text-align: center">
+ <table style="width:99%;height:100%;vertical-align:top;">
+ <tr style="height: 5%">
+ <td style="text-align:center;vertical-align: top">
+ Note
</td></tr>
<tr>
- <td>
-<?php
-$inote = new ITextarea('jrn_note');
-$inote->width = 25;
-$inote->heigh = 5;
-$inote->value = strip_tags($obj->det->note);
-echo $inote->input();
-?>
+ <td style="text-align:center;vertical-align: top">
+ <?php
+ $inote = new ITextarea('jrn_note');
+ $inote->style=' class="itextarea"
style="width:90%;height:100%;"';
+ $inote->value = strip_tags($obj->det->note);
+ echo $inote->input();
+ ?>
</td>
</tr>
</table>
</td>
+
</tr>
</table>
<div class="myfieldset">
@@ -248,78 +248,7 @@ echo $inote->input();
</tr>
</table>
</div>
- <div class="myfieldset">
- <h1 class="legend">
- <?php echo _('Ecritures comptables') ?>
- </h1>
- <?php
- /* if it is not in a popup, the details are hidden */
- if ($div != 'popup')
- {
- $ib = new IButton("a" . $div);
- $ib->label = 'Afficher';
- $ib->javascript = "g('detail_" . $div .
"').style.display='block';g('a" . $div . "').style.display='none';";
- echo $ib->input();
- echo '<div id="detail_' . $div . '" style="display:none">';
- $ib = new IButton("h" . $div);
- $ib->label = 'Cacher';
- $ib->javascript = "g('detail_" . $div .
"').style.display='none';g('a" . $div . "').style.display='block';";
- echo $ib->input();
- } else
- echo '<div>';
-
- $detail = new Acc_Misc($cn, $obj->jr_id);
- $detail->get();
- ?>
-
- <table class="result">
- <tr>
- <?php
- echo th(_('Poste Comptable'));
- echo th(_('Quick Code'));
- echo th(_('Libellé'));
- echo th(_('Débit'), ' style="text-align:right"');
- echo th(_('Crédit'), ' style="text-align:right"');
- echo '</tr>';
- for ($e = 0; $e < count($detail->det->array); $e++)
- {
- $row = '';
- $q = $detail->det->array[$e];
- $view_history = sprintf('<A class="detail"
style="text-decoration:underline"
HREF="javascript:view_history_account(\'%s\',\'%s\')" >%s</A>', $q['j_poste'],
$gDossier, $q['j_poste']);
-
- $row.=td($view_history);
- if ($q['j_qcode'] != '')
- {
- $fiche = new Fiche($cn);
- $fiche->get_by_qcode($q['j_qcode']);
- $view_history = sprintf('<A class="detail"
style="text-decoration:underline"
HREF="javascript:view_history_card(\'%s\',\'%s\')" >%s</A>', $fiche->id,
$gDossier, $q['j_qcode']);
- } else
- $view_history = '';
- $row.=td($view_history);
-
- if ($q['j_qcode'] != '')
- {
- // nom de la fiche
- $ff = new Fiche($cn);
- $ff->get_by_qcode($q['j_qcode']);
- $row.=td($ff->strAttribut(h(ATTR_DEF_NAME)));
- } else
- {
- // libellé du compte
- $name = $cn->get_value('select pcm_lib from
tmp_pcmn where pcm_val=$1', array($q['j_poste']));
- $row.=td(h($name));
- }
- $montant = td(nbm($q['j_montant']), 'class="num"');
- $row.=($q['j_debit'] == 't') ? $montant : td('');
- $row.=($q['j_debit'] == 'f') ? $montant : td('');
- $class=($e%2==0)?' class="even"':'class="odd"';
- echo tr($row,$class);
- }
- ?>
- </table>
- </div>
-</div>
+
<?php
require_once('ledger_detail_bottom.php');
?>
-</div>
- [Noalyss-commit] [noalyss] 05/14: Task #1044 - Implementation de Test Ajout mécanisme test pour ajax, (continued)
- [Noalyss-commit] [noalyss] 05/14: Task #1044 - Implementation de Test Ajout mécanisme test pour ajax, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 06/14: Task #1044 - Implementation de Test Ajout mécanisme test pour ajax, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 02/14: Task #1042 - Amélioration VERIFBIL VERIFBIL typo, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 07/14: Amélioration détail opération : actions attachées, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 08/14: Amélioration détail opération : actions attachées, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 10/14: typo, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 12/14: typo, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 09/14: Task #1045 - Amélioration apparence : Bouton pour ajout action, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 14/14: Ajout function pour enlever relation opération - action, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 11/14: Amélioration détail opération : actions attachées, Dany De Bontridder, 2014/11/16
- [Noalyss-commit] [noalyss] 13/14: Task #1045 - Amélioration apparence : Détail opération : avec onglet + action liée (ajout + suppression),
Dany De Bontridder <=