diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index b0c406c015c..0428a324f10 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.118 2011/07/27 17:53:44 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.119 2011/07/27 23:51:07 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.118 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.119 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -287,6 +287,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; $ret=`rm -fr $BUILDROOT/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$PROJECT/build/deb/po/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; @@ -488,7 +489,8 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; $ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - + $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; + print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 838a3ce7b97..d2d54e4a8b2 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.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/admin/system/index.php * \brief Home page of system information - * \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $ */ require("../../main.inc.php"); @@ -126,5 +127,5 @@ print '
'; print info_admin($langs->trans("SystemInfoDesc")).'
'; -llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $'); +llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $'); ?> 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..3e2e9b5bf13 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.184 2011/07/28 10:55:45 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,6 +3179,9 @@ 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' @@ -3462,4 +3465,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