diff --git a/htdocs/exports/export.class.php b/htdocs/exports/export.class.php index 63a280f02b2..88e198f5d1f 100644 --- a/htdocs/exports/export.class.php +++ b/htdocs/exports/export.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2008 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -15,16 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/exports/export.class.php \ingroup export \brief Fichier de la classe des exports - \version $Revision$ + \version $Id$ */ diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 535594293bb..d24948f1a54 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2008 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -15,15 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/exports/export.php \ingroup export \brief Page d'edition d'un export - \version $Revision$ + \version $Id$ */ require_once("./pre.inc.php"); @@ -44,7 +42,7 @@ $entitytoicon=array( 'account'=>'account', 'payment'=>'payment', 'product'=>'product'); -$entitytolang=array( +$entitytolang=array( // Translation code 'user'=>'User', 'company'=>'Company','contact'=>'Contact', 'invoice'=>'Bill','invoice_line'=>'InvoiceLine', @@ -242,6 +240,7 @@ if ($step == 1 || ! $datatoexport) print img_object($objexport->array_export_module[$key]->getName(),$objexport->array_export_module[$key]->picto).' '; print $objexport->array_export_module[$key]->getName(); print ''; + //print $value; print $objexport->array_export_label[$key]; print ''; print ''.img_picto($langs->trans("NewExport"),'filenew').''; diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index eb4e86a4b1d..909fd735969 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -323,7 +323,7 @@ class DolibarrModules if ($langs->trans($langstring) == $langstring) { // Traduction non trouvee - return $this->export_label[$r]; + return $langs->trans($this->export_label[$r]); } else { diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 0f75164f59d..ff94edc7ab3 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -18,12 +18,11 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \defgroup facture Module facture \brief Module pour g�rer les factures clients et/ou fournisseurs + \version $Id$ */ @@ -48,8 +47,8 @@ class modFacture extends DolibarrModules */ function modFacture($DB) { - $this->db = $DB ; - $this->numero = 30 ; + $this->db = $DB; + $this->numero = 30; $this->family = "financial"; $this->name = "Factures"; diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index f8881df390e..68bab41c2a6 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005 Regis Houssin @@ -18,13 +18,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \defgroup societe Module societe - \brief Module pour g�rer les societes et contacts clients + \brief Module pour gerer les societes et contacts clients + \version $Id$ */ /** @@ -188,7 +187,7 @@ class modSociete extends DolibarrModules // Export des liste des societes et attributs $r++; $this->export_code[$r]=$this->rights_class.'_'.$r; - $this->export_label[$r]='Tiers (soci�t�s/institutions) et attributs'; + $this->export_label[$r]='ExportDataset_company_1'; $this->export_permission[$r]=array(array("societe","export")); $this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.address'=>"Address",'s.cp'=>"Zip",'s.ville'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.tel'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.siret'=>"IdProf1",'s.siren'=>"IdProf2",'s.ape'=>"IdProf3",'s.idprof4'=>"IdProf4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note'=>"Note"); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>"company",'s.prefix_comm'=>"company",'s.client'=>"company",'s.fournisseur'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.code_fournisseur'=>"company",'s.address'=>"company",'s.cp'=>"company",'s.ville'=>"company",'p.libelle'=>"company",'p.code'=>"company",'s.tel'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note'=>"company"); @@ -206,7 +205,7 @@ class modSociete extends DolibarrModules // Export des liste des contacts et attributs $r++; $this->export_code[$r]=$this->rights_class.'_'.$r; - $this->export_label[$r]='Contacts (de tiers) et attributs'; + $this->export_label[$r]='ExportDataset_company_2'; $this->export_permission[$r]=array(array("societe","contact","export")); $this->export_fields_array[$r]=array('c.civilite'=>"CivilityCode",'c.name'=>'Lastname','c.firstname'=>'Firstname','c.datec'=>"DateCreation",'c.tms'=>"DateLastModification",'c.address'=>"Address",'c.cp'=>"Zip",'c.ville'=>"Town",'c.phone'=>"Phone",'c.fax'=>"Fax",'c.email'=>"EMail",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.rowid'=>"IdCompany",'s.nom'=>"CompanyName",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode"); $this->export_entities_array[$r]=array('c.civilite'=>"contact",'c.name'=>'contact','c.firstname'=>'contact','c.datec'=>"contact",'c.tms'=>"contact",'c.address'=>"contact",'c.cp'=>"contact",'c.ville'=>"contact",'c.phone'=>"contact",'c.fax'=>"contact",'c.email'=>"contact",'p.libelle'=>"contact",'p.code'=>"contact",'s.rowid'=>"company",'s.nom'=>"company",'s.code_client'=>"company",'s.code_fournisseur'=>"company"); diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 222460702fc..becd2f137ea 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -222,7 +222,7 @@ ContactNotLinkedToCompany=Contact non li DolibarrLogin=Login Dolibarr NoDolibarrAccess=Pas d'accès Dolibarr ExportDataset_company_1=Tiers (sociétés/institutions) et attributs -ExportDataset_company_2=Contacts de tiers et attributs +ExportDataset_company_2=Contacts (de tiers) et attributs PriceLevel=Niveau de prix DeliveriesAddress=Adresse(s) de livraison DeliveryAddress=Adresse de livraison