szollosil 1 ano atrás
pai
commit
111e8b9ca6

+ 5 - 5
custom/rollerstorage/core/modules/modRollerstorage.class.php

@@ -327,7 +327,7 @@ class modRollerstorage extends DolibarrModules
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
 			'mainmenu' => 'rollerstorage',
 			'leftmenu' => '',
-			'url' => '/rollerstorage/rollerstorageinventoryindex.php?inventory_id=' . $warehouses[0]['rowid'],
+			'url' => '/rollerstorage/rollerstorageinventoryindex.php?inventory_id=3',
 			'langs' => 'rollerstorage@rollerstorage',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
@@ -426,17 +426,17 @@ class modRollerstorage extends DolibarrModules
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
 			'mainmenu' => '',
 			'leftmenu' => 'device_stock',
-			//'url' => '/rollerstorage/rollerstorageinventoryindex.php?inventory_id=' . $warehouse['rowid'],
+			'url' => '/rollerstorage/rollerstorageinventoryindex.php?inventory_id=5',
 			'langs' => 'rollerstorage@rollerstorage',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
 			'enabled' => 'isModEnabled("rollerstorage")',
 			// Define condition to show or hide menu entry. Use 'isModEnabled("rollerstorage")' if entry must be visible if module is enabled.
-			'perms' => '$user->hasRight("rollerstorage", "rollerhistory", "read_device_stock")',
+			'perms' => '$user->hasRight("rollerstorage", "rollerhistory", "read_5")',
 			'target' => '',
 			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
-		foreach ($this->getWarehouses("'2'") as $warehouse) {
+		/* foreach ($this->getWarehouses("'2'") as $warehouse) {
 			$this->menu[$r++] = array(
 				'fk_menu' => 'fk_mainmenu=rollerstorage',
 				// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
@@ -456,7 +456,7 @@ class modRollerstorage extends DolibarrModules
 				'target' => '',
 				'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 			);
-		}
+		} */
 
 		/* $this->menu[$r++] = array(
 			'fk_menu' => 'fk_mainmenu=rollerstorage',

+ 1 - 1
custom/rollerstorage/rollerstorageinventoryindex.php

@@ -823,7 +823,7 @@ if ($permissiontoread || $permissiontoadd) {
 	}
 
 	// Show total line
-	include DOL_DOCUMENT_ROOT . '/core/tpl/list_print_total.tpl.php';
+	//include DOL_DOCUMENT_ROOT . '/core/tpl/list_print_total.tpl.php';
 
 
 	// If no record found

+ 1 - 1
langs/en_GB/stocks.lang

@@ -13,7 +13,7 @@ ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</stro
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so total of stock by sales value can't be calculated
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock level
 DeviceName=Device name
-SKU=SKU identifier (Roller)
+SKU=ID
 englishlabel=English label
 uniqueidentifier=Unique identifier (IMEI)
 AssignedDevice= Assigned device

+ 1 - 1
langs/hu_HU/stocks.lang

@@ -316,7 +316,7 @@ StockTransferRightCreateUpdate=Készlettranszferek létrehozása/frissítése
 StockTransferRightDelete=Törölje a készlettranszfereket
 BatchNotFound=A tétel/sorozat nem található ehhez a termékhez
 DeviceName=Eszköz neve
-SKU=SKU azonosító (Roller)
+SKU=ID
 englishlabel=Angol elnevezés
 uniqueidentifier=Egyedi azonosító (IMEI)
 AssignedDevice=Hozzárendelt eszköz