lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Export was broken after ODT support.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-03-13 01:09:57 +00:00
parent 0d8d1fe160
commit 0bdd4c922a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/exports/export.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -758,7 +758,7 @@ if ($step == 4 && $datatoexport)
if (! is_dir($conf->export->dir_temp)) create_exdir($conf->export->dir_temp); if (! is_dir($conf->export->dir_temp)) create_exdir($conf->export->dir_temp);
// Affiche liste des documents // Affiche liste des documents
// NB: La fonction show_documents rescanne les modules qd genallowed=1 // NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
$formfile->show_documents('export','',$conf->export->dir_temp.'/'.$user->id,$_SERVER["PHP_SELF"].'?step=4&datatoexport='.$datatoexport,$liste,1,(! empty($_POST['model'])?$_POST['model']:'csv'),'',1); $formfile->show_documents('export','',$conf->export->dir_temp.'/'.$user->id,$_SERVER["PHP_SELF"].'?step=4&datatoexport='.$datatoexport,$liste,1,(! empty($_POST['model'])?$_POST['model']:'csv'),'',1);
print '</td><td width="50%">&nbsp;</td></tr>'; print '</td><td width="50%">&nbsp;</td></tr>';

2
htdocs/includes/modules/export/modules_export.php
View File

@ -91,7 +91,7 @@ class ModeleExports
} }
} }
return array_keys($this->driverlabel); return $this->driverlabel;
} }