[Noalyss-commit] [noalyss] 92/219: Esthetic : hide some columns when screen too small

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 0b4aa5ef80d4304b8e1d8bc69586d7ccc04c4cdd
Author: Dany De Bontridder <address@hidden>
Date:   Thu Oct 19 18:52:54 2017 +0200

    Esthetic : hide some columns when screen too small
---
 include/class/acc_ledger.class.php      |  4 ++--
 include/class/acc_ledger_sold.class.php | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/include/class/acc_ledger.class.php 
b/include/class/acc_ledger.class.php
index 481364b..25b2bb2 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -1707,7 +1707,7 @@ class Acc_Ledger extends jrn_def_sql
                $ret.='<tr>' .
                                '<th style="text-align:left">Quickcode' . $info 
. '</th>' .
                                '<th style="text-align:left">' . _('Poste') . 
$info_poste . '</th>' .
-                               '<th style="text-align:left">' . _('Libellé') . 
'</th>' .
+                               '<th class="visible_gt800 visible_gt1155" 
style="text-align:left">' . _('Libellé') . '</th>' .
                                '<th style="text-align:left">' . _('Montant') . 
'</th>' .
                                '<th style="text-align:left">' . _('Débit') . 
'</th>' .
                                '</tr>';
@@ -1792,7 +1792,7 @@ class Acc_Ledger extends jrn_def_sql
                        $ret.='<td>' . $poste->input() .
                                        '<script> 
document.getElementById(\'poste' . $i . '\').onblur=function(){ if 
(trim(this.value) !=\'\') {document.getElementById(\'qc_' . $i . 
'\').value="";}}</script>' .
                                        '</td>';
-                       $ret.='<td>' . $line_desc->input() . '</td>';
+                       $ret.='<td class="visible_gt800 visible_gt1155">' . 
$line_desc->input() . '</td>';
                        $ret.='<td>' . $amount->input() . '</td>';
                        $ret.='<td>' . $deb->input() . '</td>';
                        $ret.='</tr>';
diff --git a/include/class/acc_ledger_sold.class.php 
b/include/class/acc_ledger_sold.class.php
index aa4de82..9d148fb 100644
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@ -491,6 +491,11 @@ class Acc_Ledger_Sold extends Acc_Ledger {
             // Save the payer
             //----------------------------------------
             if ($e_mp != 0) {
+                /** 
+                 * Date
+                 */
+                $pay_date=($mp_date=="")?$e_date:$mp_date;
+                
                 /* mp */
                 $mp = new Acc_Payment($this->db, $e_mp);
                 $mp->load();
@@ -507,7 +512,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
 
                 /* Insert paid by  */
                 $acc_pay = new Acc_Operation($this->db);
-                $acc_pay->date = $e_date;
+                $acc_pay->date = $pay_date;
                 /* get the account and explode if necessary */
                 $sposte = $acfiche->strAttribut(ATTR_DEF_ACCOUNT);
                 // if 2 accounts, take only the debit one for customer
@@ -531,7 +536,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
 
                 /* Insert supplier  */
                 $acc_pay = new Acc_Operation($this->db);
-                $acc_pay->date = $e_date;
+                $acc_pay->date = $pay_date;
                 $acc_pay->poste = $poste;
                 $acc_pay->qcode = $e_client;
                 $acc_pay->amount = abs(round($famount, 2));
@@ -895,10 +900,12 @@ EOF;
             $r.=HtmlInput::hidden('e_comm_paiement', $e_comm_paiement);
             /* needed for generating a invoice */
             $r.=HtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_mp});
+            $r.=HtmlInput::hidden('mp_date', ${'mp_date'});
 
             $fname = new Fiche($this->db);
             $fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
             $r.='<h2>' . "Payé par " . ${'e_mp_qcode_' . $e_mp} .
+                    " le ".${"mp_date"}.
                     " " . $fname->getName() . '</h2> ' . '<p class="decale">' 
. _('Déduction acompte ') . h($acompte) . '</p>' .
                     _('Libellé :') . h($e_comm_paiement) ;
             $r.='<br>';