Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog

ChangeLog

@@ -113,20 +113,23 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
 ***** ChangeLog for 3.5.5 compared to 3.5.4 *****
 Fix: Holiday module was broken. Initializaion of amount of holidays failed.
 Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
-Fix: Fusion PDF button on unpaid invoice is no more displayed 
-Fix: Unpaid invoice launch fusion PDF action even if it is only search (with enter keyboard input instead of lens click)
+Fix: Fusion PDF button on unpaid invoice is no more displayed.
+Fix: Unpaid invoice launch fusion PDF action even if it is only search (with enter keyboard input instead of lens click).
 Fix: Pb when showing log list of holiday module with some mysql versions.
 Fix: Error with bad timezone pushed by some browsers.
 Fix: shipping list SQL request was not filtering on shipping element
 Fix: debian package provided by dolibarr team must use embedded libraries.
 Fix: [ bug #1528 ] Leopard Services numeration module description is not translated.
-Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas
-Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances
+Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
+Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances.
 Fix: Update impayees.php
-Fix: Link product, In list view and label product
+Fix: Link product, In list view and label product.
 Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to.
 Fix: When disabled, all fields to add time into task line must be disabled.
 Fix: Missing include files.lib.php in some pages that use dol_delete_recursive
+Fix: Missing include files.lib.php in some pages ti use dol_delete_recursive.
+Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead of old ref.
+Fix: [ bug #1553 ] Saving User displays setup removes menu.
 
 ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
 Fix: Hide title of event when agenda module disabled.

htdocs/product/fiche.php

@@ -1075,7 +1075,7 @@
 
             $type = $langs->trans('Product');
             if ($object->isservice()) $type = $langs->trans('Service');
-            print_fiche_titre($langs->trans('Modify').' '.$type.' : '.$object->ref, "");
+            print_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
 
             // Main official, simple, and not duplicated code
             print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";

htdocs/user/param_ihm.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2013 Laurent Destailleur  <[email protected]>
+/* Copyright (C) 2005-2014 Laurent Destailleur  <[email protected]>
  * Copyright (C) 2010-2012 Regis Houssin        <[email protected]>
  * Copyright (C) 2013	   Florian Henry        <[email protected]>
  *
@@ -87,8 +87,6 @@
         if ($_POST["check_MAIN_LANG_DEFAULT"]=="on") $tabparam["MAIN_LANG_DEFAULT"]=$_POST["main_lang_default"];
         else $tabparam["MAIN_LANG_DEFAULT"]='';
 
-        $tabparam["MAIN_MENU_STANDARD"]=$_POST["MAIN_MENU_STANDARD"];
-
         if ($_POST["check_SIZE_LISTE_LIMIT"]=="on") $tabparam["MAIN_SIZE_LISTE_LIMIT"]=$_POST["main_size_liste_limit"];
         else $tabparam["MAIN_SIZE_LISTE_LIMIT"]='';
 
@@ -101,8 +99,6 @@
 
         $result=dol_set_user_param($db, $conf, $fuser, $tabparam);
 
-        $_SESSION["mainmenu"]="";   // Le gestionnaire de menu a pu changer
-
         header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
         exit;
     }