From b2f299f5e450934d838e287f5e63f887631ce7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 23 May 2014 02:22:38 +0200
Subject: [PATCH] Fix: [ bug #1411 ] Unable to set an expedition note if
 invoices module is not enabled

---
 ChangeLog                  | 1 +
 htdocs/expedition/note.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3bb088b99f3cc..8f2d5ef5914b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,7 @@ Fix: [ bug #1306 ] Fatal error when adding an external calendar.
 New: Added es_CL language
 Fix: Margin tabs bad data show
 Fix: [ bug #1318 ] Problem with enter key when adding an existing product to a customer invoice.
+Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled
 
 ***** ChangeLog for 3.5 compared to 3.4.* *****
 For users:
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 252e6f922bf0c..077d28c0620e4 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -77,14 +77,14 @@
 /*                     Actions                                                */
 /******************************************************************************/
 
-if ($action == 'setnote_public' && $user->rights->facture->creer)
+if ($action == 'setnote_public')
 {
 	$object->fetch($id);
 	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES),'_public');
 	if ($result < 0) dol_print_error($db,$object->error);
 }
 
-else if ($action == 'setnote_private' && $user->rights->facture->creer)
+else if ($action == 'setnote_private')
 {
 	$object->fetch($id);
 	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES),'_private');