Debug askpricesupplier

Try to continue work on position of menu entries.

htdocs/comm/askpricesupplier/index.php

@@ -131,7 +131,7 @@ if ($resql)
     }
     if ($conf->use_javascript_ajax)
     {
-        print '<tr><td align="center" colspan="2">';
+        print '<tr '.$bc[false].'><td align="center" colspan="2">';
         $data=array('series'=>$dataseries);
         dol_print_graph('stats',300,180,$data,1,'pie',1);
         print '</td></tr>';

htdocs/core/class/menu.class.php

@@ -58,11 +58,12 @@ class Menu
      * @param   string	$target		Target lien
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+     * @param	int		$position	Position (not used yet)
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='')
+    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0)
     {
-        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu);
+        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position);
     }
 
     /**
@@ -76,12 +77,13 @@ class Menu
      * @param   string	$target		Target lien
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+     * @param	int		$position	Position (not used yet)
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='')
+    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0)
     {
         $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu));
+        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position));
         $array_end   = array_slice($this->liste,($idafter+1));
         $this->liste=array_merge($array_start,$array_new,$array_end);
     }

htdocs/core/class/menubase.class.php

@@ -95,6 +95,7 @@ class Menubase
         $this->perms=trim($this->perms);
         $this->enabled=trim($this->enabled);
         $this->user=trim($this->user);
+        $this->position=trim($this->position);
         if (! $this->level) $this->level=0;
 
         // Check parameters

htdocs/core/menus/standard/eldy.lib.php

@@ -732,9 +732,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->ficheinter->enabled))
 			{
 				$langs->load("interventions");
-				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter');
+				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 200);
-				$newmenu->add("/fichinter/card.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer);
+				$newmenu->add("/fichinter/card.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);
-				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire);
+				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
 			}
 
 		}

htdocs/core/modules/DolibarrModules.class.php

@@ -1370,10 +1370,11 @@ print $sql;
             $menu->target=$this->menu[$key]['target'];
             $menu->user=$this->menu[$key]['user'];
             $menu->enabled=isset($this->menu[$key]['enabled'])?$this->menu[$key]['enabled']:0;
+            $menu->position=$this->menu[$key]['position'];
             
             if (! $err)
             {
-                $result=$menu->create($user);
+                $result=$menu->create($user);	// Save menu entry into table llx_menu
                 if ($result > 0)
                 {
                     $this->menu[$key]['rowid']=$result;

htdocs/core/modules/modAskPriceSupplier.class.php

@@ -148,7 +148,8 @@ class modAskPriceSupplier extends DolibarrModules
 			'langs'=>'askpricesupplier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'enabled'=>'$conf->askpricesupplier->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'perms'=>'$user->rights->askpricesupplier->lire',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-			'user'=>2 // 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+            'position'=>30
 		);
 		$r++;
 
@@ -160,7 +161,8 @@ class modAskPriceSupplier extends DolibarrModules
 			'langs'=>'askpricesupplier',
 			'enabled'=>'$conf->askpricesupplier->enabled',
 			'perms'=>'$user->rights->askpricesupplier->creer',
-			'user'=>2
+			'user'=>2,
+            'position'=>31
 		);
 		$r++;
 
@@ -172,7 +174,8 @@ class modAskPriceSupplier extends DolibarrModules
 			'langs'=>'askpricesupplier',
 			'enabled'=>'$conf->askpricesupplier->enabled',
 			'perms'=>'$user->rights->askpricesupplier->lire',
-			'user'=>2
+			'user'=>2,
+            'position'=>32
 		);
 		$r++;
 	}

htdocs/install/mysql/migration/repair.sql

@@ -227,3 +227,6 @@ update llx_facturedet set product_type = 1 where product_type = 2;
 delete from llx_commande_fournisseur_dispatch where fk_commandefourndet = 0 or fk_commandefourndet IS NULL;
 
 
+delete from llx_menu where menu_handler = 'smartphone';
+
+

htdocs/langs/en_US/askpricesupplier.lang

@@ -33,12 +33,14 @@ AskpricesupplierStatusOpened=Validated (request is open)
 AskpricesupplierStatusClosed=Closed
 AskpricesupplierStatusSigned=Accepted
 AskpricesupplierStatusNotSigned=Refused
+AskpricesupplierStatusBilled=Billed
 AskpricesupplierStatusDraftShort=Draft
 AskpricesupplierStatusValidatedShort=Validated
 AskpricesupplierStatusOpenedShort=Open
 AskpricesupplierStatusClosedShort=Closed
 AskpricesupplierStatusSignedShort=Accepted
 AskpricesupplierStatusNotSignedShort=Refused
+AskpricesupplierStatusBilledShort=Billed
 CopyAskFrom=Create price request by copying existing a request
 CreateEmptyAsk=Create blank request
 CloneAsk=Clone price request