New: More import options. Supplier Products

htdocs/core/modules/modFournisseur.class.php

@@ -2,6 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 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
@@ -287,6 +288,31 @@ class modFournisseur extends DolibarrModules
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
             $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
             $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
+            
+            
+            // Imports
+            //--------
+            // Import product suppliers
+            $r++;
+            $this->import_code[$r]=$this->rights_class.'_'.$r;
+            $this->import_label[$r]="SuppliersProducts";	// Translation key
+            $this->import_icon[$r]='product';
+            $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('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price');
+            $this->import_tables_creator_array[$r]=array('sp'=>'fk_user');
+            $this->import_fields_array[$r]=array('sp.fk_product'=>"Product*",
+            		'sp.fk_soc'=>"Supplier*", 'sp.ref_fourn'=>'RefSupplier', 'sp.price'=>"Price*",
+            		'sp.quantity'=>"Quantity*",'sp.unitprice'=>'UnitPrice*','sp.tva_tx'=>'VAT'
+            );
+            	
+            $this->import_convertvalue_array[$r]=array(
+            		'sp.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'),
+            		'spd.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'Product')
+            );
+            $this->import_examplevalues_array[$r]=array('sp.fk_product'=>"PR123456",
+            		'sp.fk_soc'=>"My Supplier",'sp.ref_fourn'=>"SupplierRef",'sp.price'=>"50",
+            		'sp.quantity'=>"1",'sp.unitprice'=>'50','sp.tva_tx'=>'21'
+            );
 
 	}
 

htdocs/langs/ca_ES/exports.lang

@@ -118,4 +118,5 @@ TsvFormatDesc=Arxiu amb format <b>Valors separats per tabulador</b> (. Tsv)<br>
 ExportFieldAutomaticallyAdded=S'ha afegit automàticament el camp <b>%s</b>, ja que evitarà que línies idèntiques siguin considerades com duplicades (amb aquest camp, cada línia tindrà un id propi).
 CsvOptions=Opcions de l'arxiu CSV
 Separator=Separador
-Enclosure=Delimitador de camps
+Enclosure=Delimitador de camps
+SuppliersProducts=Productes de proveïdors

htdocs/langs/en_US/exports.lang

@@ -118,4 +118,5 @@ TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text fi
 ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all ligne will own its own id and will differ).
 CsvOptions=Csv Options
 Separator=Separator
-Enclosure=Enclosure
+Enclosure=Enclosure
+SuppliersProducts=Suppliers Products

htdocs/langs/es_ES/exports.lang

@@ -118,4 +118,5 @@ TsvFormatDesc=Archivo con formato <b>Valores separados por tabulador</b> (.tsv)<
 ExportFieldAutomaticallyAdded=Se ha añadido automáticamente el campo <b>%s</b>, ya que evitará que líneas idénticas sean consideradas como duplicadas (con este campo, cada línea tendrá un id propio).
 CsvOptions=Opciones del archivo CSV
 Separator=Separador
-Enclosure=Delimitador de campos
+Enclosure=Delimitador de campos
+SuppliersProducts=Productos de proveedores

htdocs/langs/fr_FR/exports.lang

@@ -119,3 +119,4 @@ ExportFieldAutomaticallyAdded=Le champ <b>%s</b> a été ajouté automatiquement
 CsvOptions=Options du fichier Csv
 Separator=Séparateur
 Enclosure=Délimiteur de champs
+SuppliersProducts=Produits Fournisseurs