diff --git a/ChangeLog b/ChangeLog index 81aa3c6c02d..2808c594086 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ -------------------------------------------------------------- English Dolibarr ChangeLog -$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $ +$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy 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 342035579b4..2eebec8c5f8 100644 --- a/README +++ b/README @@ -53,20 +53,13 @@ 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. - Url might be for example: + page in your browser (this should be done automatically at first dolibarr + access). + This URL should looks like: 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 404d3f1a521..75962578d1d 100644 --- a/README-FR +++ b/README-FR @@ -53,19 +53,13 @@ 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 de migration dans votre navigateur: + 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: 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 c508e65182f..9a36e5a2e8a 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-2009 Laurent Destailleur + * Copyright (C) 2004-2011 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$ + * \version $Revision: 1.83 $ */ 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 - if ($mesg) print $mesg; + dol_htmloutput_mesg($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$ - $Revision$'); +llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $'); ?> diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index f265d751e83..4020909186d 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2011 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$ + * \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $ */ require('../main.inc.php'); @@ -42,8 +42,9 @@ if ($user->societe_id > 0) /* - * Actions add payment + * Actions */ + if ($_POST["action"] == 'add_payment') { $error=0; @@ -145,7 +146,7 @@ if ($_POST["action"] == 'add_payment') /* - * Affichage + * View */ llxHeader(); @@ -153,9 +154,7 @@ 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') { @@ -223,7 +222,7 @@ if ($_GET["action"] == 'create') print ''; print ''.$langs->trans('AccountToDebit').''; print ''; - $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1); // Affiche liste des comptes courant + $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list print ''; print ''.$langs->trans('Numero'); @@ -335,5 +334,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index cfd46212a10..ab274743513 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.48 2011/07/13 07:38:11 hregis Exp $ + * \version $Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $ */ @@ -152,6 +152,7 @@ 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; } @@ -845,12 +846,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 ad281e7f23a..f58d2118dcc 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$ + * \version $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $ */ 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($db,$fichinter->error); + dol_print_error($this->db,$fichinter->error); } } diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index 1967e26eb00..96292683296 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 diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php index 6385d48e759..e0a849af112 100644 --- a/htdocs/societe/socnote.php +++ b/htdocs/societe/socnote.php @@ -23,7 +23,7 @@ * \file htdocs/societe/socnote.php * \brief Tab for notes on third party * \ingroup societe - * \version $Id$ + * \version $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $ */ require("../main.inc.php"); @@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid); * Actions */ -if ($action == 'add') +if ($action == 'add' && ! GETPOST('cancel')) { - $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"]; - $result = $db->query($sql); + $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"]; + $result = $db->query($sql); - $_GET["socid"]=$_POST["socid"]; // Pour retour sur fiche - $socid = $_GET["socid"]; + $_GET["socid"]=$_POST["socid"]; // Pour retour sur fiche + $socid = $_GET["socid"]; } @@ -70,25 +70,25 @@ if ($socid > 0) $societe = new Societe($db, $socid); $societe->fetch($socid); - /* - * Affichage onglets - */ + /* + * Affichage onglets + */ if ($conf->notification->enabled) $langs->load("mails"); - $head = societe_prepare_head($societe); + $head = societe_prepare_head($societe); - dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company'); + dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company'); - print ""; - print ''; + print ""; + print ''; - print '
'.$langs->trans("Documents2").'
'; + print '
'; - print ''; - print ''; + print ''; + print ''; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { @@ -113,32 +113,36 @@ if ($socid > 0) print ''; } - print ''; - print ''; + print '"; + // Editeur wysiwyg + require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70); + $doleditor->Create(); + } + else + { + print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true); + } + print ""; - if ($action == 'edit') - { - print ''; - } + if ($action == 'edit') + { + print ''; + } - print "
'.$langs->trans('ThirdPartyName').''; - print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom'); - print '
'.$langs->trans('ThirdPartyName').''; + print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom'); + print '
'.$langs->trans("Note").''; - if ($action == 'edit' && $user->rights->societe->creer) - { - print ""; - print "id."\">"; + print '
'.$langs->trans("Note").''; + if ($action == 'edit' && $user->rights->societe->creer) + { + print ""; + print "id."\">"; - // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70); - $doleditor->Create(); - } - else - { - print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true); - } - print "
'; + print ''; + print '   '; + print ''; + print '
"; + print ""; - print ''; + print ''; } print '
'; @@ -163,5 +167,5 @@ if ($action != 'edit') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $'); ?>