From c2f4bc90abf38638d253d0032a081271a6b33cda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Sep 2016 16:52:33 +0200
Subject: [PATCH] NEW Can sort on status reccurin invoice in list of template
invoices.
---
htdocs/compta/facture/fiche-rec.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 1dc9198051f..8ed4f7241ef 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -837,7 +837,7 @@ if ($action == 'create')
{
$result = $object->getLinesArray();
- print '<form action="fiche-rec.php" method="post">';
+ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="facid" value="'.$object->id.'">';
@@ -1394,6 +1394,9 @@ else
if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
if ($search_montant_vat != '') $sql.= natural_search('f.tva', $search_montant_vat, 1);
if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
+ if ($search_frequency == '1') $sql.= ' AND f.frequency > 0';
+ if ($search_frequency == '0') $sql.= ' AND (f.frequency IS NULL or f.frequency = 0)';
+
if ($month > 0)
{
if ($year > 0 && empty($day))
@@ -1528,8 +1531,8 @@ else
if (! empty($arrayfields['f.frequency']['checked']))
{
// Amount
- print '<td class="liste_titre" align="right">';
- //print '<input class="flat" type="text" size="5" name="search_frequency" value="'.$search_frequency.'">';
+ print '<td class="liste_titre" align="center">';
+ print $form->selectyesno('search_frequency', $search_frequency, 1, false, 1);
print '</td>';
}
// Date invoice
--
GitLab