From 6964f196c8dddfef8742ac8cf15d10f4813dafb1 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sun, 11 Dec 2016 14:01:04 +0100 Subject: [PATCH 1/3] Fix bank account box --- htdocs/core/boxes/box_comptes.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index a6b8e2744a6..a1c3625e78c 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -103,6 +103,7 @@ class box_comptes extends ModeleBoxes $objp = $db->fetch_object($result); $account_static->id = $objp->rowid; + $account_static->ref = $objp->ref; $account_static->label = $objp->label; $account_static->number = $objp->number; $solde=$account_static->solde(0); From 5ed041c0cda2db538b938aeaa46e48ca126c8e66 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sun, 11 Dec 2016 14:11:28 +0100 Subject: [PATCH 2/3] Rights should not be given by default --- htdocs/core/modules/modExpenseReport.class.php | 2 +- htdocs/core/modules/modStock.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php index 4215bbdfa2a..ad82cb21a89 100644 --- a/htdocs/core/modules/modExpenseReport.class.php +++ b/htdocs/core/modules/modExpenseReport.class.php @@ -100,7 +100,7 @@ class modExpenseReport extends DolibarrModules $this->rights[1][0] = 771; $this->rights[1][1] = 'Read expense reports (yours and your subordinates)'; $this->rights[1][2] = 'r'; - $this->rights[1][3] = 1; + $this->rights[1][3] = 0; $this->rights[1][4] = 'lire'; $this->rights[3][0] = 772; diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index b2c2f806bd7..8fe4eb52abe 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -85,7 +85,7 @@ class modStock extends DolibarrModules $this->rights[0][0] = 1001; $this->rights[0][1] = 'Lire les stocks'; $this->rights[0][2] = 'r'; - $this->rights[0][3] = 1; + $this->rights[0][3] = 0; $this->rights[0][4] = 'lire'; $this->rights[0][5] = ''; @@ -106,7 +106,7 @@ class modStock extends DolibarrModules $this->rights[3][0] = 1004; $this->rights[3][1] = 'Lire mouvements de stocks'; $this->rights[3][2] = 'r'; - $this->rights[3][3] = 1; + $this->rights[3][3] = 0; $this->rights[3][4] = 'mouvement'; $this->rights[3][5] = 'lire'; From 4296a2802c91bd4c3f2cf7328fa8b04bf1aaa6a3 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sun, 11 Dec 2016 14:27:10 +0100 Subject: [PATCH 3/3] Wrong menu in tab link on user card --- htdocs/core/modules/modHoliday.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php index 0dc44a36e22..9ce003c1a5b 100644 --- a/htdocs/core/modules/modHoliday.class.php +++ b/htdocs/core/modules/modHoliday.class.php @@ -113,7 +113,7 @@ class modHoliday extends DolibarrModules // 'group' to add a tab in group view // 'contact' to add a tab in contact view // 'categories_x' to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member) - $this->tabs = array('user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=holiday&id=__ID__'); + $this->tabs = array('user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=hrm&id=__ID__'); // Boxes $this->boxes = array(); // List of boxes