diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 5e78d735523..0288ee872d7 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -33,6 +33,8 @@ require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
// Langs
$langs->load("compta");
@@ -60,6 +62,10 @@ $search_desc = GETPOST('search_desc', 'alpha');
$search_amount = GETPOST('search_amount', 'alpha');
$search_account = GETPOST('search_account', 'alpha');
$search_vat = GETPOST('search_vat', 'alpha');
+$search_day=GETPOST("search_day","int");
+$search_month=GETPOST("search_month","int");
+$search_year=GETPOST("search_year","int");
+
$btn_ventil = GETPOST('ventil', 'alpha');
// Load variable for pagination
@@ -109,6 +115,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
$search_amount = '';
$search_account = '';
$search_vat = '';
+ $search_month = '';
+ $search_year = '';
}
// Mass actions
@@ -174,6 +182,7 @@ if ($massaction == 'ventil') {
*/
$form = new Form($db);
+$formother = new FormOther($db);
llxHeader('', $langs->trans("Ventilation"));
@@ -216,6 +225,19 @@ if (strlen(trim($search_account))) {
if (strlen(trim($search_vat))) {
$sql .= natural_search("l.tva_tx",$search_vat,1);
}
+if ($search_month > 0)
+{
+ if ($search_year > 0 && empty($search_day))
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+ else if ($search_year > 0 && ! empty($search_day))
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
+ else
+ $sql.= " AND date_format(f.datef, '%m') = '".$db->escape($search_month)."'";
+}
+else if ($search_year > 0)
+{
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
+}
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
} else {
@@ -246,6 +268,15 @@ if ($result) {
$param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ if ($search_lineid) $param.='&search_lineid='.urlencode($search_lineid);
+ if ($search_day) $param.='&search_day='.urlencode($search_day);
+ if ($search_month) $param.='&search_month='.urlencode($search_month);
+ if ($search_year) $param.='&search_year='.urlencode($search_year);
+ if ($search_invoice) $param.='&search_invoice='.urlencode($search_invoice);
+ if ($search_ref) $param.='&search_ref='.urlencode($search_ref);
+ if ($search_desc) $param.='&search_desc='.urlencode($search_desc);
+ if ($search_amount) $param.='&search_amount='.urlencode($search_amount);
+ if ($search_vat) $param.='&search_vat='.urlencode($search_vat);
$arrayofmassactions = array(
'ventil'=>$langs->trans("Ventilate")
@@ -280,7 +311,11 @@ if ($result) {
print '
';
print ' | ';
print ' | ';
- print ' | ';
+ print '';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($search_year,'search_year',1, 20, 5);
+ print ' | ';
print ' | ';
//print ' | ';
print ' | ';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 09bb45df918..6bf18f0da20 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -32,6 +32,8 @@ require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
// Langs
$langs->load("compta");
@@ -58,6 +60,10 @@ $search_desc = GETPOST('search_desc', 'alpha');
$search_amount = GETPOST('search_amount', 'alpha');
$search_account = GETPOST('search_account', 'alpha');
$search_vat = GETPOST('search_vat', 'alpha');
+$search_day=GETPOST("search_day","int");
+$search_month=GETPOST("search_month","int");
+$search_year=GETPOST("search_year","int");
+
$btn_ventil = GETPOST('ventil', 'alpha');
// Load variable for pagination
@@ -103,6 +109,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
$search_amount = '';
$search_account = '';
$search_vat = '';
+ $search_month = '';
+ $search_year = '';
}
// Mass actions
@@ -169,6 +177,7 @@ if ($massaction == 'ventil') {
*/
$form = new Form($db);
+$formother = new FormOther($db);
llxHeader('', $langs->trans("ExpenseReportsVentilation"));
@@ -203,6 +212,19 @@ if (strlen(trim($search_account))) {
if (strlen(trim($search_vat))) {
$sql .= natural_search("erd.tva_tx",$search_vat,1);
}
+if ($search_month > 0)
+{
+ if ($search_year > 0 && empty($search_day))
+ $sql.= " AND erd.date BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+ else if ($search_year > 0 && ! empty($search_day))
+ $sql.= " AND erd.date BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
+ else
+ $sql.= " AND date_format(erd.date, '%m') = '".$db->escape($search_month)."'";
+}
+else if ($search_year > 0)
+{
+ $sql.= " AND erd.date BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
+}
$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")"; // We don't share object for accountancy
$sql .= $db->order($sortfield, $sortorder);
@@ -228,6 +250,15 @@ if ($result) {
$param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ if ($search_lineid) $param.='&search_lineid='.urlencode($search_lineid);
+ if ($search_day) $param.='&search_day='.urlencode($search_day);
+ if ($search_month) $param.='&search_month='.urlencode($search_month);
+ if ($search_year) $param.='&search_year='.urlencode($search_year);
+ if ($search_expensereport) $param.='&search_expensereport='.urlencode($search_expensereport);
+ if ($search_label) $param.='&search_label='.urlencode($search_label);
+ if ($search_desc) $param.='&search_desc='.urlencode($search_desc);
+ if ($search_amount) $param.='&search_amount='.urlencode($search_amount);
+ if ($search_vat) $param.='&search_vat='.urlencode($search_vat);
$arrayofmassactions = array(
'ventil'=>$langs->trans("Ventilate")
@@ -263,7 +294,11 @@ if ($result) {
print '
';
print ' | ';
print ' | ';
- print ' | ';
+ print '';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($search_year,'search_year',1, 20, 5);
+ print ' | ';
print ' | ';
print ' | ';
print ' | ';
@@ -313,6 +348,7 @@ if ($result) {
// Ref Expense report
print '' . $expensereport_static->getNomUrl(1) . ' | ';
+ // Date
print '' . dol_print_date($db->jdate($objp->date), 'day') . ' | ';
// Fees label
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 84c341400d7..ba5ecfe6bb7 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -33,6 +33,8 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
// Langs
$langs->load("compta");
@@ -60,6 +62,10 @@ $search_desc = GETPOST('search_desc', 'alpha');
$search_amount = GETPOST('search_amount', 'alpha');
$search_account = GETPOST('search_account', 'alpha');
$search_vat = GETPOST('search_vat', 'alpha');
+$search_day=GETPOST("search_day","int");
+$search_month=GETPOST("search_month","int");
+$search_year=GETPOST("search_year","int");
+
$btn_ventil = GETPOST('ventil', 'alpha');
// Load variable for pagination
@@ -110,6 +116,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
$search_amount = '';
$search_account = '';
$search_vat = '';
+ $search_month = '';
+ $search_year = '';
}
// Mass actions
@@ -176,6 +184,7 @@ if ($massaction == 'ventil') {
*/
$form = new Form($db);
+$formother = new FormOther($db);
llxHeader('', $langs->trans("SuppliersVentilation"));
@@ -218,6 +227,19 @@ if (strlen(trim($search_account))) {
if (strlen(trim($search_vat))) {
$sql .= natural_search("l.tva_tx",$search_vat,1);
}
+if ($search_month > 0)
+{
+ if ($search_year > 0 && empty($search_day))
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+ else if ($search_year > 0 && ! empty($search_day))
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
+ else
+ $sql.= " AND date_format(f.datef, '%m') = '".$db->escape($search_month)."'";
+}
+else if ($search_year > 0)
+{
+ $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
+}
$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")"; // We don't share object for accountancy
$sql .= $db->order($sortfield, $sortorder);
@@ -243,6 +265,15 @@ if ($result) {
$param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ if ($search_lineid) $param.='&search_lineid='.urlencode($search_lineid);
+ if ($search_day) $param.='&search_day='.urlencode($search_day);
+ if ($search_month) $param.='&search_month='.urlencode($search_month);
+ if ($search_year) $param.='&search_year='.urlencode($search_year);
+ if ($search_invoice) $param.='&search_invoice='.urlencode($search_invoice);
+ if ($search_ref) $param.='&search_ref='.urlencode($search_ref);
+ if ($search_desc) $param.='&search_desc='.urlencode($search_desc);
+ if ($search_amount) $param.='&search_amount='.urlencode($search_amount);
+ if ($search_vat) $param.='&search_vat='.urlencode($search_vat);
$arrayofmassactions = array(
'ventil'=>$langs->trans("Ventilate")
@@ -279,7 +310,11 @@ if ($result) {
print ' | ';
print ' | ';
print ' | ';
- print ' | ';
+ print '';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
+ print '';
+ $formother->select_year($search_year,'search_year',1, 20, 5);
+ print ' | ';
print ' | ';
//print ' | ';
print ' | ';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 92bb80d9655..4939d7e83f7 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -73,6 +73,10 @@ $search_zip=GETPOST('search_zip','alpha');
$search_state=trim(GETPOST("search_state"));
$search_country=GETPOST("search_country",'int');
$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
+$search_day=GETPOST("search_day","int");
+$search_month=GETPOST("search_month","int");
+$search_year=GETPOST("search_year","int");
+
$viewstatut=GETPOST('viewstatut','alpha');
$optioncss = GETPOST('optioncss','alpha');
$object_statut=GETPOST('propal_statut','alpha');
@@ -80,9 +84,6 @@ $object_statut=GETPOST('propal_statut','alpha');
$sall=GETPOST('sall', 'alphanohtml');
$mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
-$search_day=GETPOST("search_day","int");
-$search_month=GETPOST("search_month","int");
-$search_year=GETPOST("search_year","int");
$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
@@ -371,9 +372,10 @@ if ($resql)
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
if ($sall) $param.='&sall='.urlencode($sall);
- if ($search_month) $param.='&search_month='.urlencode($search_month);
- if ($search_year) $param.='&search_year='.urlencode($search_year);
- if ($search_ref) $param.='&search_ref='.urlencode($search_ref);
+ if ($search_day) $param.='&search_day='.urlencode($search_day);
+ if ($search_month) $param.='&search_month='.urlencode($search_month);
+ if ($search_year) $param.='&search_year='.urlencode($search_year);
+ if ($search_ref) $param.='&search_ref='.urlencode($search_ref);
if ($search_refcustomer) $param.='&search_refcustomer='.urlencode($search_refcustomer);
if ($search_societe) $param.='&search_societe='.urlencode($search_societe);
if ($search_user > 0) $param.='&search_user='.urlencode($search_user);
@@ -613,7 +615,7 @@ if ($resql)
// Date
if (! empty($arrayfields['p.date']['checked']))
{
- print '';
+ print ' | ';
//print $langs->trans('Month').': ';
if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
print '';
@@ -624,7 +626,7 @@ if ($resql)
// Date end
if (! empty($arrayfields['p.fin_validite']['checked']))
{
- print ' | | ';
+ print ' | ';
}
if (! empty($arrayfields['p.total_ht']['checked']))
{