Trad: Traduction des libellés d'exports

htdocs/exports/export.php

 <?php
-/* Copyright (C) 2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@cap-networks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -229,7 +228,7 @@ if ($step == 1 || ! $datatoexport)
     // Affiche les modules d'exports
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td width="25%">'.$langs->trans("Module").'</td>';
+    print '<td>'.$langs->trans("Module").'</td>';
     print '<td>'.$langs->trans("ExportableDatas").'</td>';
     print '<td>&nbsp;</td>';
     print '</tr>';
@@ -239,7 +238,7 @@ if ($step == 1 || ! $datatoexport)
         foreach ($objexport->array_export_code as $key => $value)
         {
             $val=!$val;
-            print '<tr '.$bc[$val].'><td>';
+            print '<tr '.$bc[$val].'><td nospan="nospan">';
             print img_object($objexport->array_export_module[$key]->getName(),$objexport->array_export_module[$key]->picto).' ';
             print $objexport->array_export_module[$key]->getName();
             print '</td><td>';

htdocs/includes/modules/modBanque.class.php

@@ -127,9 +127,9 @@ class modBanque extends DolibarrModules
         $r++;
         $this->export_code[$r]=$this->id.'_'.$r;
         $this->export_label[$r]='Ecritures bancaires et relevés';
-        $this->export_fields_array[$r]=array('b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label','-b.amount'=>'Debit','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","but.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode");
-		$this->export_entities_array[$r]=array('b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account","but.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company");
-        $this->export_alias_array[$r]=array('b.rowid'=>'tran_id','ba.ref'=>'account_ref','ba.label'=>'account_label','b.datev'=>'datev','b.dateo'=>'dateo','b.label'=>'label','-b.amount'=>'debit','b.amount'=>'credit','b.num_releve'=>'numrel','b.datec'=>"datec","but.url_id"=>"soc_id","s.nom"=>"thirdparty","s.code_compta"=>"customeracccode","s.code_compta_fournisseur"=>"supplieracccode");
+        $this->export_fields_array[$r]=array('b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label','b.num_chq'=>'CheckNumber','-b.amount'=>'Debit','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","but.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode");
+		$this->export_entities_array[$r]=array('b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account','b.num_chq'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account","but.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company");
+        $this->export_alias_array[$r]=array('b.rowid'=>'tran_id','ba.ref'=>'account_ref','ba.label'=>'account_label','b.datev'=>'datev','b.dateo'=>'dateo','b.label'=>'label','b.num_chq'=>'num','-b.amount'=>'debit','b.amount'=>'credit','b.num_releve'=>'numrel','b.datec'=>"datec","but.url_id"=>"soc_id","s.nom"=>"thirdparty","s.code_compta"=>"customeracccode","s.code_compta_fournisseur"=>"supplieracccode");
         $this->export_sql[$r]="select distinct ";
         $i=0;
         foreach ($this->export_alias_array[$r] as $key => $value)

htdocs/includes/modules/modFacture.class.php

@@ -175,7 +175,7 @@ class modFacture extends DolibarrModules
     
         $r++;
         $this->export_code[$r]=$this->id.'_'.$r;
-        $this->export_label[$r]='Factures clients et lignes de facture';
+        $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
         $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"Id",'f.facnumber'=>"Ref",'f.datec'=>"DateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"BillShortStatusPayed",'f.fk_statut'=>'Status','f.note'=>"Note",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_taux'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
 		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_taux'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
         $this->export_alias_array[$r]=array('s.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.cp'=>'soc_zip','s.ville'=>'soc_ville','s.fk_pays'=>'soc_pays','s.tel'=>'soc_tel','s.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy','s.code_compta_fournisseur'=>'soc_supplier_accountancy','f.rowid'=>"invoiceid",'f.facnumber'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid','fd.description'=>"linedescription",'fd.price'=>"lineprice",'fd.total_ht'=>"linetotalht",'fd.total_tva'=>"linetotaltva",'fd.total_ttc'=>"linetotalttc",'fd.tva_taux'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend",'fd.fk_product'=>'productid','p.ref'=>'productref');
@@ -194,7 +194,7 @@ class modFacture extends DolibarrModules
 
         $r++;
         $this->export_code[$r]=$this->id.'_'.$r;
-        $this->export_label[$r]='Factures clients et rglements';
+        $this->export_label[$r]='CustomersInvoicesAndPayments';	// Translation key (used only if key ExportDataset_xxx_z not found)
         $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"Id",'f.facnumber'=>"Ref",'f.datec'=>"DateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"BillShortStatusPayed",'f.fk_statut'=>'Status','f.note'=>"Note",'pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'Numero');
 		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
         $this->export_alias_array[$r]=array('s.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.cp'=>'soc_zip','s.ville'=>'soc_ville','s.fk_pays'=>'soc_pays','s.tel'=>'soc_tel','s.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy','s.code_compta_fournisseur'=>'soc_supplier_accountancy','f.rowid'=>"invoiceid",'f.facnumber'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'pf.amount'=>'amount_payment','p.datep'=>'date_payment','p.num_paiement'=>'num_payment');

htdocs/includes/modules/modProduit.class.php

@@ -147,7 +147,7 @@ class modProduit extends DolibarrModules
 
     $r++;
     $this->export_code[$r]=$this->id.'_'.$r;
-    $this->export_label[$r]="ProductsOrServices";	// Translation key
+    $this->export_label[$r]="ProductsOrServices";	// Translation key (used only if key ExportDataset_xxx_z not found)
     $this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note",'p.price'=>"Price",'p.tva_tx'=>'VAT','p.envente'=>"OnSell",'p.duration'=>"Duration",'p.datec'=>'DateCreation','p.tms'=>'DateModification');
     $this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.fk_product_type'=>"product",'p.label'=>"product",'p.description'=>"product",'p.note'=>"product",'p.price'=>"product",'p.tva_tx'=>'product','p.envente'=>"product",'p.duration'=>"product",'p.datec'=>'product','p.tms'=>'product');
     $this->export_alias_array[$r]=array('p.rowid'=>"id",'p.ref'=>"ref",'p.fk_product_type'=>"type",'p.label'=>"label",'p.description'=>"description",'p.note'=>"note",'p.price'=>"price",'p.tva_tx'=>'vat','p.envente'=>"onsell",'p.duration'=>"duration",'p.datec'=>'datecreation','p.tms'=>'datemodification');

htdocs/langs/en_US/admin.lang

@@ -215,7 +215,7 @@ Module400Name=Projects
 Module400Desc=Projects' management inside other modules
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Taxes and social contributions
+Module500Name=Taxes, social contributions and dividends
 Module500Desc=Taxes and social contributions' management
 Module600Name=Notifications
 Module600Desc=Send notifications (by email) on Dolibarr business events

htdocs/langs/en_US/banks.lang

@@ -109,3 +109,4 @@ ConfirmDeleteTransaction=Are you sure you want to delete this transaction ?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions
 BankMovements=Movements
 CashBudget=Cash budget
+ExportDataset_banque_1=Bank transactions and account statement

htdocs/langs/en_US/bills.lang

@@ -22,6 +22,7 @@ ReplacementInvoice=Replacement invoice
 ReplacedByInvoice=Replaced by invoice %s
 ReplacementByInvoice=Replaced by invoice
 CorrectInvoice=Correct invoice %s
+CorrectInvoice=Correct invoice %s
 CorrectionInvoice=Correction invoice
 NoReplacableInvoice=No replacable invoices
 NoInvoiceToCorrect=No invoice to correct
@@ -195,7 +196,10 @@ Repeatable=Repeatable
 ChangeIntoRepeatableInvoice=Change into repeatable
 CreateRepeatableInvoice=Create repeatable invoice
 CreateFromRepeatableInvoice=Create from repeatable invoice
+CustomersInvoicesAndInvoiceLines=Customer invoices and invoices' lines
+CustomersInvoicesAndPayments=Customer invoices and payments
 ExportDataset_invoice_1=Customer invoices list and invoices' lines
+ExportDataset_invoice_2=Customer invoices and payments
 ProformaBill=Proforma Bill:
 Reduction=Reduction
 ReductionShort=Reduc.

htdocs/langs/en_US/compta.lang

@@ -72,3 +72,4 @@ PaySocialContribution=Pay a social contribution
 ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as payed?
 DeleteSocialContribution=Delete a social contribution
 ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
+ExportDataset_tax_1=Social contributions and payments

htdocs/langs/en_US/suppliers.lang

@@ -19,4 +19,6 @@ ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
 SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+RefSupplierShort=Ref. supplier
\ No newline at end of file
+ExportDataset_fournisseur_1=Supplier invoices list and invoices' lines
+ExportDataset_fournisseur_2=Supplier invoices and payments

htdocs/langs/fr_BE/admin.lang

@@ -159,7 +159,7 @@ Module400Name=Projets
 Module400Desc=Gestion des projets au sein d'autres modules
 Module410Name=WebCalendar
 Module410Desc=Intégration de WebCalendar
-Module500Name=Contributions sociales et taxes
+Module500Name=Contributions sociales, taxes et dividendes
 Module500Desc=Gestion des contributions sociales et taxes
 Module600Name=Avertissements
 Module600Desc=Envoi d'avertissement (par e-mail) lors d'évènements de business dans Dolibarr

htdocs/langs/fr_FR/admin.lang

@@ -215,7 +215,7 @@ Module400Name=Projets
 Module400Desc=Gestion des projets au sein des autres modules
 Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
-Module500Name=Taxes et charges sociales
+Module500Name=Taxes, charges sociales et dividendes
 Module500Desc=Gestion des taxes et charges sociales
 Module600Name=Notifications
 Module600Desc=Envoi de notifications (par mail) sur les évênements métiers Dolibarr

htdocs/langs/fr_FR/banks.lang

@@ -108,4 +108,5 @@ DeleteTransaction=Supprimer la transaction
 ConfirmDeleteTransaction=Etes-vous sur de vouloir supprimer cette transaction ?
 ThisWillAlsoDeleteBankRecord=Ceci supprimera aussi les écritures banquaires générées
 BankMovements=Mouvements
-CashBudget=Budget de trésorerie
+CashBudget=Budget de trésorerie
\ No newline at end of file
+ExportDataset_banque_1=Transaction bancaire et relevé
\ No newline at end of file

htdocs/langs/fr_FR/bills.lang

@@ -195,7 +195,10 @@ Repeatable=R
 ChangeIntoRepeatableInvoice=Modifier en récurrente
 CreateRepeatableInvoice=Créer facture récurrente
 CreateFromRepeatableInvoice=Créer depuis facture récurrente
+CustomersInvoicesAndInvoiceLines=Factures clients et lignes de factures
+CustomersInvoicesAndPayments=Factures clients et règlements
 ExportDataset_invoice_1=Factures clients et lignes de facture
+ExportDataset_invoice_2=Factures clients et règlements
 ProformaBill=Facture Proforma :
 Reduction=Réduction
 ReductionShort=Réduc.

htdocs/langs/fr_FR/compta.lang

@@ -71,4 +71,5 @@ NoWaitingChecks=Pas de ch
 PaySocialContribution=Payer une charge sociale
 ConfirmPaySocialContribution=Etes-vous sûr de vouloir classer cette charge sociale à payé ?
 DeleteSocialContribution=Effacer charge sociale
-ConfirmDeleteSocialContribution=Etes-vous sûr de vouloir supprimer cette charge sociale ?
+ConfirmDeleteSocialContribution=Etes-vous sûr de vouloir supprimer cette charge sociale ?
\ No newline at end of file
+ExportDataset_tax_1=Charges sociales et paiements
\ No newline at end of file

htdocs/langs/fr_FR/suppliers.lang

@@ -19,4 +19,6 @@ ProductHasAlreadyReferenceInThisSupplier=Ce produit a d
 NoRecordedSuppliers=Pas de fournisseurs enregistrs
 SupplierPayment=Paiement fournisseur
 SuppliersArea=Espace fournisseurs
-RefSupplierShort=Rf. fournisseur
+RefSupplierShort=Rf. fournisseur
\ No newline at end of file
+ExportDataset_fournisseur_1=Factures fournisseurs et lignes de facture
+ExportDataset_fournisseur_2=Factures fournisseurs et rglements