Merge branch 'bug-1411' of github.com:marcosgdf/dolibarr into

marcosgdf-bug-1411 Conflicts: ChangeLog
Dolibarr · May 23, 2014 · d1ee20d · d1ee20d
2 parents dc94b6e + b2f299f
commit d1ee20d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -120,6 +120,7 @@ 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 #1388 ] Wrong date when invoicing several orders
+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
@@ -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');