diff --git a/html/style-color.css b/html/style-color.css
index 14471dd1e..650a01b82 100644
--- a/html/style-color.css
+++ b/html/style-color.css
@@ -938,8 +938,7 @@ table.table_large td, table.result td
table.info_op
{
font-size:18;
- margin-right:30%;
- width:20%;
+ width:100%;
}
table.info_op tr
diff --git a/html/style-light.css b/html/style-light.css
index 0dbf399b9..7e2cc13fe 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -940,8 +940,7 @@ table.table_large td, table.result td
table.info_op
{
font-size:18;
- margin-right:30%;
- width:20%;
+ width:100%;
}
table.info_op tr
diff --git a/html/style.css b/html/style.css
index 752ab279e..a9edec017 100644
--- a/html/style.css
+++ b/html/style.css
@@ -940,9 +940,7 @@ table.table_large td, table.result td
table.info_op
{
font-size:18;
- margin-right:30%;
- width:20%;
-
+ width:100%;
}
table.info_op tr
{
diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php
index 51e7622da..f57f0f93c 100644
--- a/include/class_acc_ledger.php
+++ b/include/class_acc_ledger.php
@@ -1337,8 +1337,8 @@ class Acc_Ledger extends jrn_def_sql
{
$lPeriode->find_periode($e_date);
}
- $total=0;
- bcscale(2);
+ $total_deb=0;$total_cred=0;
+ bcscale(2);
$ret="";
$ret.="
";
@@ -1422,10 +1422,15 @@ class Acc_Ledger extends jrn_def_sql
continue;
$ret.="| ".h(${"ld".$i}).HtmlInput::hidden('ld'.$i,${'ld'.$i})." | ";
if ( isset(${"ck$i"}))
- $ret.="".nbm(${"amount".$i}).HtmlInput::hidden('amount'.$i,${'amount'.$i})." | ".td("");
- else
- $ret.=td("")."".nbm(${"amount".$i}).HtmlInput::hidden('amount'.$i,${'amount'.$i})." | ";
- $total=bcadd($total,${"amount".$i});
+ {
+ $ret.="".nbm(${"amount".$i}).HtmlInput::hidden('amount'.$i,${'amount'.$i})." | ".td("");
+ $total_deb=bcadd($total_deb,${'amount'.$i});
+ }
+ else
+ {
+ $ret.=td("")."".nbm(${"amount".$i}).HtmlInput::hidden('amount'.$i,${'amount'.$i})." | ";
+ $total_cred=bcadd($total_cred,${"amount".$i});
+ }
$ret.="";
$ret.=(isset(${"ck$i"}))?HtmlInput::hidden('ck'.$i,${'ck'.$i}):"";
$ret.=" | ";
@@ -1456,7 +1461,7 @@ class Acc_Ledger extends jrn_def_sql
$ret.="";
}
- $ret.=tr(td('').td(_('Totaux')).td($total,'class="num"').td($total,'class="num"'),'class="footer"');
+ $ret.=tr(td('').td(_('Totaux')).td($total_deb,'class="num"').td($total_cred,'class="num"'),'class="footer"');
$ret.="
";
if ( $g_parameter->MY_ANALYTIC!='nu' && $p_readonly==false)
$ret.='';
@@ -1586,11 +1591,11 @@ class Acc_Ledger extends jrn_def_sql
$ret.=$f_add_button->input();
$ret.='';
$ret.=''.
- '| Quickcode'.$info.' | '.
- ''._('Poste').$info_poste.' | '.
- ''._('Libellé').' | '.
- ''._('Montant').' | '.
- ''._('Débit').' | '.
+ 'Quickcode'.$info.' | '.
+ ''._('Poste').$info_poste.' | '.
+ ''._('Libellé').' | '.
+ ''._('Montant').' | '.
+ ''._('Débit').' | '.
'
';
diff --git a/include/operation_ods_new.inc.php b/include/operation_ods_new.inc.php
index 3dd6fb0de..65a2206ff 100644
--- a/include/operation_ods_new.inc.php
+++ b/include/operation_ods_new.inc.php
@@ -92,7 +92,7 @@ echo HtmlInput::button('add', _('Ajout d\'une ligne'), 'onClick="quick_writing_a
echo HtmlInput::submit('summary', _('Sauvez'));
-echo '';
+echo '
';
echo '
'.
''.td(_('Débit')) . ' | ' .
td(_('Crédit')) . ' | ' .