diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 77d3e6cf271..95dee1424ef 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -72,7 +72,7 @@ class FormOther $result = $this->db->query($sql); if ($result) { - print ''; if ($useempty) { print ''; diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php index 6c1929d1dc9..a2239514898 100644 --- a/htdocs/core/modules/modSociete.class.php +++ b/htdocs/core/modules/modSociete.class.php @@ -270,7 +270,7 @@ class modSociete extends DolibarrModules include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; $this->export_fields_array[$r]+=array('u.login'=>'SaleRepresentativeLogin','u.firstname'=>'SaleRepresentativeFirstname', 'u.lastname'=>'SaleRepresentativeLastname'); //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid'); - $this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text','u.login'=>'Text','u.firstname'=>'Text','u.lastname'=>'Text','payterm.libelle'=>'Text','paymode.libelle'=>'Text','s.entity'=>'Numeric'); + $this->export_TypeFields_array[$r]=array('s.rowid'=>"Numeric", 's.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text','u.login'=>'Text','u.firstname'=>'Text','u.lastname'=>'Text','payterm.libelle'=>'Text','paymode.libelle'=>'Text','s.entity'=>'Numeric'); $this->export_entities_array[$r]=array('u.login'=>'user','u.firstname'=>'user','u.lastname'=>'user'); // We define here only fields that use another picto $this->export_examplevalues_array[$r]=array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'0 (not a supplier) or 1 (supplier)'); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 24b9ef3728e..152e095afa6 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -510,19 +510,21 @@ if ($step == 2 && $datatoexport) $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport")); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); + print '
'; + print '
'; print ''; // Module - print ''; + print ''; print ''; // Lot de donnees a exporter - print ''; + print ''; print ''; print '
'.$langs->trans("Module").'
'.$langs->trans("Module").''; //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' '; print $objexport->array_export_module[0]->getName(); print '
'.$langs->trans("DatasetToExport").'
'.$langs->trans("DatasetToExport").''; $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]); $label=$objexport->array_export_label[0]; @@ -532,6 +534,10 @@ if ($step == 2 && $datatoexport) print '
'; + print '
'; + + dol_fiche_end(); + print '
'; // Combo list of export models @@ -543,6 +549,7 @@ if ($step == 2 && $datatoexport) print '
'; print $langs->trans("SelectExportFields").' '; $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1); + print ' '; print ''; print '
'; print ''; @@ -635,8 +642,7 @@ if ($step == 2 && $datatoexport) print ''; - print ''; - + /* * Barre d'action * @@ -693,19 +699,21 @@ if ($step == 3 && $datatoexport) $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport")); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); + print '
'; + print '
'; print ''; // Module - print ''; + print ''; print ''; // Lot de donnees a exporter - print ''; + print ''; print ''; // Nbre champs exportes - print ''; + print ''; $list=''; foreach($array_selected as $code=>$value) { @@ -725,6 +733,8 @@ if ($step == 3 && $datatoexport) print ''; print '
'.$langs->trans("Module").'
'.$langs->trans("Module").''; //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' '; print $objexport->array_export_module[0]->getName(); print '
'.$langs->trans("DatasetToExport").'
'.$langs->trans("DatasetToExport").''; $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]); $label=$objexport->array_export_label[0]; @@ -715,7 +723,7 @@ if ($step == 3 && $datatoexport) print '
'.$langs->trans("ExportedFields").'
'.$langs->trans("ExportedFields").''.$list.'
'; + print '
'; + print '
'; // Combo list of export models @@ -866,8 +876,10 @@ if ($step == 4 && $datatoexport) $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport")); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); + print '
'; + print '
'; print ''; // Module @@ -918,6 +930,8 @@ if ($step == 4 && $datatoexport) } print '
'; + print '
'; + print '
'; // Select request if all fields are selected @@ -1102,7 +1116,7 @@ if ($step == 5 && $datatoexport) $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport")); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); /* * Confirmation suppression fichier @@ -1113,17 +1127,20 @@ if ($step == 5 && $datatoexport) } + print '
'; + print '
'; + print ''; // Module - print ''; + print ''; print ''; // Lot de donnees a exporter - print ''; + print ''; print ''; // List of exported fields - print ''; + print ''; $list=''; foreach($array_selected as $code=>$label) { @@ -1143,7 +1160,7 @@ if ($step == 5 && $datatoexport) // List of filtered fiels if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) { - print ''; + print ''; $list=''; if (! empty($array_filtervalue)) { @@ -1162,6 +1179,8 @@ if ($step == 5 && $datatoexport) } print '
'.$langs->trans("Module").'
'.$langs->trans("Module").''; //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' '; print $objexport->array_export_module[0]->getName(); print '
'.$langs->trans("DatasetToExport").'
'.$langs->trans("DatasetToExport").''; $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]); print img_object($objexport->array_export_module[0]->getName(), $icon).' '; @@ -1131,7 +1148,7 @@ if ($step == 5 && $datatoexport) print '
'.$langs->trans("ExportedFields").'
'.$langs->trans("ExportedFields").'
'.$langs->trans("FilteredFields").'
'.$langs->trans("FilteredFields").'
'; + print '
'; + print '
'; print $langs->trans("NowClickToGenerateToBuildExportFile").'
'; @@ -1222,8 +1241,6 @@ if ($step == 5 && $datatoexport) print ''; } -print '
'; - llxFooter(); $db->close();