[Noalyss-commit] [noalyss] 90/219: Task #0001481: Encodage Vente, Achat, Fin ou OD 1. S'il n'y a qu'une seule catégorie de fiche , il n'est plus nécessaire d'afficher le choix (puisqu'il n'y en a qu'un) 2. Avoir pour chaque ligne un bouton ajout fiche

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit e25a0587c03229c533bcd77e2341ca4f139e525e
Author: Dany De Bontridder <address@hidden>
Date:   Wed Oct 18 22:04:33 2017 +0200

    Task #0001481: Encodage Vente, Achat, Fin ou OD
    1. S'il n'y a qu'une seule catégorie de fiche , il n'est plus nécessaire 
d'afficher le choix (puisqu'il n'y en a qu'un)
    2. Avoir pour chaque ligne un bouton ajout fiche
---
 include/template/form_ledger_detail.php | 64 +++++++++++++++------------------
 include/template/form_ledger_fin.php    |  7 ++--
 2 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/include/template/form_ledger_detail.php 
b/include/template/form_ledger_detail.php
index 29cd8d4..52dab92 100644
--- a/include/template/form_ledger_detail.php
+++ b/include/template/form_ledger_detail.php
@@ -30,7 +30,7 @@
     <tr>
         <td><?php echo $f_type?></td>
         <td>
-            <?php echo $f_client_qcode?><?php echo $f_client_bt?> <?php echo 
$f_client?></td>
+            <?php echo $f_client_qcode?><?php echo $f_client_bt?><?php echo 
$str_add_button_tiers;?> <?php echo $f_client?></td>
         </td>
     </tr>
     
@@ -59,19 +59,17 @@
      
       
 <br>
-<?php echo $str_add_button?>
-
 <h2><?php echo $f_legend_detail?></h2>
-<table id="sold_item" style="width:100%;border-width: 0px">
+<table id="sold_item" >
 <tr>
 <th style="width:auto"colspan="2">Code <?php echo 
HtmlInput::infobulle(0)?></th>
-      <th><?php echo _('Dénomination')?></th>
+      <th class="visible_gt800 visible_gt1155"><?php echo 
_('Dénomination')?></th>
 <?php if ($flag_tva =='Y') : ?>
       <th><?php echo _('prix/unité htva')?><?php echo 
HtmlInput::infobulle(6)?></th>
       <th><?php echo _('quantité')?></th>
-      <th><?php echo _('Total HTVA')?></th>
+      <th class="visible_gt800" ><?php echo _('Total HTVA')?></th>
          <th><?php echo _('tva')?></th>
-      <th><?php echo _('tot.tva')?></th>
+      <th class="visible_gt800"><?php echo _('tot.tva')?></th>
       <th><?php echo _('tvac')?></th>
 <?php else: ?>
          <th><?php echo _('prix/unité ')?><?php echo 
HtmlInput::infobulle(6)?></th>
@@ -84,17 +82,19 @@
 </tr>
 <?php foreach ($array as $item) {
 echo '<tr>';
+// echo "<td>";
 echo $item['quick_code'];
-echo '<td>'.$item['bt'].'</td>';
+// echo "</td>";
+echo '<td>'.$item['bt'].$str_add_button_item.'</td>';
 ?>
-<td style="width: 75%;"><?php echo $item['denom'] ?></td>
+<td class="visible_gt800 visible_gt1155"><?php echo $item['denom'] ?></td>
 <?php 
 echo td($item['pu']);
 echo td($item['quantity' ]);
-echo td($item['htva']);
+echo td($item['htva'],' class="visible_gt800" ');
 if ($flag_tva=='Y')  {
        echo td($item['tva']);
-       echo td($item['amount_tva'].$item['hidden']);
+       echo td($item['amount_tva'].$item['hidden'],' class="visible_gt800" ');
 
 }
 echo td($item['tvac']);
@@ -102,33 +102,25 @@ echo '</tr>';
 }
 
 ?>
+<tfoot id="sum">
+    <tr  class="highlight">
+    <td> <?php echo _("Total")?>  </td>
+    <td>   </td>
+    <td class="visible_gt800 visible_gt1155">   </td>
+    <td>   </td>
+    <td>   </td>
+    <td class="num visible_gt800">  <span id="htva">0.0</span></td>
+    <td>   </td>
+ <?php if ( $flag_tva=='Y' )  : ?>    
+    <td class="num visible_gt800">  <span id="tva">0.0</span> </td>
+    <td class="num">  <span id="tvac" >0.0</span> </td>
+  <?php    endif;     ?>  
+    </tr>
+</tfoot>
 </table>
 
-<div 
style="position:float;float:right;text-align:right;padding-right:5px;font-size:1.2em;font-weight:bold">
-      <?php echo 
HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"'); ?>
- </div>
-
-    <div 
style="position:float;float:right;text-align:left;font-size:1.2em;font-weight:bold;"
 id="sum">
-    <br><span id="htva">0.0</span>
-<?php
-    if ( $flag_tva=='Y' )  : ?>
-     <br><span id="tva">0.0</span>
-    <br><span id="tvac" >0.0</span>
-<?php    endif;     ?>
-
- </div>
-
-<div 
style="position:float;float:right;text-align:right;padding-right:5px;font-size:1.2em;font-weight:bold;">
-<?php
-       if ( $flag_tva =='Y') :
-       ?>
-  <br><?php echo _('Total HTVA')?>
-  <br><?php echo _('Total TVA')?>
-  <br><?php echo _('Total TVAC')?>
- <?php else:  ?>
-     <br><?php echo _('Total')?>
-<?php endif; ?>
-</div>
+<?php echo 
HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"'); ?>
 
+ 
 
 
diff --git a/include/template/form_ledger_fin.php 
b/include/template/form_ledger_fin.php
index 4d91387..0ef72ff 100644
--- a/include/template/form_ledger_fin.php
+++ b/include/template/form_ledger_fin.php
@@ -33,14 +33,13 @@
    <?php echo _('Solde début') ?> <?php echo $wFirst->input();?>
 <?php echo _('Solde Fin')?> <?php echo $wLast->input();?>
 </fieldset>
-<?php echo $str_add_button?>
    <fieldset><legend><?php echo _('Opérations')?></legend>
 <table id="fin_item" width="100%" border="0">
 <tr>
 <th id="thdate" style="display:none;text-align: left"><?php echo 
_('Date')?><?php echo HtmlInput::infobulle(16)?></TH>
 <th style="text-align: left;width: auto">code<?HtmlInput::infobulle(0)?></TH>
    <th style="text-align: left"><?php echo _('Fiche')?></TH>
-   <th style="text-align: left"><?php echo _('Commentaire')?></TH>
+   <th style="text-align: left" class="visible_gt800 visible_gt1155"><?php 
echo _('Commentaire')?></TH>
    <th style="text-align: left"><?php echo _('Montant')?></TH>
    <th style="text-align: left;width:auto"colspan="2"> <?php echo _('Op. 
Concernée(s)')?></th>
 </tr>
@@ -52,9 +51,9 @@ foreach ($array as $item) {
 echo '<tr>';
 // echo td($item['dateop']);
 echo td($item['dateop'],' style="display:none" id="tdchdate'.$i.'"');
-echo td($item['qcode'].$item['search']);
+echo td($item['qcode'].$item['search'].$str_add_button);
 echo td($item['cname']);
-echo td($item['comment']);
+echo td($item['comment'],' class="visible_gt800 visible_gt1155" ');
 echo td($item['amount']);
 echo td($item['concerned']);
 echo '</tr>';