From 945d951ef126d35d552c23099438be872ce6f129 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2011 14:03:15 +0000 Subject: [PATCH] Fix: Missing global --- ChangeLog | 3 +-- README | 13 ++++++++++--- README-FR | 12 +++++++++--- htdocs/compta/facture/impayees.php | 12 ++++++------ htdocs/compta/paiement_charge.php | 17 +++++++++-------- htdocs/core/class/html.formfile.class.php | 9 ++++----- .../modules/fichinter/pdf_soleil.modules.php | 4 ++-- htdocs/langs/zh_CN/main.lang | 4 ++-- 8 files changed, 43 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2808c594086..81aa3c6c02d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,9 @@ -------------------------------------------------------------- English Dolibarr ChangeLog -$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $ +$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $ -------------------------------------------------------------- ***** ChangeLog for 3.1 compared to 3.0 ***** -WARNING: IE6 browser is no more supported in this version. For users: - New: War against number of clicks: - When adding a free bank transaction, form to add next one is still diff --git a/README b/README index 2eebec8c5f8..342035579b4 100644 --- a/README +++ b/README @@ -53,13 +53,20 @@ To upgrade Dolibarr from an old version to this one: - If you came from a beta version or from any version x.y.z to any other where x or y number differs, you must call the Dolibarr "install/" - page in your browser (this should be done automatically at first dolibarr - access). - This URL should looks like: + page in your browser. + Url might be for example: http://localhost/dolibarr/htdocs/install/ or http://yourdolibarrhost/install/index.php + To know what is exactly correct URL for "install/" page, take URL you use + to go on login page. It it ends with "index.php", remove it. Then add + "install/" at the end. + For example, if your login page is: + http://yourdolibarrhost/something/index.php + Then, your "install/" pages will be + http://yourdolibarrhost/something/install/ + Then choose the "update" option according to your case. Note: Migrate process can be ran safely several times. diff --git a/README-FR b/README-FR index 75962578d1d..404d3f1a521 100644 --- a/README-FR +++ b/README-FR @@ -53,13 +53,19 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci: il n'y a pas besoin de migration de données. - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x - ou y varient, vous devez appelez la page "install/" de migration dans votre - navigateur (ceci doit se faire automatiquement au premier accès de l'application). - Ce sera une URL du genre: + ou y varient, vous devez appelez la page de migration dans votre navigateur: http://localhost/dolibarr/htdocs/install/index.php ou http://yourdolibarrhost/install/index.php + Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que + vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le. + Dans tous les cas, ajouter ensuite "install/" à la fin. + Par exemple, si votre page de connexion est: + http://yourdolibarrhost/something/index.php + Alors la page "install/" sera + http://yourdolibarrhost/something/install/ + Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas. Note: Le processus de migration peut etre lance plusieurs fois sans risque. diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 9a36e5a2e8a..c508e65182f 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -23,7 +23,7 @@ * \file htdocs/compta/facture/impayees.php * \ingroup facture * \brief Page to list and build liste of unpaid invoices - * \version $Revision: 1.83 $ + * \version $Revision$ */ require("../../main.inc.php"); @@ -268,7 +268,7 @@ if ($result) print_fiche_titre($titre,$link); //print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page - dol_htmloutput_mesg($mesg); + if ($mesg) print $mesg; $i = 0; print ''; @@ -351,10 +351,10 @@ if ($result) // PDF Picto print ''; + print ''; print '
'; - $filename=dol_sanitizeFileName($objp->facnumber); + $filename=dol_sanitizeFileName($objp->facnumber); $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber); $foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param); - print '
'; @@ -425,5 +425,5 @@ if ($result) $db->close(); -llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 4020909186d..f265d751e83 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2010 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ * \file htdocs/compta/paiement_charge.php * \ingroup tax * \brief Page to add payment of a tax - * \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $ + * \version $Id$ */ require('../main.inc.php'); @@ -42,9 +42,8 @@ if ($user->societe_id > 0) /* - * Actions + * Actions add payment */ - if ($_POST["action"] == 'add_payment') { $error=0; @@ -146,7 +145,7 @@ if ($_POST["action"] == 'add_payment') /* - * View + * Affichage */ llxHeader(); @@ -154,7 +153,9 @@ llxHeader(); $html=new Form($db); -// Formulaire de creation d'un paiement de charge +/* + * Formulaire de creation d'un paiement de charge + */ if ($_GET["action"] == 'create') { @@ -222,7 +223,7 @@ if ($_GET["action"] == 'create') print ''; print ''.$langs->trans('AccountToDebit').''; print ''; - $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list + $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1); // Affiche liste des comptes courant print ''; print ''.$langs->trans('Numero'); @@ -334,5 +335,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index ab274743513..cfd46212a10 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -22,7 +22,7 @@ * \file htdocs/core/class/html.formfile.class.php * \ingroup core * \brief File of class to offer components to list and upload files - * \version $Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $ + * \version $Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $ */ @@ -152,7 +152,6 @@ class FormFile */ function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='') { - $this->numoffiles=0; print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks); return $this->numoffiles; } @@ -846,12 +845,12 @@ class FormFile print ''; print ''; print ''; - + print ''; - + print '
'; print '
'; - + print ''; /*print ''; print ''; diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index f58d2118dcc..ad281e7f23a 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -23,7 +23,7 @@ * \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php * \ingroup ficheinter * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil - * \version $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); @@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter $result=$fichinter->fetch($id); if ($result < 0) { - dol_print_error($this->db,$fichinter->error); + dol_print_error($db,$fichinter->error); } } diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index 96292683296..1967e26eb00 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -9,8 +9,8 @@ // Reference language: en_US CHARSET=UTF-8 DIRECTION=ltr -#FONTFORPDF=chinese -FONTFORPDF=stsongstdlight +FONTFORPDF=chinese +#FONTFORPDF=stsongstdlight #FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=None
'.$langs->trans("Documents2").'