From 6f430cc630931883292f12b3bf7dbd9b41e90a45 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 17 Oct 2012 11:43:26 +0200 Subject: [PATCH] New: More import options. Supplier Products --- htdocs/core/modules/modFournisseur.class.php | 26 ++++++++++++++++++++ htdocs/langs/ca_ES/exports.lang | 3 ++- htdocs/langs/en_US/exports.lang | 3 ++- htdocs/langs/es_ES/exports.lang | 3 ++- htdocs/langs/fr_FR/exports.lang | 1 + 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 91c52370bc9..ebaf2da4e23 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003 Rodolphe Quiedeville * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2012 Juanjo Menent * * 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' + ); } diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang index d93843631ef..be2f30d45c8 100644 --- a/htdocs/langs/ca_ES/exports.lang +++ b/htdocs/langs/ca_ES/exports.lang @@ -118,4 +118,5 @@ TsvFormatDesc=Arxiu amb format Valors separats per tabulador (. Tsv)
ExportFieldAutomaticallyAdded=S'ha afegit automàticament el camp %s, 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 \ No newline at end of file +Enclosure=Delimitador de camps +SuppliersProducts=Productes de proveïdors \ No newline at end of file diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 02a04cb3c1a..2d332ff25ca 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -118,4 +118,5 @@ TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text fi ExportFieldAutomaticallyAdded=Field %s 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 \ No newline at end of file +Enclosure=Enclosure +SuppliersProducts=Suppliers Products \ No newline at end of file diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang index ccfeba6dfd4..0889e50e1f9 100644 --- a/htdocs/langs/es_ES/exports.lang +++ b/htdocs/langs/es_ES/exports.lang @@ -118,4 +118,5 @@ TsvFormatDesc=Archivo con formato Valores separados por tabulador (.tsv)< ExportFieldAutomaticallyAdded=Se ha añadido automáticamente el campo %s, 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 \ No newline at end of file +Enclosure=Delimitador de campos +SuppliersProducts=Productos de proveedores \ No newline at end of file diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang index 3c99687cd29..e14fb9ace31 100644 --- a/htdocs/langs/fr_FR/exports.lang +++ b/htdocs/langs/fr_FR/exports.lang @@ -119,3 +119,4 @@ ExportFieldAutomaticallyAdded=Le champ %s a été ajouté automatiquement CsvOptions=Options du fichier Csv Separator=Séparateur Enclosure=Délimiteur de champs +SuppliersProducts=Produits Fournisseurs \ No newline at end of file