diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index 3254b136cb8..ca913f2f5ca 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -431,7 +431,7 @@ class modStock extends DolibarrModules $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode' => 'Text')); } $this->export_entities_array[$r] = array( - 'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse', + 'id.qty_view' => 'inventory_line', 'id.qty_stock' => 'inventory_line', 'id.batch' => 'inventory_line', 'id.qty_regulated' => 'inventory_line', 'id.fk_warehouse' => 'inventory_line', 'id.rowid' => 'inventory_line', 'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse', 'p.rowid' => "product", 'p.ref' => "product", 'p.fk_product_type' => "product", 'p.label' => "product", 'p.description' => "product", 'p.note' => "product", 'p.barcode' => "product", 'p.price' => "product", 'p.tva_tx' => 'product', 'p.tosell' => "product", 'p.tobuy' => "product", 'p.duration' => "product", 'p.datec' => 'product', 'p.tms' => 'product' ); // We define here only fields that use another icon that the one defined into export_icon diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 92c05c4d437..030b01c2200 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -80,7 +80,8 @@ $entitytoicon = array( 'translation' => 'generic', 'bomm' => 'bom', 'bomline' => 'bom', - 'conferenceorboothattendee' => 'contact' + 'conferenceorboothattendee' => 'contact', + 'inventory_line' => 'inventory' ); // Translation code, array duplicated in import.php, was not synchronized, TODO put it somewhere only once @@ -133,7 +134,8 @@ $entitytolang = array( 'bom' => 'BOM', 'bomline' => 'BOMLine', 'conferenceorboothattendee' => 'Attendee', - 'inventory' => 'Inventory' + 'inventory' => 'Inventory', + 'inventory_line' => 'InventoryLine' ); $array_selected = isset($_SESSION["export_selected_fields"]) ? $_SESSION["export_selected_fields"] : array(); diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 3aec5654e00..bd87a858099 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -341,7 +341,8 @@ InventoryId=Inventory id DateInventory=Inventory date InventoryStatus=Inventory status InventoryTitle=Inventory name -InventoryLineId=Inventory line +InventoryLine=Inventory line +InventoryLineId=Inventory line ID InventoryRef=Inventory ref QtyViewed=Quantity viewed QtyStock=Quantity on stock