[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 92/219: Esthetic : hide some columns when scr
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 92/219: Esthetic : hide some columns when screen too small |
Date: |
Mon, 18 Dec 2017 13:22:43 -0500 (EST) |
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>';
- [Noalyss-commit] [noalyss] 75/219: PRINTJRN Use new class http_input, (continued)
- [Noalyss-commit] [noalyss] 75/219: PRINTJRN Use new class http_input, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 82/219: Fix Doxygen issue : @example must be in a function otherwise the detailed section of Doxygen disappear, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 64/219: Inplace_Edit : cosmetic, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 137/219: Infobulle : avoid that the info balloon exceed limit of the display, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 193/219: SansationLight add the readme.txt file with license, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 85/219: Task #1349 : si une seule catégorie de fiche , alors on ne doit pas la choisir, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 07/219: Bug : cannot print action in profil Cannot add a export / printing in profile, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 79/219: PRINTGL : do not print accounting without operation, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 182/219: Icon move / fix, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 111/219: Comment Table, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 92/219: Esthetic : hide some columns when screen too small,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 39/219: Acc_Reconciliation : improve function get_amount_noautovat, set the prepare query inside the function, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 172/219: Merge branch 'master' of ns3:/srv/git/noalyss, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 143/219: ANC : balance analytique / comptabilité, corrige bug SQL, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 155/219: Task #1493 Encodage VEN , ACH, Ordre des opérations Déplacement du bouton modèle d'opérations, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 130/219: ANC groupe : little bug in PLANANC, allow a group null, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 142/219: ANC : balance croisée double fixe SQL query, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 160/219: INSTALL : check PHP version minimum 5.5, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 219/219: Task #1378 : show only the ledger of a given type, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 215/219: ICheckBox : add attribute to allow to select checkbox thanks its attribute with the js select_checkbox_attribute, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 170/219: Traduction, Dany De Bontridder, 2017/12/18