diff --git a/htdocs/exports/export.class.php b/htdocs/exports/export.class.php index 0e3a173ab51..a52abec347c 100644 --- a/htdocs/exports/export.class.php +++ b/htdocs/exports/export.class.php @@ -124,6 +124,8 @@ class Export $this->array_export_sql[$i]=$module->export_sql[$r]; // Tableau des champ à exporter (clé=champ, valeur=libellé) $this->array_export_fields[$i]=$module->export_fields_array[$r]; + // Tableau des entites à exporter (clé=champ, valeur=entite) + $this->array_export_entities[$i]=$module->export_entities_array[$r]; // Tableau des alias à exporter (clé=champ, valeur=alias) $this->array_export_alias[$i]=$module->export_alias_array[$r]; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index cf8924c2496..1a4b4856efb 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -38,6 +38,9 @@ $user->getrights(); if (! $user->societe_id == 0) accessforbidden(); +$entitytoicon=array('invoice'=>'bill','invoice_line'=>'bill'); +$entitytolang=array('user'=>'User','company'=>'Company','contact'=>'Contact','invoice'=>'Bill','invoice_line'=>'InvoiceLine'); + $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array(); $datatoexport=isset($_GET["datatoexport"])?$_GET["datatoexport"]:''; $action=isset($_GET["action"]) ? $_GET["action"] : (isset($_POST["action"])?$_POST["action"]:''); @@ -223,7 +226,9 @@ if ($step == 2 && $datatoexport) print $langs->trans("SelectExportFields").'
'; print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; @@ -231,12 +236,13 @@ if ($step == 2 && $datatoexport) // Champs exportables $fieldsarray=$objexport->array_export_fields[0]; -# $this->array_export_module[$i]=$module; -# $this->array_export_code[$i]=$module->export_code[$r]; -# $this->array_export_label[$i]=$module->export_label[$r]; -# $this->array_export_fields_code[$i]=$module->export_fields_code[$r]; -# $this->array_export_fields_label[$i]=$module->export_fields_label[$r]; -# $this->array_export_sql[$i]=$module- +# $this->array_export_module[0]=$module; +# $this->array_export_code[0]=$module->export_code[$r]; +# $this->array_export_label[0]=$module->export_label[$r]; +# $this->array_export_sql[0]=$module->export_sql[$r]; +# $this->array_export_fields[0]=$module->export_fields_array[$r]; +# $this->array_export_entities[0]=$module->export_fields_entities[$r]; +# $this->array_export_alias[0]=$module->export_fields_alias[$r]; $var=true; foreach($fieldsarray as $code=>$label) @@ -244,6 +250,11 @@ if ($step == 2 && $datatoexport) $var=!$var; print ""; + $entity=$objexport->array_export_entities[0][$code]; + $entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$entity; + $entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$entity; + + print ''; if (isset($array_selected[$code]) && $array_selected[$code]) { // Champ sélectionné @@ -253,6 +264,7 @@ if ($step == 2 && $datatoexport) } else { + // Champ non sélectionné print ''; print ''; print ''; @@ -334,7 +346,9 @@ if ($step == 3 && $datatoexport) print $langs->trans("ChooseFieldsOrdersAndTitle").'
'; print '
'.$langs->trans("ExportableFields").'
'.$langs->trans("Entities").''.$langs->trans("ExportableFields").' '.$langs->trans("ExportedFields").'
'.img_object('',$entityicon).' '.$langs->trans($entitylang).''.$langs->trans($label).' ('.$code.')'.img_right().' 
'; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; @@ -345,6 +359,12 @@ if ($step == 3 && $datatoexport) { $var=!$var; print ""; + + $entity=$objexport->array_export_entities[0][$code]; + $entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$entity; + $entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$entity; + + print ''; print ''; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 98e0df51b14..d030010a8be 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -8,6 +8,8 @@ BillsCustomersUnpayedForCompany=Unpayed customers' invoices for %s BillsSuppliersUnpayed=Unpayed suppliers' invoices BillsUnpayed=Unpayed BillsStatistics=Invoices statistics +Invoice=Invoice +InvoiceLine=Invoice line CardBill=Invoice card SupplierBill=Supplier invoice SupplierBills=suppliers invoices diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 5fbb240ce0c..0ec972e16d5 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -291,6 +291,8 @@ BuildPDF=Build PDF RebuildPDF=Rebuild PDF BuildDoc=Build Doc RebuildDoc=Rebuild Doc +Entity=Entity +Entities=Entities # Countries CountryFR=France CountryBE=Belgium diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 421f1a5cae0..e87206b5544 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -8,6 +8,8 @@ BillsCustomersUnpayedForCompany=Factures clients impay BillsSuppliersUnpayed=Factures fournisseurs impayées BillsUnpayed=Impayées BillsStatistics=Statistiques factures +Invoice=Facture +InvoiceLine=Ligne de facture CardBill=Fiche facture SupplierBill=Facture fournisseur SupplierBills=Factures fournisseurs diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 572a217b01e..02c763ff962 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -291,6 +291,8 @@ BuildPDF=G RebuildPDF=Regénérer le PDF BuildDoc=Générer le doc RebuildDoc=Regénérer le doc +Entity=Entité +Entities=Entités # Countries CountryFR=France CountryBE=Belgique
'.$langs->trans("ExportedFields").'
'.$langs->trans("Entities").''.$langs->trans("ExportedFields").''.$langs->trans("Position").' '.$langs->trans("FieldsTitle").'
'.img_object('',$entityicon).' '.$langs->trans($entitylang).''.$langs->trans($objexport->array_export_fields[0][$code]).' ('.$code.')