diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 8c55edc3d1a..518b4f4d018 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -228,11 +228,14 @@ class modMyModule extends DolibarrModules
// Example:
// $this->export_code[$r]=$this->rights_class.'_'.$r;
- // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+ // $this->export_label[$r]='MyModule'; // Translation key (used only if key ExportDataset_xxx_z not found)
// $this->export_enabled[$r]='1'; // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
- // $this->export_permission[$r]=array(array("facture","facture","export"));
+ // $this->export_icon[$r]='generic:MyModule';
+ // $this->export_permission[$r]=array(array("mymodule","level1","level2"));
// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"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_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'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_tx'=>"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_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
// $this->export_sql_start[$r]='SELECT DISTINCT ';
// $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 7522a09bbf5..ceab5d54714 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -431,10 +431,10 @@ if ($step == 1 || ! $datatoexport)
//print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
print $objexport->array_export_module[$key]->getName();
print '';
- $icon=$objexport->array_export_icon[$key];
+ $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[$key]);
$label=$objexport->array_export_label[$key];
//print $value.'-'.$icon.'-'.$label."
";
- print img_object($objexport->array_export_module[$key]->getName(),$icon).' ';
+ print img_object($objexport->array_export_module[$key]->getName(), $icon).' ';
print $label;
print ' | ';
if ($objexport->array_export_perms[$key])
@@ -492,10 +492,10 @@ if ($step == 2 && $datatoexport)
// Lot de donnees a exporter
print ' | | '.$langs->trans("DatasetToExport").' | ';
print '';
- $icon=$objexport->array_export_icon[0];
+ $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
$label=$objexport->array_export_label[0];
//print $value.'-'.$icon.'-'.$label."
";
- print img_object($objexport->array_export_module[0]->getName(),$icon).' ';
+ print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
print $label;
print ' |
';
@@ -666,10 +666,10 @@ if ($step == 3 && $datatoexport)
// Lot de donnees a exporter
print '| '.$langs->trans("DatasetToExport").' | ';
print '';
- $icon=$objexport->array_export_icon[0];
+ $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
$label=$objexport->array_export_label[0];
//print $value.'-'.$icon.'-'.$label."
";
- print img_object($objexport->array_export_module[0]->getName(),$icon).' ';
+ print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
print $label;
print ' |
';
@@ -832,7 +832,8 @@ if ($step == 4 && $datatoexport)
// Lot de donnees a exporter
print '| '.$langs->trans("DatasetToExport").' | ';
print '';
- print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_icon[0]).' ';
+ $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
+ print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
print $objexport->array_export_label[0];
print ' |
';
@@ -1069,7 +1070,8 @@ if ($step == 5 && $datatoexport)
// Lot de donnees a exporter
print '| '.$langs->trans("DatasetToExport").' | ';
print '';
- print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_icon[0]).' ';
+ $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
+ print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
print $objexport->array_export_label[0];
print ' |
';