diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 60ff4b125c3..fbb8cf84baa 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -37,6 +37,12 @@ $mesg = '';
$action = GETPOST('action');
$id = GETPOST('id', 'int');
$rowid = GETPOST('rowid', 'int');
+$search= GETPOST("search");
+$search_account = GETPOST("search_account");
+$search_label = GETPOST("search_label");
+$search_accountparent = GETPOST("search_accountparent");
+$search_pcgtype = GETPOST("search_pcgtype");
+$search_pcgsubtype = GETPOST("search_pcgsubtype");
// Security check
if (!$user->admin)
@@ -83,6 +89,16 @@ if ($action == 'disable') {
}
}
+if (GETPOST("button_removefilter"))
+{
+ $search="";
+ $search_account="";
+ $search_label="";
+ $search_accountparent="";
+ $search_pcgtype="";
+ $search_pcgsubtype="";
+}
+
/*
* View
*
@@ -96,20 +112,20 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "accountingaccount as aa, " . MAIN_DB_PREFIX
$sql .= " WHERE aa.fk_pcg_version = asy.pcg_version";
$sql .= " AND asy.rowid = " . $pcgver;
-if (strlen(trim($_GET["search_account"]))) {
- $sql .= " AND aa.account_number like '%" . $_GET["search_account"] . "%'";
+if (strlen(trim($search_account))) {
+ $sql .= " AND aa.account_number like '%" . $search_account . "%'";
}
-if (strlen(trim($_GET["search_label"]))) {
- $sql .= " AND aa.label like '%" . $_GET["search_label"] . "%'";
+if (strlen(trim($search_label))) {
+ $sql .= " AND aa.label like '%" . $search_label . "%'";
}
-if (strlen(trim($_GET["search_accountparent"]))) {
- $sql .= " AND aa.account_parent like '%" . $_GET["search_accountparent"] . "%'";
+if (strlen(trim($search_accountparent))) {
+ $sql .= " AND aa.account_parent like '%" . $search_accountparent . "%'";
}
-if (strlen(trim($_GET["search_pcgtype"]))) {
- $sql .= " AND aa.pcg_type like '%" . $_GET["search_pcgtype"] . "%'";
+if (strlen(trim($search_pcgtype))) {
+ $sql .= " AND aa.pcg_type like '%" . $search_pcgtype . "%'";
}
-if (strlen(trim($_GET["search_pcgsubtype"]))) {
- $sql .= " AND aa.pcg_subtype like '%" . $_GET["search_pcgsubtype"] . "%'";
+if (strlen(trim($search_pcgsubtype))) {
+ $sql .= " AND aa.pcg_subtype like '%" . $search_pcgsubtype . "%'";
}
$sql .= $db->order($sortfield, $sortorder);
@@ -141,18 +157,20 @@ if ($result) {
print_liste_field_titre($langs->trans("Pcgtype"), $_SERVER["PHP_SELF"], "aa.pcg_type", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Pcgsubtype"), $_SERVER["PHP_SELF"], "aa.pcg_subtype", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre($langs->trans("Active"), $_SERVER["PHP_SELF"], "aa.active", "", $param, "", $sortfield, $sortorder);
- print_liste_field_titre(" ");
+ print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
print '';
print '';
- print ' | ';
- print ' | ';
- print ' | ';
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
+ print ' | ';
+ print ' | ';
+ print ' | ';
print ' | ';
- print '';
- print '';
+ print ' | ';
+ print '';
+ print ' ';
+ print '';
print ' | ';
print '
';
@@ -180,11 +198,13 @@ if ($result) {
}
print '';
- print '';
+ // Action
+ print ' | ';
if ($user->admin) {
print '';
print img_edit();
- print ' ';
+ print '';
+ print ' ';
print '';
print img_delete();
print '';
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 9ebdea5fefc..ad6ca01b6ca 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -181,11 +181,6 @@ else if ($id)
if ($action == 'update')
{
- // WYSIWYG Editor
- $htmlacc = new FormVentilation($db);
-
- require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-
$soc = new Societe($db);
if ($object->socid) {
$soc->fetch($object->socid);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 1d6e12b1357..71b6d29ea42 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -952,7 +952,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! empty($conf->accounting->enabled))
{
$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy", $langs->trans("Fiscalyear"),0,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
- $newmenu->add("/accountancy/admin/account.php?mainmenu=home", $langs->trans("Chartofaccounts"),0,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
+ $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy", $langs->trans("Chartofaccounts"),0,$user->rights->accounting->chartofaccount, '', $mainmenu, 'chartofaccount');
}
}
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 9a544b1ece0..e074bfe82f1 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -229,6 +229,14 @@ class modAccounting extends DolibarrModules
$this->rights[$r][4] = 'fiscalyear';
$this->rights[$r][5] = '';
$r++;
+
+ $this->rights[$r][0] = 50440;
+ $this->rights[$r][1] = 'Manage chart of accounts';
+ $this->rights[$r][2] = 'r';
+ $this->rights[$r][3] = 1;
+ $this->rights[$r][4] = 'chartofaccount';
+ $this->rights[$r][5] = '';
+ $r++;
// Main menu entries
$this->menus = array();
|