From 3a84f149a635cf951202ee3ab5225ddc44465a82 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Jul 2011 14:27:57 +0000 Subject: [PATCH] Fix: Removed duplicated files --- htdocs/core/class/interfaces.class.php | 5 +++-- htdocs/install/upgrade2.php | 15 ++++++++++----- htdocs/theme/auguria/style.css.php | 7 ++++--- htdocs/theme/eldy/style.css.php | 5 +++-- htdocs/theme/freelug/style.css.php | 5 +++-- htdocs/theme/yellow/style.css.php | 5 +++-- htdocs/viewimage.php | 5 +++-- 7 files changed, 29 insertions(+), 18 deletions(-) diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 2ca2f82789e..8deeda0fb57 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ */ diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 2e43754e66e..3d020f2684d 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -22,7 +22,7 @@ /** * \file htdocs/install/upgrade2.php * \brief Upgrade some data - * \version $Id: upgrade2.php,v 1.182 2011/07/27 17:34:43 eldy Exp $ + * \version $Id: upgrade2.php,v 1.185 2011/07/28 14:27:57 eldy Exp $ */ include_once('./inc.php'); @@ -306,7 +306,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) // Reload menus migrate_reload_menu($db,$langs,$conf,$versionto); - print $langs->trans("MigrationFinished"); + print '
'.$langs->trans("MigrationFinished").''; } // Script for VX (X<3.1) -> V3.1 @@ -324,7 +324,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) // Reload menus migrate_reload_menu($db,$langs,$conf,$versionto); - print $langs->trans("MigrationFinished"); + print '
'.$langs->trans("MigrationFinished").''; } // On commit dans tous les cas. @@ -3179,9 +3179,14 @@ function migrate_delete_old_files($db,$langs,$conf) DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_Ecotax.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_fraisport.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modPropale_PropalWorkflow.class.php', + DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone.lib.php', + DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_backoffice.php', + DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_frontoffice.php', DOL_DOCUMENT_ROOT.'/includes/modules/mailings/dolibarr_services_expired.modules.php', DOL_DOCUMENT_ROOT.'/includes/modules/mailings/poire.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php' + DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php', + DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_crabe.modules.php', + DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_oursin.modules.php' ); foreach ($filetodeletearray as $filetodelete) @@ -3462,4 +3467,4 @@ update llx_facture set paye=1, fk_statut=2 where close_code is null and rowid in (...) */ -?> \ No newline at end of file +?> diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index edb62d728d5..013e493ec49 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.90 2011/07/28 13:26:34 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1100,7 +1101,7 @@ border-left-style: solid; } table.noborder td { -padding: 1px 2px 2px 1px; /* t r b l */ +padding: 1px 2px 0px 1px; /* t r b l */ } table.nobordernopadding { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c15f65c5630..9af151bc40a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/28 13:22:19 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index bca03dc2770..928700d2f7a 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -13,13 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/freelug/style.css.php * \brief Fichier de style CSS du theme Freelug - * \version $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $ + * \version $Id: style.css.php,v 1.43 2011/07/28 13:31:58 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 6e14cbf8e12..74a4705b691 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -13,13 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/yellow/style.css.php * \brief Fichier de style CSS du theme Yellow - * \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index fb4b85a0aa9..143af8934c7 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -22,7 +23,7 @@ * \file htdocs/viewimage.php * \brief Wrapper to show images into Dolibarr screens * \remarks Call to wrapper is '' - * \version $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $ */ // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).