diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 4f82db33e9478d04fc0efa7352d71835380d9060..359a8b40c12c67f4a45844564b0baf3ba4fad9cc 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -279,6 +279,7 @@ if ($result) print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy'); print '<br>'; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index b382d8559942c968b2d10c1d3899fba7a8ff1e41..0c49ac0e1baa1a4d85928b8bba2f7953b2af6694 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -355,6 +355,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; $button = '<a class="butAction" name="button_export_csv" href="'.$_SERVER["PHP_SELF"].'?action=export_csv'.($param?'&'.$param:'').'">'; if (count($filter)) $button.= $langs->trans("ExportFilteredList"); diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 428e490aff7057455476ae9dfc3688ea520f3ad0..52b3a31d6f08d51586b3ccc80f3c343c24513924 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -248,6 +248,7 @@ if ($result) { print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); print $langs->trans("DescVentilDoneCustomer") . '<br>'; diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 46cb19c2ae1382af8406f18381682dc80705a66b..bbd875e0dbf53105980737a972ba57d9f5697bfc 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -263,8 +263,7 @@ if ($result) { print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - - //$center='<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index 4205a497c1a393bbce139b9412b82ccf796b1705..6d0ffbd447647253d5ec0ea79a65a8d192439a33 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -219,7 +219,8 @@ if ($result) { print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); print $langs->trans("DescVentilDoneExpenseReport") . '<br>'; diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 114fd2c99ea89dcdc444779e5b802c0621929be2..72316e4c4d62208c359b22bd0e57a1bc5d8c7faa 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -246,9 +246,8 @@ if ($result) { print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - - //$center='<div class="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print_barre_liste($langs->trans("ExpenseReportLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); print $langs->trans("DescVentilTodoExpenseReport") . '</br><br>'; diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index 09cf552c7bbe16973475858ccddc42184abbed70..1a95262f8616403ea11f9b696cdc947b41bebf65 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -230,7 +230,8 @@ if ($result) { print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); print $langs->trans("DescVentilDoneSupplier") . '<br>'; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index e702aa8add807de7b592162543da214f37c11b30..061e465b1e708ff67afdbc187636803246d3b1ff 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -260,8 +260,7 @@ if ($result) { print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - - //$center='<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit); diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 9e0de6f1d7532c9345af34579378b6ffc324eb7e..1b059d8616db057f23d0b0634fa10db32174c493 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -353,6 +353,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit); diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index 206f5ebf8c909dceaaa72f173a736631b42ace9e..55b832e327cc9116e65793c50f5d9b1408a5f1ee 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -189,6 +189,7 @@ if ($result) print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index fb147750e0baf44ff7bf1215a2245a63cda78944..083ab4bda3bfcc93ef513ae20b2a9bee201a87c9 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -191,6 +191,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit); diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index 7ebc67472d14aa3433452cae8176fecb4d54b5b1..40e63de8aea47c7366076a8501ff9b327e85302b 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -220,6 +220,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; $head=defaultvalues_prepare_head(); diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 433508be9083e7e79147e52af2f92880276fa39d..5c4291ff3f362f79dfb9c261b9ae2b84ebad9fc1 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -436,7 +436,8 @@ if ($mode == 'common') print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + dol_fiche_head($head, $mode, '', -1); $moreforfilter = ''; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index c9488f919fe6b93afe7e5883b0f713215f9a7987..72aaa7fe355eccfcb9130380adcff447a4235c80 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -209,6 +209,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; $head=translation_prepare_head(); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 301cf63620e256c100a8557af91ceec55d402adf..6ed846c0ebe4569ae4578128930fc195ddb7de23 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -324,6 +324,7 @@ if ($resql) print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; $nav=''; if ($optioncss != '') $nav.= '<input type="hidden" name="optioncss" value="'.$optioncss.'">'; diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 760d82f02462665022d1cd2f6e8c27124c98720a..125355a3386353458718592f93a234320f36ed62 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -111,6 +111,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index c302dea1e4332ed514c91e28464254a653b34152..719dba1a6229225e98b3eba0287ecc24973cfade 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -428,6 +428,7 @@ if ($object->fetch($id) >= 0) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">'; $cleartext=''; @@ -443,6 +444,7 @@ if ($object->fetch($id) >= 0) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="limit" value="'.$limit.'">'; diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index f5efbf543834f26455efcdfad9e7bf9627b7d7f9..e7775a6485e208cac8acaf9ba169b4956b4eeefc 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -116,6 +116,7 @@ if ($result) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; $moreforfilter = ''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index af9ffa6d778928640525f6cd6e42764004dde2dd..d2a6c6e926f1c5a40bd8a2990873bab0f3ec6b63 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -407,7 +407,8 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); if ($massaction == 'presend') diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index c73258cff897fedc8a7af969744aa446ed558054..b9102e78ddcb7b3fbd9f6a3a22b3f8d27aa54153 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -648,7 +648,8 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; + print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php index ed8241de427f21a8298e8ba5a98cf076266a1e29..fd3c1ec982543f1e1dd4a5c26d7f736b7f6950ab 100644 --- a/htdocs/compta/bank/bankentries.php +++ b/htdocs/compta/bank/bankentries.php @@ -578,6 +578,7 @@ if ($resql) print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="ref" value="'.$ref.'">'; if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">'; diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 37883c29c0fca0faccebdc726e1ee3378293cc86..8ff5f1964fc35a0eeffb861b36019f60e49643eb 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -256,6 +256,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_bank.png',0,$newcardbutton,'',$limit, 1); diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php index abf6d23d22e3b3ad69e4ad415f23e08c4f6d186c..f189eeef306ccb249bdcbfd03edb35ef9cd9b747 100644 --- a/htdocs/compta/bank/various_payment/index.php +++ b/htdocs/compta/bank/various_payment/index.php @@ -141,7 +141,8 @@ if ($result) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print_barre_liste($langs->trans("VariousPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); print '<div class="div-table-responsive">'; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index ee71290be2d3d5c6bbb484b7c04a1c8ea01556ed..a690478a53e820b78792dd0d4e78ffbc291c1665 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -89,6 +89,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="mode" value="'.$mode.'">'; if ($mode != 'sconly') diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index cdca425d5f6d9f2275e4b198c1b58803d96936d6..93b23834e9f549b6a2fbd8904753837831d85b43 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -140,7 +140,7 @@ if ($id > 0 || ! empty($ref)) $totalpaye = $object->getSommePaiement(); - dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), 0, 'bill'); + dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill'); // Invoice content diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 3c22b96a1d4064006819f6e6cf3753a6e7b234b6..b09bd7f60f3b1f818b946872ee7e55f8dd405084 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -1652,6 +1652,7 @@ else print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','',$limit); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 638ca033e1af1771183c83781640f3ac99048124..10b11812b1a96d02aa63835c70708bf0b018586d 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -433,7 +433,7 @@ if ($search_status != '' && $search_status >= 0) if ($search_status == '2') $sql.=" AND f.fk_statut = 2"; // payed Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed) if ($search_status == '3') $sql.=" AND f.fk_statut = 3"; // abandonned } -if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode.""; +if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode; if ($month > 0) { if ($year > 0 && empty($day)) @@ -454,7 +454,7 @@ if ($month_lim > 0) else if ($year_lim > 0 && ! empty($day_lim)) $sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'"; else - $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$month_lim."'"; + $sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'"; } else if ($year_lim > 0) { @@ -600,6 +600,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index f3d83278885d22bad558dfdb0095d70d1ee68fe4..e9b1694808b3f8655cc5bcf3061ff49c58d7860c 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -147,7 +147,7 @@ if ($object->id > 0) $head = facture_prepare_head($object); - dol_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer'),0,'bill'); + dol_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer'), -1, 'bill'); // Invoice content diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 9798e2d28b4dbfa0db011a504d3d6cb62013b025..a4fac965e7af04f9e2f5f83331b33400850797cf 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -138,6 +138,7 @@ if ($resql) print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', '', '', $limit); diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index ab4189d53385b993be95a234150fd30caa891d47..daf705562134807c1d5b7cfb41bf0a58024e11d7 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -218,6 +218,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords,'title_accountancy.png', 0, '', '', $limit); diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 7319de4a7bd861a04b76e3bb87e1f9f32937ec8e..302e1e9e59c3a232149e2b2d5af5024364de5ae2 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -105,6 +105,7 @@ if ($result) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit); diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 72d775a49c3fd879ac573b28bf1a101bcdded204..6136ee484996d5bc42402673c7065497afa8cd0e 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -166,7 +166,8 @@ if ($result) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; + print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; $massactionbutton=''; diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index e193374a5529e4b7ef7673a3ebff238a98159ff1..dc95b06bc52cc7a8f11e61f0c89340cc23873577 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -150,7 +150,8 @@ if ($result) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); print '<div class="div-table-responsive">'; diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index f34ff9b1a31ebcc83c67c23e30fec06bc8ac2f8a..630197cfc788dc53160653408bd9905348e4c5cc 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -77,6 +77,13 @@ if ($action == 'reopen' && $user->rights->tax->charges->creer) { } } +// Link to a project +if ($action == 'classin' && $user->rights->tax->charges->creer) +{ + $object->fetch($id); + $object->setProject(GETPOST('projectid')); +} + if ($action == 'setlib' && $user->rights->tax->charges->creer) { $object->fetch($id); @@ -203,11 +210,9 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr { $result=$object->fetch($id); - $object->lib = GETPOST('label'); $object->date_ech = $dateech; $object->periode = $dateperiod; $object->amount = price2num($amount); - $object->fk_project = GETPOST("fk_project"); $result=$object->update($user); if ($result <= 0) @@ -276,6 +281,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char $form = new Form($db); $formsocialcontrib = new FormSocialContrib($db); +if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Card"); $help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; @@ -430,15 +436,47 @@ if ($id > 0) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; } - dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill'); + dol_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill'); $morehtmlref='<div class="refidno">'; // Ref customer $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1); $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1); + // Project + if (! empty($conf->projet->enabled)) + { + $langs->load("projects"); + $morehtmlref.='<br>'.$langs->trans('Project') . ' '; + if ($user->rights->tax->charges->creer) + { + if ($action != 'classify') + $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : '; + if ($action == 'classify') { + //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1); + $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'; + $morehtmlref.='<input type="hidden" name="action" value="classin">'; + $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; + $morehtmlref.=$formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1); + $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">'; + $morehtmlref.='</form>'; + } else { + $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1); + } + } else { + if (! empty($object->fk_project)) { + $proj = new Project($db); + $proj->fetch($object->fk_project); + $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">'; + $morehtmlref.=$proj->ref; + $morehtmlref.='</a>'; + } else { + $morehtmlref.=''; + } + } + } $morehtmlref.='</div>'; - $linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>'; + $linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>'; $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status @@ -449,25 +487,6 @@ if ($id > 0) print '<div class="underbanner clearboth"></div>'; print '<table class="border" width="100%">'; - - /* - // Ref - print '<tr><td>'.$langs->trans("Ref").'</td><td>'; - print $form->showrefnav($object,'id',$linkback); - print "</td></tr>"; - */ - - // Label - /*if ($action == 'edit') - { - print '<tr><td>'.$langs->trans("Label").'</td><td>'; - print '<input type="text" name="label" size="40" value="'.$object->lib.'">'; - print '</td></tr>'; - } - else - { - print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->lib.'</td></tr>'; - }*/ // Type print '<tr><td class="titlefield">'.$langs->trans("Type")."</td><td>".$object->type_libelle."</td>"; @@ -508,22 +527,6 @@ if ($id > 0) print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>'; } - // Project - if (! empty($conf->projet->enabled)){ - print '<tr><td class="nowrap">'; - print $langs->trans("Project"); - print '</td><td>'; - if ($action == 'edit') { - $formproject=new FormProjets($db); - $numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1); - } else { - $project=new Project($db); - $project->fetch($object->fk_project); - print $project->getNomUrl(1,'',1);; - } - print '</td></tr>'; - } - // Mode of payment print '<tr><td>'; print '<table class="nobordernopadding" width="100%"><tr><td>'; diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 95c72cbedb25e34f9e59d43b9cb4c1481168175c..ce2f853c93525a0f1976a24176c89e3b0107378c 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -33,6 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) +{ + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +} $langs->load("other"); $langs->load("companies"); @@ -88,6 +93,7 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer) */ $form = new Form($db); +if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Documents"); $help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; @@ -105,9 +111,24 @@ if ($object->id) // Label of social contribution $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1); $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1); + // Project + if (! empty($conf->projet->enabled)) + { + $langs->load("projects"); + $morehtmlref.='<br>'.$langs->trans('Project') . ' : '; + if (! empty($object->fk_project)) { + $proj = new Project($db); + $proj->fetch($object->fk_project); + $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">'; + $morehtmlref.=$proj->ref; + $morehtmlref.='</a>'; + } else { + $morehtmlref.=''; + } + } $morehtmlref.='</div>'; - $linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>'; + $linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>'; $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 50e14823a5f55e4721076bb94016ae92fe196a27..194c3f38d993b2026d2e2fd7b31989140c1b5acd 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -152,6 +152,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; if ($year) diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php index bbacfafd430f07cf29e6805419aa90ac9e54b473..91334134a2cf636b67a63e7d54571900c1709394 100644 --- a/htdocs/compta/sociales/info.php +++ b/htdocs/compta/sociales/info.php @@ -25,6 +25,11 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +if (! empty($conf->projet->enabled)) +{ + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +} $langs->load("compta"); $langs->load("bills"); @@ -37,6 +42,7 @@ $socid = GETPOST('socid','int'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'tax', $id, 'chargesociales','charges'); + /* * Actions */ @@ -49,9 +55,13 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer) setEventMessages($object->error, $object->errors, 'errors'); } + /* * View */ + +if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } + $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Info"); $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; llxHeader("",$title,$help_url); @@ -68,9 +78,24 @@ $morehtmlref='<div class="refidno">'; // Label of social contribution $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1); $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1); +// Project +if (! empty($conf->projet->enabled)) +{ + $langs->load("projects"); + $morehtmlref.='<br>'.$langs->trans('Project') . ' : '; + if (! empty($object->fk_project)) { + $proj = new Project($db); + $proj->fetch($object->fk_project); + $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">'; + $morehtmlref.=$proj->ref; + $morehtmlref.='</a>'; + } else { + $morehtmlref.=''; + } +} $morehtmlref.='</div>'; -$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>'; +$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>'; $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php index eda1633480abad7ae7c79742a1890f3ae7b6fde8..ae7240c204a6543502183c14e19fdc44c65b2f11 100644 --- a/htdocs/compta/sociales/payments.php +++ b/htdocs/compta/sociales/payments.php @@ -85,6 +85,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="mode" value="'.$mode.'">'; if ($mode != 'sconly') diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 94895062bc366832d463db81f1fc97e1f94a2da6..076978a86fbfb0ba6a7bdb40c9090d6a6828d95d 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -154,6 +154,7 @@ if ($result) print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit); diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 929dbdc91e825fa6fb40c36c7ce27bdaacf93627..fc601cf8a53ecb542522d577abd6ab6204704a50 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -433,6 +433,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit); diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 318a24931bee51a2e51b5f8972405052957e4c66..43cce90bd1c1a737c6609562fd82deff34b3c268 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -340,6 +340,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit); diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index f283502bc3e4164ad35700a9d721720a8da64dbf..adac837f3e0ad20d9ca7c1120206eb2aae727bb6 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -308,6 +308,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; $title=$langs->trans("ListOfServices"); if ($mode == "0") $title=$langs->trans("ListOfInactiveServices"); // Must use == "0" diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 3fef1265f9d62a92e17c75f7308dec157ecfdc7f..2fa2599e4d32d155629c622f3fe13444deb9e8f8 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -698,6 +698,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); + $page = GETPOST('page','int'); $search_status = GETPOST("search_status",'int'); if ($search_status=='') $search_status=1; // always display activ customer first $search_name = GETPOST("search_name",'alpha'); @@ -733,7 +734,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print '<input type="hidden" name="socid" value="'.$object->id.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print "\n".'<table class="noborder" width="100%">'."\n"; $param="socid=".$object->id; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 2eff05868d4dbd3d3565c276fb9138be1836663d..95338247ecaa56b9e96e02e84b0a9f322bb10ff5 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -273,6 +273,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; // Line with explanation and button new job diff --git a/htdocs/don/list.php b/htdocs/don/list.php index b0cd414ed286d1eaff535dbf84a527a586f58b68..daa6f7aa1f209fe08281e4a530ee3aa0545d3fea 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -149,6 +149,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; if ($search_all) diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 50454e3f253fbf58df674fcf5faf2483d4e2d900..c838c002cc9686c617276837281b970d23a4bb77 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -280,6 +280,7 @@ if ($resql) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="action" value="list">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 06998059aa573355a564789daabb111e04cba0e1..f95952db4820874d3d4d5452dc8eabc5484f4978 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -314,6 +314,7 @@ if ($resql) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="action" value="list">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 9963794fd9ff8b7869f3bf3d7be50b8d4affe309..9271a348558adbfd0e7f9c993751b7f89f1f39ef 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -288,6 +288,7 @@ if ($resql) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="action" value="list">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 8ca86a1e6c591ab75007bc299f6dde758b108a8b..544d882cda329e1ae4e238c2f2a3344f46ac4588 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -677,6 +677,7 @@ if ($resql) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="action" value="list">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 9ad1bf63ce262fac7a9a8744d528a5ce08ce6c54..e449ed83371a2e0a88eefcc27802fdf36ae9f1f4 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -453,6 +453,7 @@ if ($resql) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="action" value="list">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index b6825e93d821b1d805af5ab06b143892be2c6c40..10851e629e3b5d6d6c6198ed136dd5431103532f 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -679,7 +679,8 @@ if (empty($action)) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + $moreforfilter=''; $parameters=array(); diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 94302eca4be180c6f0bdb157709c377d54344439..ca874511c9483b4990caaa2eafd354b1354de847 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -170,6 +170,7 @@ if ($resql) if ($fourn_id > 0) print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; print '<table class="liste" width="100%">'; diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 063c3042e3bf4ff87ebd58d5a7999224246d8c07..30d3dc14f699efb1910398b6af460e288a35bfb0 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -282,6 +282,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">'; if ($sall) diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index fdc8cf67073114a1681ef77698abec01c69cc1f0..b04d3bd90b3b78254ade186fac60e0ec27f8f9c7 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -117,6 +117,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit); diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php index 205fcf4be8c1e393199283641cd94f6a46f12472..9c2581627593b49c6d85ca33a9829c7a3be357bf 100644 --- a/htdocs/modulebuilder/skeletons/skeleton_list.php +++ b/htdocs/modulebuilder/skeletons/skeleton_list.php @@ -307,6 +307,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 636611f91f07938876c6f4e4a1b45c851fd73bd0..510a05453729161bd9e6fc537a989e432e76be30 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -89,6 +89,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; $moreforfilter = ''; diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php index e3103d8f4262472034dbeb98897bb622417eb53b..1ebbf256c9cd5e78af4cbc8367c65aab664baca1 100644 --- a/htdocs/product/list-with-listview.php +++ b/htdocs/product/list-with-listview.php @@ -689,6 +689,7 @@ else print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; echo $listHTML; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index c957606b66a4c75886c65b5f0eb20b6dbb60deb9..7e6ae9b47f49a82e68f32cac9186f1351ae12802 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -429,6 +429,7 @@ else print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit); diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index a87fecd36b7166f0f80fe8b17baa266754b4e709..e460bbec7c590fbd29a4ca4b201da9e2f9b755c7 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -189,6 +189,7 @@ if ($resql) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; if ($sref || $snom || $sall || GETPOST('search')) diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 660d0e78bd3de3db774b284e452342d801dc3885..6ab18ac87cb88c6ef3039ddd4e4baa54c5299522 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -200,6 +200,7 @@ if ($resql) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; if ($sref || $snom || $sall || GETPOST('search')) diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index b3361f0b3289e9ade15aa5d18698cc5b58862d0c..eefbe3deee97269985d5cde63719974eb998b8c6 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -135,7 +135,8 @@ if ($result) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_generic.png', 0, '', '', $limit); if ($sall) diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 506ee68e42b6746eacdfefb423ad7b0df7f8ae8e..5f0f9c213dcc6f5367e769546e2af5424bbb56e7 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -695,6 +695,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">'; diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index df97621c07b36bc56c18caa82c525a49fce875e1..78d3c470cb1dcc2278af53f0b754f16c55464100 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -309,6 +309,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index cbf036ef7e3f1a3be2d42b9bfe84c3913f6aeed0..6230626a320b1670993463dfe611ad7fd1c3d161 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -416,6 +416,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 85fa0f640e9cece845dcb09f3e4176e3e4f28c1d..064281633c827f694a26a8904126e02097b50a0d 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -468,6 +468,7 @@ else if ($id > 0 || ! empty($ref)) print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; $title=$langs->trans("ListOfTasks"); diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 8c9f56f1d949d49f87295fd6ae866bd8bf8fff03..1f2459e85dbdf93d6660a4d49bf639c622f2d1f0 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -412,6 +412,7 @@ print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="type" value="'.$type.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index ddbd59ed11ff65b66debccb22c580937531c95b8..cbdfece9d45418f5ab778d940aea9093ca27f68d 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -707,7 +707,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) else print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; - + print '<input type="hidden" name="page" value="'.$page.'">'; + print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="projectid" value="'.$projectidforalltimes.'">'; print '<input type="hidden" name="withproject" value="'.$withproject.'">'; diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index c0b58523994b5bb8dd8291034efa33a3b34dd5db..f8a1fb6be6127cb66dae9c5399e2105ce6f3cefe 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -187,6 +187,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; $moreforfilter = ''; diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 4670036d70be855954ea1ebef4dc36abc72dda25..40ca07783c4e823b71af404a2bec25bac2ce1ed0 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -547,6 +547,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit); diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index b17ea678853f658886cdeffbe394bc94a2421623..7e7648db71218267a550251963801c98074a4ef8 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -454,6 +454,7 @@ if ($result > 0) print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="socid" value="'.$object->id.'">'; // List of active notifications diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index c5f994f8a103d9e8d21140223e60f242d7d60f08..2c10e2451a699780a6e72b0e23afa93c6eda8368 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -410,6 +410,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 6956a1ad5ebee00b4ab3f19eec65be186423d6ef..38fdf68b2babae58a6099c8a585382e6e0ea315f 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -131,6 +131,7 @@ if ($resql) print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="mode" value="'.$mode.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 04acb9b56f7666b9088338c9fd697ab72b3fa062..4cec562ce4476208178366407fc2cb4c80750411 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -296,6 +296,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="mode" value="'.$mode.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index 3c186ac3cae28f782d912919935af9120c8f0e6b..e39d8153caccab3ff9d5559ef7651c7c78d65dd1 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -435,6 +435,7 @@ if ($result > 0) print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">'; // List of notifications done