Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/core/lib/mailmanspip.lib.php

@@ -24,27 +24,24 @@
 /**
  *  Return array head with list of tabs to view object informations
  *
- *  @param	Object	$object         Member
- *  @return array           		head
+ *  @return array Tabs of the module
  */
-function mailmanspip_admin_prepare_head($object)
+function mailmanspip_admin_prepare_head()
 {
-    global $langs, $conf, $user;
+    global $langs;
 
-    $h = 0;
-    $head = array();
-
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/mailman.php';
-    $head[$h][1] = $langs->trans("Mailman");
-    $head[$h][2] = 'mailman';
-    $h++;
-
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/spip.php';
-    $head[$h][1] = $langs->trans("SPIP");
-    $head[$h][2] = 'spip';
-    $h++;
-
-    return $head;
+    return array(
+        array(
+            DOL_URL_ROOT.'/adherents/admin/mailman.php',
+            $langs->trans('Mailman'),
+            'mailman'
+        ),
+        array(
+            DOL_URL_ROOT.'/adherents/admin/spip.php',
+            $langs->trans('SPIP'),
+            'spip'
+        )
+    );
 }
 
 ?>

htdocs/core/modules/modStock.class.php

@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -130,6 +131,34 @@ class modStock extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e';
 		$this->export_sql_end[$r] .=' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid';
 		$this->export_sql_end[$r] .=' AND e.entity = '.$conf->entity;
+		
+		
+		// Imports
+		//--------
+		
+		$r=0;
+		
+		$r++;
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]="Warehouses";	// Translation key
+		$this->import_icon[$r]=$this->picto;
+		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r]=array('e'=>MAIN_DB_PREFIX.'entrepot');
+		$this->import_tables_creator_array[$r]=array('e'=>'fk_user_author');
+		$this->import_fields_array[$r]=array('e.label'=>"LocationSummary*",
+				'e.description'=>"DescWareHouse",'e.lieu'=>"LieuWareHouse",
+				'e.address'=>"Address",'e.cp'=>'Zip','e.fk_pays'=>'CountryCode',
+				'e.statut'=>'Status'
+		);
+		
+		$this->import_convertvalue_array[$r]=array(
+				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionnaryCountry')
+		);
+		$this->import_regex_array[$r]=array('e.statut'=>'^[0|1]');
+		$this->import_examplevalues_array[$r]=array('e.label'=>"ALM001",
+				'e.description'=>"Central Warehouse",'e.lieu'=>"Central",
+				'e.address'=>"Route 66",'e.cp'=>'28080','e.fk_pays'=>'US',
+				'e.statut'=>'1');
 	}
 
 	/**

htdocs/langs/ca_ES/stocks.lang

@@ -2,6 +2,7 @@
 CHARSET=UTF-8
 WarehouseCard=Fitxa magatzem
 Warehouse=Magatzem
+Warehouses=Magatzems
 NewWarehouse=Nou magatzem o zona d'emmagatzematge
 WarehouseEdit=Edició magatzem
 MenuNewWarehouse=Nou magatzem

htdocs/langs/en_US/stocks.lang

@@ -2,6 +2,7 @@
 CHARSET=UTF-8
 WarehouseCard=Warehouse card
 Warehouse=Warehouse
+Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse

htdocs/langs/es_ES/stocks.lang

@@ -2,6 +2,7 @@
 CHARSET=UTF-8
 WarehouseCard=Ficha almacén
 Warehouse=Almacén
+Warehouses=Almacenes
 NewWarehouse=Nuevo almacén o zona de almacenaje
 WarehouseEdit=Edición almacén
 MenuNewWarehouse=Nuevo almacén

htdocs/langs/fr_FR/stocks.lang

@@ -2,6 +2,7 @@
 CHARSET=UTF-8
 WarehouseCard=Fiche entrepôt
 Warehouse=Entrepôt
+Warehouse=Entrepôts
 NewWarehouse=Nouvel entrepôt ou zone de stockage
 WarehouseEdit=Edition entrepôt
 MenuNewWarehouse=Nouvel entrepôt