[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5520 - in phpcompta/trunk: . html/js include include/te
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r5520 - in phpcompta/trunk: . html/js include include/template |
|
Date: |
Sun, 20 Oct 2013 21:42:59 +0200 (CEST) |
Author: danydb
Date: 2013-10-20 21:42:58 +0200 (Sun, 20 Oct 2013)
New Revision: 5520
Modified:
phpcompta/trunk/html/js/infobulle.js
phpcompta/trunk/include/class_acc_ledger.php
phpcompta/trunk/include/template/ledger_search.php
phpcompta/trunk/release-note
Log:
task #0000900: Ajout d'une date de paiement : recherche histo
Modified: phpcompta/trunk/html/js/infobulle.js
===================================================================
--- phpcompta/trunk/html/js/infobulle.js 2013-10-20 19:27:54 UTC (rev
5519)
+++ phpcompta/trunk/html/js/infobulle.js 2013-10-20 19:42:58 UTC (rev
5520)
@@ -63,6 +63,7 @@
content[33]='le type vaut :<ul> <li> ME pour Menu</li> <li> PR pour
les impressions </li> <li> PL pour les plugins</li> <li> SP pour des
valeurs spéciales</li> </ul>';
content[34]='Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet';
content[35]='Cliquez sur le chemin pour ouvrir le menu';
+content[36]='Ne concerne que les journaux de type ACH & VEN, en précisant une
date ici vous excluez d\'office les autres journaux';
function showBulle(p_ctl){
d=document.getElementById('bulle');
d.innerHTML=content[p_ctl];
Modified: phpcompta/trunk/include/class_acc_ledger.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger.php 2013-10-20 19:27:54 UTC
(rev 5519)
+++ phpcompta/trunk/include/class_acc_ledger.php 2013-10-20 19:42:58 UTC
(rev 5520)
@@ -2428,7 +2428,14 @@
$selected = (isset($_REQUEST['r_jrn' . $div])) ?
$_REQUEST['r_jrn' . $div] : null;
$f_ledger = HtmlInput::select_ledger($filter_ledger, $selected,
$div);
-
+ /* Compute date for exercice */
+ $period = $g_user->get_periode();
+ $per = new Periode($this->db, $period);
+ $exercice = $per->get_exercice();
+ list($per_start, $per_end) = $per->get_limit($exercice);
+ $date_end = $per_end->last_day();
+ $date_start=$per_start->first_day();
+
/* widget for date_start */
$f_date_start = new IDate('date_start');
/* all periode or only the selected one */
@@ -2438,12 +2445,7 @@
}
else
{
- $period = $g_user->get_periode();
- $per = new Periode($this->db, $period);
- $exercice = $per->get_exercice();
- list($per_start, $per_end) = $per->get_limit($exercice);
- $f_date_start->value = $per_start->first_day();
- $date_end = $per_end->last_day();
+ $f_date_start->value=$date_start;
}
/* widget for date_end */
@@ -2457,7 +2459,13 @@
{
$f_date_end->value = $date_end;
}
-
+ /* widget for date term */
+ $f_date_paid_start=new IDate('date_paid_start');
+ $f_date_paid_end=new IDate('date_paid_end');
+
+
$f_date_paid_start->value=(isset($_REQUEST['date_paid_start']))?$_REQUEST['date_paid_start']:'';
+
$f_date_paid_end->value=(isset($_REQUEST['date_paid_end']))?$_REQUEST['date_paid_end']:'';
+
/* widget for desc */
$f_descript = new IText('desc');
$f_descript->size = 40;
@@ -2643,6 +2651,7 @@
$fil_qcode = '';
$fil_account = '';
$fil_paid = '';
+ $fil_date_paid='';
$and = '';
$g_user = new User($this->db);
@@ -2724,6 +2733,17 @@
$fil_date.=$and . " jr_date <= to_date('" . $date_end .
"','DD.MM.YYYY')";
$and = " and ";
}
+ // date paiement
+ if (isset($date_paid_start) && isDate($date_paid_start) != null)
+ {
+ $fil_date_paid = $and . " jr_date_paid >= to_date('" .
$date_paid_start . "','DD.MM.YYYY')";
+ $and = " and ";
+ }
+ if (isset($date_paid_end) && isDate($date_paid_end) != null)
+ {
+ $fil_date_paid.=$and . " jr_date_paid <= to_date('" .
$date_paid_end . "','DD.MM.YYYY')";
+ $and = " and ";
+ }
// comment
if (isset($desc) && $desc != null)
{
@@ -2770,7 +2790,7 @@
" uj_login='" . $_SESSION['g_user'] .
"'" .
" and uj_priv in ('R','W'))";
}
- $where = $fil_ledger . $fil_amount . $fil_date . $fil_desc .
$fil_sec . $fil_amount . $fil_qcode . $fil_paid . $fil_account;
+ $where = $fil_ledger . $fil_amount . $fil_date . $fil_desc .
$fil_sec . $fil_amount . $fil_qcode . $fil_paid . $fil_account.$fil_date_paid;
$sql.=" where " . $where;
return array($sql, $where);
}
Modified: phpcompta/trunk/include/template/ledger_search.php
===================================================================
--- phpcompta/trunk/include/template/ledger_search.php 2013-10-20 19:27:54 UTC
(rev 5519)
+++ phpcompta/trunk/include/template/ledger_search.php 2013-10-20 19:42:58 UTC
(rev 5520)
@@ -17,6 +17,14 @@
<?php echo $f_date_start->input(); ?> <?php echo _('et')?> <?php echo
$f_date_end->input(); ?>
</td>
</tr>
+<tr>
+<td style="text-align:right;width:30em">
+<?php echo _('Et paiement compris entre les date ').HtmlInput::infobulle(36);
?>
+</td>
+<td>
+<?php echo $f_date_paid_start->input(); ?> <?php echo _('et')?> <?php echo
$f_date_paid_end->input(); ?>
+</td>
+</tr>
<tr>
<td style="text-align:right;width:30em">
Modified: phpcompta/trunk/release-note
===================================================================
--- phpcompta/trunk/release-note 2013-10-20 19:27:54 UTC (rev 5519)
+++ phpcompta/trunk/release-note 2013-10-20 19:42:58 UTC (rev 5520)
@@ -60,6 +60,17 @@
Possibilité de changer l'état de plusieurs documents
+Stock
+=====
+Inventaire annuel
+
+Date de paiement
+================
+Lors de rapprochement
+Dans le détail journaux ACH et VEN
+Dans l'impression PRINTJRN + export CSV
+Dans l'historique
+
===================================================================
|| A faire
===================================================================
@@ -70,12 +81,8 @@
Par journal
ou par profil
-Stock
-=====
-Inventaire annuel
-
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5520 - in phpcompta/trunk: . html/js include include/template,
phpcompta-dev <=